]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.1.7-201509131604.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.7-201509131604.patch
CommitLineData
57795cea
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 d2b1c40..3e90a74 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 cd03a0f..b8d72be 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@@ -2341,6 +2348,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@@ -2639,6 +2650,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 b8591e5..1d9e8c0 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@@ -884,7 +954,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@@ -934,6 +1004,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@@ -943,7 +1015,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@@ -986,10 +1058,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@@ -1097,6 +1172,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@@ -1112,7 +1189,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@@ -1178,7 +1255,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@@ -1217,7 +1297,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@@ -1383,6 +1463,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@@ -1523,17 +1605,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@@ -1545,11 +1631,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/Makefile b/arch/arm/Makefile
1003index 985227c..8acc029 100644
1004--- a/arch/arm/Makefile
1005+++ b/arch/arm/Makefile
1006@@ -304,6 +304,9 @@ INSTALL_TARGETS = zinstall uinstall install
1007
1008 PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)
1009
1010+bootpImage uImage: zImage
1011+zImage: Image
1012+
1013 $(BOOT_TARGETS): vmlinux
1014 $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
1015
1016diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
1017index e22c119..abe7041 100644
1018--- a/arch/arm/include/asm/atomic.h
1019+++ b/arch/arm/include/asm/atomic.h
1020@@ -18,17 +18,41 @@
1021 #include <asm/barrier.h>
1022 #include <asm/cmpxchg.h>
1023
1024+#ifdef CONFIG_GENERIC_ATOMIC64
1025+#include <asm-generic/atomic64.h>
1026+#endif
1027+
1028 #define ATOMIC_INIT(i) { (i) }
1029
1030 #ifdef __KERNEL__
1031
1032+#ifdef CONFIG_THUMB2_KERNEL
1033+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
1034+#else
1035+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
1036+#endif
1037+
1038+#define _ASM_EXTABLE(from, to) \
1039+" .pushsection __ex_table,\"a\"\n"\
1040+" .align 3\n" \
1041+" .long " #from ", " #to"\n" \
1042+" .popsection"
1043+
1044 /*
1045 * On ARM, ordinary assignment (str instruction) doesn't clear the local
1046 * strex/ldrex monitor on some implementations. The reason we can use it for
1047 * atomic_set() is the clrex or dummy strex done on every exception return.
1048 */
1049 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1050+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1051+{
1052+ return ACCESS_ONCE(v->counter);
1053+}
1054 #define atomic_set(v,i) (((v)->counter) = (i))
1055+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1056+{
1057+ v->counter = i;
1058+}
1059
1060 #if __LINUX_ARM_ARCH__ >= 6
1061
1062@@ -38,26 +62,50 @@
1063 * to ensure that the update happens.
1064 */
1065
1066-#define ATOMIC_OP(op, c_op, asm_op) \
1067-static inline void atomic_##op(int i, atomic_t *v) \
1068+#ifdef CONFIG_PAX_REFCOUNT
1069+#define __OVERFLOW_POST \
1070+ " bvc 3f\n" \
1071+ "2: " REFCOUNT_TRAP_INSN "\n"\
1072+ "3:\n"
1073+#define __OVERFLOW_POST_RETURN \
1074+ " bvc 3f\n" \
1075+" mov %0, %1\n" \
1076+ "2: " REFCOUNT_TRAP_INSN "\n"\
1077+ "3:\n"
1078+#define __OVERFLOW_EXTABLE \
1079+ "4:\n" \
1080+ _ASM_EXTABLE(2b, 4b)
1081+#else
1082+#define __OVERFLOW_POST
1083+#define __OVERFLOW_POST_RETURN
1084+#define __OVERFLOW_EXTABLE
1085+#endif
1086+
1087+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1088+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1089 { \
1090 unsigned long tmp; \
1091 int result; \
1092 \
1093 prefetchw(&v->counter); \
1094- __asm__ __volatile__("@ atomic_" #op "\n" \
1095+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1096 "1: ldrex %0, [%3]\n" \
1097 " " #asm_op " %0, %0, %4\n" \
1098+ post_op \
1099 " strex %1, %0, [%3]\n" \
1100 " teq %1, #0\n" \
1101-" bne 1b" \
1102+" bne 1b\n" \
1103+ extable \
1104 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1105 : "r" (&v->counter), "Ir" (i) \
1106 : "cc"); \
1107 } \
1108
1109-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1110-static inline int atomic_##op##_return(int i, atomic_t *v) \
1111+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1112+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1113+
1114+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1115+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1116 { \
1117 unsigned long tmp; \
1118 int result; \
1119@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1120 smp_mb(); \
1121 prefetchw(&v->counter); \
1122 \
1123- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1124+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1125 "1: ldrex %0, [%3]\n" \
1126 " " #asm_op " %0, %0, %4\n" \
1127+ post_op \
1128 " strex %1, %0, [%3]\n" \
1129 " teq %1, #0\n" \
1130-" bne 1b" \
1131+" bne 1b\n" \
1132+ extable \
1133 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1134 : "r" (&v->counter), "Ir" (i) \
1135 : "cc"); \
1136@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1137 return result; \
1138 }
1139
1140+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1141+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1142+
1143 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1144 {
1145 int oldval;
1146@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1147 __asm__ __volatile__ ("@ atomic_add_unless\n"
1148 "1: ldrex %0, [%4]\n"
1149 " teq %0, %5\n"
1150-" beq 2f\n"
1151-" add %1, %0, %6\n"
1152+" beq 4f\n"
1153+" adds %1, %0, %6\n"
1154+
1155+#ifdef CONFIG_PAX_REFCOUNT
1156+" bvc 3f\n"
1157+"2: " REFCOUNT_TRAP_INSN "\n"
1158+"3:\n"
1159+#endif
1160+
1161 " strex %2, %1, [%4]\n"
1162 " teq %2, #0\n"
1163 " bne 1b\n"
1164-"2:"
1165+"4:"
1166+
1167+#ifdef CONFIG_PAX_REFCOUNT
1168+ _ASM_EXTABLE(2b, 4b)
1169+#endif
1170+
1171 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1172 : "r" (&v->counter), "r" (u), "r" (a)
1173 : "cc");
1174@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1175 return oldval;
1176 }
1177
1178+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1179+{
1180+ unsigned long oldval, res;
1181+
1182+ smp_mb();
1183+
1184+ do {
1185+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1186+ "ldrex %1, [%3]\n"
1187+ "mov %0, #0\n"
1188+ "teq %1, %4\n"
1189+ "strexeq %0, %5, [%3]\n"
1190+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1191+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1192+ : "cc");
1193+ } while (res);
1194+
1195+ smp_mb();
1196+
1197+ return oldval;
1198+}
1199+
1200 #else /* ARM_ARCH_6 */
1201
1202 #ifdef CONFIG_SMP
1203 #error SMP not supported on pre-ARMv6 CPUs
1204 #endif
1205
1206-#define ATOMIC_OP(op, c_op, asm_op) \
1207-static inline void atomic_##op(int i, atomic_t *v) \
1208+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1209+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1210 { \
1211 unsigned long flags; \
1212 \
1213@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1214 raw_local_irq_restore(flags); \
1215 } \
1216
1217-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1218-static inline int atomic_##op##_return(int i, atomic_t *v) \
1219+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1220+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1221+
1222+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1223+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1224 { \
1225 unsigned long flags; \
1226 int val; \
1227@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1228 return val; \
1229 }
1230
1231+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1232+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1233+
1234 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1235 {
1236 int ret;
1237@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1238 return ret;
1239 }
1240
1241+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1242+{
1243+ return atomic_cmpxchg((atomic_t *)v, old, new);
1244+}
1245+
1246 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1247 {
1248 int c, old;
1249@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1250
1251 #undef ATOMIC_OPS
1252 #undef ATOMIC_OP_RETURN
1253+#undef __ATOMIC_OP_RETURN
1254 #undef ATOMIC_OP
1255+#undef __ATOMIC_OP
1256
1257 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1258+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1259+{
1260+ return xchg(&v->counter, new);
1261+}
1262
1263 #define atomic_inc(v) atomic_add(1, v)
1264+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1265+{
1266+ atomic_add_unchecked(1, v);
1267+}
1268 #define atomic_dec(v) atomic_sub(1, v)
1269+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1270+{
1271+ atomic_sub_unchecked(1, v);
1272+}
1273
1274 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1275+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1276+{
1277+ return atomic_add_return_unchecked(1, v) == 0;
1278+}
1279 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1280 #define atomic_inc_return(v) (atomic_add_return(1, v))
1281+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1282+{
1283+ return atomic_add_return_unchecked(1, v);
1284+}
1285 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1286 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1287
1288@@ -216,6 +336,14 @@ typedef struct {
1289 long long counter;
1290 } atomic64_t;
1291
1292+#ifdef CONFIG_PAX_REFCOUNT
1293+typedef struct {
1294+ long long counter;
1295+} atomic64_unchecked_t;
1296+#else
1297+typedef atomic64_t atomic64_unchecked_t;
1298+#endif
1299+
1300 #define ATOMIC64_INIT(i) { (i) }
1301
1302 #ifdef CONFIG_ARM_LPAE
1303@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1304 return result;
1305 }
1306
1307+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1308+{
1309+ long long result;
1310+
1311+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1312+" ldrd %0, %H0, [%1]"
1313+ : "=&r" (result)
1314+ : "r" (&v->counter), "Qo" (v->counter)
1315+ );
1316+
1317+ return result;
1318+}
1319+
1320 static inline void atomic64_set(atomic64_t *v, long long i)
1321 {
1322 __asm__ __volatile__("@ atomic64_set\n"
1323@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1324 : "r" (&v->counter), "r" (i)
1325 );
1326 }
1327+
1328+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1329+{
1330+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1331+" strd %2, %H2, [%1]"
1332+ : "=Qo" (v->counter)
1333+ : "r" (&v->counter), "r" (i)
1334+ );
1335+}
1336 #else
1337 static inline long long atomic64_read(const atomic64_t *v)
1338 {
1339@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1340 return result;
1341 }
1342
1343+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1344+{
1345+ long long result;
1346+
1347+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1348+" ldrexd %0, %H0, [%1]"
1349+ : "=&r" (result)
1350+ : "r" (&v->counter), "Qo" (v->counter)
1351+ );
1352+
1353+ return result;
1354+}
1355+
1356 static inline void atomic64_set(atomic64_t *v, long long i)
1357 {
1358 long long tmp;
1359@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1360 : "r" (&v->counter), "r" (i)
1361 : "cc");
1362 }
1363+
1364+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1365+{
1366+ long long tmp;
1367+
1368+ prefetchw(&v->counter);
1369+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1370+"1: ldrexd %0, %H0, [%2]\n"
1371+" strexd %0, %3, %H3, [%2]\n"
1372+" teq %0, #0\n"
1373+" bne 1b"
1374+ : "=&r" (tmp), "=Qo" (v->counter)
1375+ : "r" (&v->counter), "r" (i)
1376+ : "cc");
1377+}
1378 #endif
1379
1380-#define ATOMIC64_OP(op, op1, op2) \
1381-static inline void atomic64_##op(long long i, atomic64_t *v) \
1382+#undef __OVERFLOW_POST_RETURN
1383+#define __OVERFLOW_POST_RETURN \
1384+ " bvc 3f\n" \
1385+" mov %0, %1\n" \
1386+" mov %H0, %H1\n" \
1387+ "2: " REFCOUNT_TRAP_INSN "\n"\
1388+ "3:\n"
1389+
1390+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1391+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1392 { \
1393 long long result; \
1394 unsigned long tmp; \
1395 \
1396 prefetchw(&v->counter); \
1397- __asm__ __volatile__("@ atomic64_" #op "\n" \
1398+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1399 "1: ldrexd %0, %H0, [%3]\n" \
1400 " " #op1 " %Q0, %Q0, %Q4\n" \
1401 " " #op2 " %R0, %R0, %R4\n" \
1402+ post_op \
1403 " strexd %1, %0, %H0, [%3]\n" \
1404 " teq %1, #0\n" \
1405-" bne 1b" \
1406+" bne 1b\n" \
1407+ extable \
1408 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1409 : "r" (&v->counter), "r" (i) \
1410 : "cc"); \
1411 } \
1412
1413-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1414-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1415+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1416+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1417+
1418+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1419+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1420 { \
1421 long long result; \
1422 unsigned long tmp; \
1423@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1424 smp_mb(); \
1425 prefetchw(&v->counter); \
1426 \
1427- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1428+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1429 "1: ldrexd %0, %H0, [%3]\n" \
1430 " " #op1 " %Q0, %Q0, %Q4\n" \
1431 " " #op2 " %R0, %R0, %R4\n" \
1432+ post_op \
1433 " strexd %1, %0, %H0, [%3]\n" \
1434 " teq %1, #0\n" \
1435-" bne 1b" \
1436+" bne 1b\n" \
1437+ extable \
1438 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1439 : "r" (&v->counter), "r" (i) \
1440 : "cc"); \
1441@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1442 return result; \
1443 }
1444
1445+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1446+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1447+
1448 #define ATOMIC64_OPS(op, op1, op2) \
1449 ATOMIC64_OP(op, op1, op2) \
1450 ATOMIC64_OP_RETURN(op, op1, op2)
1451@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1452
1453 #undef ATOMIC64_OPS
1454 #undef ATOMIC64_OP_RETURN
1455+#undef __ATOMIC64_OP_RETURN
1456 #undef ATOMIC64_OP
1457+#undef __ATOMIC64_OP
1458+#undef __OVERFLOW_EXTABLE
1459+#undef __OVERFLOW_POST_RETURN
1460+#undef __OVERFLOW_POST
1461
1462 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1463 long long new)
1464@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1465 return oldval;
1466 }
1467
1468+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1469+ long long new)
1470+{
1471+ long long oldval;
1472+ unsigned long res;
1473+
1474+ smp_mb();
1475+
1476+ do {
1477+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1478+ "ldrexd %1, %H1, [%3]\n"
1479+ "mov %0, #0\n"
1480+ "teq %1, %4\n"
1481+ "teqeq %H1, %H4\n"
1482+ "strexdeq %0, %5, %H5, [%3]"
1483+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1484+ : "r" (&ptr->counter), "r" (old), "r" (new)
1485+ : "cc");
1486+ } while (res);
1487+
1488+ smp_mb();
1489+
1490+ return oldval;
1491+}
1492+
1493 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1494 {
1495 long long result;
1496@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1497 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1498 {
1499 long long result;
1500- unsigned long tmp;
1501+ u64 tmp;
1502
1503 smp_mb();
1504 prefetchw(&v->counter);
1505
1506 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1507-"1: ldrexd %0, %H0, [%3]\n"
1508-" subs %Q0, %Q0, #1\n"
1509-" sbc %R0, %R0, #0\n"
1510+"1: ldrexd %1, %H1, [%3]\n"
1511+" subs %Q0, %Q1, #1\n"
1512+" sbcs %R0, %R1, #0\n"
1513+
1514+#ifdef CONFIG_PAX_REFCOUNT
1515+" bvc 3f\n"
1516+" mov %Q0, %Q1\n"
1517+" mov %R0, %R1\n"
1518+"2: " REFCOUNT_TRAP_INSN "\n"
1519+"3:\n"
1520+#endif
1521+
1522 " teq %R0, #0\n"
1523-" bmi 2f\n"
1524+" bmi 4f\n"
1525 " strexd %1, %0, %H0, [%3]\n"
1526 " teq %1, #0\n"
1527 " bne 1b\n"
1528-"2:"
1529+"4:\n"
1530+
1531+#ifdef CONFIG_PAX_REFCOUNT
1532+ _ASM_EXTABLE(2b, 4b)
1533+#endif
1534+
1535 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1536 : "r" (&v->counter)
1537 : "cc");
1538@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1539 " teq %0, %5\n"
1540 " teqeq %H0, %H5\n"
1541 " moveq %1, #0\n"
1542-" beq 2f\n"
1543+" beq 4f\n"
1544 " adds %Q0, %Q0, %Q6\n"
1545-" adc %R0, %R0, %R6\n"
1546+" adcs %R0, %R0, %R6\n"
1547+
1548+#ifdef CONFIG_PAX_REFCOUNT
1549+" bvc 3f\n"
1550+"2: " REFCOUNT_TRAP_INSN "\n"
1551+"3:\n"
1552+#endif
1553+
1554 " strexd %2, %0, %H0, [%4]\n"
1555 " teq %2, #0\n"
1556 " bne 1b\n"
1557-"2:"
1558+"4:\n"
1559+
1560+#ifdef CONFIG_PAX_REFCOUNT
1561+ _ASM_EXTABLE(2b, 4b)
1562+#endif
1563+
1564 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1565 : "r" (&v->counter), "r" (u), "r" (a)
1566 : "cc");
1567@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1568
1569 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1570 #define atomic64_inc(v) atomic64_add(1LL, (v))
1571+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1572 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1573+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1574 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1575 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1576 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1577+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1578 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1579 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1580 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1581diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1582index d2f81e6..3c4dba5 100644
1583--- a/arch/arm/include/asm/barrier.h
1584+++ b/arch/arm/include/asm/barrier.h
1585@@ -67,7 +67,7 @@
1586 do { \
1587 compiletime_assert_atomic_type(*p); \
1588 smp_mb(); \
1589- ACCESS_ONCE(*p) = (v); \
1590+ ACCESS_ONCE_RW(*p) = (v); \
1591 } while (0)
1592
1593 #define smp_load_acquire(p) \
1594diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1595index 75fe66b..ba3dee4 100644
1596--- a/arch/arm/include/asm/cache.h
1597+++ b/arch/arm/include/asm/cache.h
1598@@ -4,8 +4,10 @@
1599 #ifndef __ASMARM_CACHE_H
1600 #define __ASMARM_CACHE_H
1601
1602+#include <linux/const.h>
1603+
1604 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1605-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1606+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1607
1608 /*
1609 * Memory returned by kmalloc() may be used for DMA, so we must make
1610@@ -24,5 +26,6 @@
1611 #endif
1612
1613 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1614+#define __read_only __attribute__ ((__section__(".data..read_only")))
1615
1616 #endif
1617diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1618index 2d46862..a35415b 100644
1619--- a/arch/arm/include/asm/cacheflush.h
1620+++ b/arch/arm/include/asm/cacheflush.h
1621@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1622 void (*dma_unmap_area)(const void *, size_t, int);
1623
1624 void (*dma_flush_range)(const void *, const void *);
1625-};
1626+} __no_const;
1627
1628 /*
1629 * Select the calling method
1630diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1631index 5233151..87a71fa 100644
1632--- a/arch/arm/include/asm/checksum.h
1633+++ b/arch/arm/include/asm/checksum.h
1634@@ -37,7 +37,19 @@ __wsum
1635 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1636
1637 __wsum
1638-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1639+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1640+
1641+static inline __wsum
1642+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1643+{
1644+ __wsum ret;
1645+ pax_open_userland();
1646+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1647+ pax_close_userland();
1648+ return ret;
1649+}
1650+
1651+
1652
1653 /*
1654 * Fold a partial checksum without adding pseudo headers
1655diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1656index abb2c37..96db950 100644
1657--- a/arch/arm/include/asm/cmpxchg.h
1658+++ b/arch/arm/include/asm/cmpxchg.h
1659@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1660
1661 #define xchg(ptr,x) \
1662 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1663+#define xchg_unchecked(ptr,x) \
1664+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1665
1666 #include <asm-generic/cmpxchg-local.h>
1667
1668diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
1669index 0f84249..8e83c55 100644
1670--- a/arch/arm/include/asm/cpuidle.h
1671+++ b/arch/arm/include/asm/cpuidle.h
1672@@ -32,7 +32,7 @@ struct device_node;
1673 struct cpuidle_ops {
1674 int (*suspend)(int cpu, unsigned long arg);
1675 int (*init)(struct device_node *, int cpu);
1676-};
1677+} __no_const;
1678
1679 struct of_cpuidle_method {
1680 const char *method;
1681diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1682index 6ddbe44..b5e38b1a 100644
1683--- a/arch/arm/include/asm/domain.h
1684+++ b/arch/arm/include/asm/domain.h
1685@@ -48,18 +48,37 @@
1686 * Domain types
1687 */
1688 #define DOMAIN_NOACCESS 0
1689-#define DOMAIN_CLIENT 1
1690 #ifdef CONFIG_CPU_USE_DOMAINS
1691+#define DOMAIN_USERCLIENT 1
1692+#define DOMAIN_KERNELCLIENT 1
1693 #define DOMAIN_MANAGER 3
1694+#define DOMAIN_VECTORS DOMAIN_USER
1695 #else
1696+
1697+#ifdef CONFIG_PAX_KERNEXEC
1698 #define DOMAIN_MANAGER 1
1699+#define DOMAIN_KERNEXEC 3
1700+#else
1701+#define DOMAIN_MANAGER 1
1702+#endif
1703+
1704+#ifdef CONFIG_PAX_MEMORY_UDEREF
1705+#define DOMAIN_USERCLIENT 0
1706+#define DOMAIN_UDEREF 1
1707+#define DOMAIN_VECTORS DOMAIN_KERNEL
1708+#else
1709+#define DOMAIN_USERCLIENT 1
1710+#define DOMAIN_VECTORS DOMAIN_USER
1711+#endif
1712+#define DOMAIN_KERNELCLIENT 1
1713+
1714 #endif
1715
1716 #define domain_val(dom,type) ((type) << (2*(dom)))
1717
1718 #ifndef __ASSEMBLY__
1719
1720-#ifdef CONFIG_CPU_USE_DOMAINS
1721+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1722 static inline void set_domain(unsigned val)
1723 {
1724 asm volatile(
1725@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1726 isb();
1727 }
1728
1729-#define modify_domain(dom,type) \
1730- do { \
1731- struct thread_info *thread = current_thread_info(); \
1732- unsigned int domain = thread->cpu_domain; \
1733- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1734- thread->cpu_domain = domain | domain_val(dom, type); \
1735- set_domain(thread->cpu_domain); \
1736- } while (0)
1737-
1738+extern void modify_domain(unsigned int dom, unsigned int type);
1739 #else
1740 static inline void set_domain(unsigned val) { }
1741 static inline void modify_domain(unsigned dom, unsigned type) { }
1742diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1743index d2315ff..f60b47b 100644
1744--- a/arch/arm/include/asm/elf.h
1745+++ b/arch/arm/include/asm/elf.h
1746@@ -117,7 +117,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1747 the loader. We need to make sure that it is out of the way of the program
1748 that it will "exec", and that there is sufficient room for the brk. */
1749
1750-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1751+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1752+
1753+#ifdef CONFIG_PAX_ASLR
1754+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1755+
1756+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1757+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1758+#endif
1759
1760 /* When the program starts, a1 contains a pointer to a function to be
1761 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1762diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1763index de53547..52b9a28 100644
1764--- a/arch/arm/include/asm/fncpy.h
1765+++ b/arch/arm/include/asm/fncpy.h
1766@@ -81,7 +81,9 @@
1767 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1768 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1769 \
1770+ pax_open_kernel(); \
1771 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1772+ pax_close_kernel(); \
1773 flush_icache_range((unsigned long)(dest_buf), \
1774 (unsigned long)(dest_buf) + (size)); \
1775 \
1776diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1777index 4e78065..f265b48 100644
1778--- a/arch/arm/include/asm/futex.h
1779+++ b/arch/arm/include/asm/futex.h
1780@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1781 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1782 return -EFAULT;
1783
1784+ pax_open_userland();
1785+
1786 smp_mb();
1787 /* Prefetching cannot fault */
1788 prefetchw(uaddr);
1789@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1790 : "cc", "memory");
1791 smp_mb();
1792
1793+ pax_close_userland();
1794+
1795 *uval = val;
1796 return ret;
1797 }
1798@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1799 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1800 return -EFAULT;
1801
1802+ pax_open_userland();
1803+
1804 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1805 "1: " TUSER(ldr) " %1, [%4]\n"
1806 " teq %1, %2\n"
1807@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1808 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1809 : "cc", "memory");
1810
1811+ pax_close_userland();
1812+
1813 *uval = val;
1814 return ret;
1815 }
1816@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1817 return -EFAULT;
1818
1819 pagefault_disable(); /* implies preempt_disable() */
1820+ pax_open_userland();
1821
1822 switch (op) {
1823 case FUTEX_OP_SET:
1824@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1825 ret = -ENOSYS;
1826 }
1827
1828+ pax_close_userland();
1829 pagefault_enable(); /* subsumes preempt_enable() */
1830
1831 if (!ret) {
1832diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1833index 83eb2f7..ed77159 100644
1834--- a/arch/arm/include/asm/kmap_types.h
1835+++ b/arch/arm/include/asm/kmap_types.h
1836@@ -4,6 +4,6 @@
1837 /*
1838 * This is the "bare minimum". AIO seems to require this.
1839 */
1840-#define KM_TYPE_NR 16
1841+#define KM_TYPE_NR 17
1842
1843 #endif
1844diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1845index 9e614a1..3302cca 100644
1846--- a/arch/arm/include/asm/mach/dma.h
1847+++ b/arch/arm/include/asm/mach/dma.h
1848@@ -22,7 +22,7 @@ struct dma_ops {
1849 int (*residue)(unsigned int, dma_t *); /* optional */
1850 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1851 const char *type;
1852-};
1853+} __do_const;
1854
1855 struct dma_struct {
1856 void *addr; /* single DMA address */
1857diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1858index f98c7f3..e5c626d 100644
1859--- a/arch/arm/include/asm/mach/map.h
1860+++ b/arch/arm/include/asm/mach/map.h
1861@@ -23,17 +23,19 @@ struct map_desc {
1862
1863 /* types 0-3 are defined in asm/io.h */
1864 enum {
1865- MT_UNCACHED = 4,
1866- MT_CACHECLEAN,
1867- MT_MINICLEAN,
1868+ MT_UNCACHED_RW = 4,
1869+ MT_CACHECLEAN_RO,
1870+ MT_MINICLEAN_RO,
1871 MT_LOW_VECTORS,
1872 MT_HIGH_VECTORS,
1873- MT_MEMORY_RWX,
1874+ __MT_MEMORY_RWX,
1875 MT_MEMORY_RW,
1876- MT_ROM,
1877- MT_MEMORY_RWX_NONCACHED,
1878+ MT_MEMORY_RX,
1879+ MT_ROM_RX,
1880+ MT_MEMORY_RW_NONCACHED,
1881+ MT_MEMORY_RX_NONCACHED,
1882 MT_MEMORY_RW_DTCM,
1883- MT_MEMORY_RWX_ITCM,
1884+ MT_MEMORY_RX_ITCM,
1885 MT_MEMORY_RW_SO,
1886 MT_MEMORY_DMA_READY,
1887 };
1888diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1889index 563b92f..689d58e 100644
1890--- a/arch/arm/include/asm/outercache.h
1891+++ b/arch/arm/include/asm/outercache.h
1892@@ -39,7 +39,7 @@ struct outer_cache_fns {
1893 /* This is an ARM L2C thing */
1894 void (*write_sec)(unsigned long, unsigned);
1895 void (*configure)(const struct l2x0_regs *);
1896-};
1897+} __no_const;
1898
1899 extern struct outer_cache_fns outer_cache;
1900
1901diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1902index 4355f0e..cd9168e 100644
1903--- a/arch/arm/include/asm/page.h
1904+++ b/arch/arm/include/asm/page.h
1905@@ -23,6 +23,7 @@
1906
1907 #else
1908
1909+#include <linux/compiler.h>
1910 #include <asm/glue.h>
1911
1912 /*
1913@@ -114,7 +115,7 @@ struct cpu_user_fns {
1914 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1915 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1916 unsigned long vaddr, struct vm_area_struct *vma);
1917-};
1918+} __no_const;
1919
1920 #ifdef MULTI_USER
1921 extern struct cpu_user_fns cpu_user;
1922diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1923index 19cfab5..3f5c7e9 100644
1924--- a/arch/arm/include/asm/pgalloc.h
1925+++ b/arch/arm/include/asm/pgalloc.h
1926@@ -17,6 +17,7 @@
1927 #include <asm/processor.h>
1928 #include <asm/cacheflush.h>
1929 #include <asm/tlbflush.h>
1930+#include <asm/system_info.h>
1931
1932 #define check_pgt_cache() do { } while (0)
1933
1934@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1935 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1936 }
1937
1938+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1939+{
1940+ pud_populate(mm, pud, pmd);
1941+}
1942+
1943 #else /* !CONFIG_ARM_LPAE */
1944
1945 /*
1946@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1947 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1948 #define pmd_free(mm, pmd) do { } while (0)
1949 #define pud_populate(mm,pmd,pte) BUG()
1950+#define pud_populate_kernel(mm,pmd,pte) BUG()
1951
1952 #endif /* CONFIG_ARM_LPAE */
1953
1954@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1955 __free_page(pte);
1956 }
1957
1958+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1959+{
1960+#ifdef CONFIG_ARM_LPAE
1961+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1962+#else
1963+ if (addr & SECTION_SIZE)
1964+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1965+ else
1966+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1967+#endif
1968+ flush_pmd_entry(pmdp);
1969+}
1970+
1971 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1972 pmdval_t prot)
1973 {
1974diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1975index 5e68278..1869bae 100644
1976--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1977+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1978@@ -27,7 +27,7 @@
1979 /*
1980 * - section
1981 */
1982-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1983+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1984 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1985 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1986 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1987@@ -39,6 +39,7 @@
1988 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1989 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1990 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1991+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1992
1993 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1994 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1995@@ -68,6 +69,7 @@
1996 * - extended small page/tiny page
1997 */
1998 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1999+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
2000 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
2001 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
2002 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
2003diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
2004index bfd662e..f6cbb02 100644
2005--- a/arch/arm/include/asm/pgtable-2level.h
2006+++ b/arch/arm/include/asm/pgtable-2level.h
2007@@ -127,6 +127,9 @@
2008 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
2009 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
2010
2011+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
2012+#define L_PTE_PXN (_AT(pteval_t, 0))
2013+
2014 /*
2015 * These are the memory types, defined to be compatible with
2016 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
2017diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
2018index a745a2a..481350a 100644
2019--- a/arch/arm/include/asm/pgtable-3level.h
2020+++ b/arch/arm/include/asm/pgtable-3level.h
2021@@ -80,6 +80,7 @@
2022 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
2023 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2024 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
2025+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2026 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2027 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2028 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2029@@ -91,10 +92,12 @@
2030 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2031 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2032 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2033+#define PMD_SECT_RDONLY PMD_SECT_AP2
2034
2035 /*
2036 * To be used in assembly code with the upper page attributes.
2037 */
2038+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2039 #define L_PTE_XN_HIGH (1 << (54 - 32))
2040 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2041
2042diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2043index f403541..b10df68 100644
2044--- a/arch/arm/include/asm/pgtable.h
2045+++ b/arch/arm/include/asm/pgtable.h
2046@@ -33,6 +33,9 @@
2047 #include <asm/pgtable-2level.h>
2048 #endif
2049
2050+#define ktla_ktva(addr) (addr)
2051+#define ktva_ktla(addr) (addr)
2052+
2053 /*
2054 * Just any arbitrary offset to the start of the vmalloc VM area: the
2055 * current 8MB value just means that there will be a 8MB "hole" after the
2056@@ -48,6 +51,9 @@
2057 #define LIBRARY_TEXT_START 0x0c000000
2058
2059 #ifndef __ASSEMBLY__
2060+extern pteval_t __supported_pte_mask;
2061+extern pmdval_t __supported_pmd_mask;
2062+
2063 extern void __pte_error(const char *file, int line, pte_t);
2064 extern void __pmd_error(const char *file, int line, pmd_t);
2065 extern void __pgd_error(const char *file, int line, pgd_t);
2066@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2067 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2068 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2069
2070+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2071+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2072+
2073+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2074+#include <asm/domain.h>
2075+#include <linux/thread_info.h>
2076+#include <linux/preempt.h>
2077+
2078+static inline int test_domain(int domain, int domaintype)
2079+{
2080+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2081+}
2082+#endif
2083+
2084+#ifdef CONFIG_PAX_KERNEXEC
2085+static inline unsigned long pax_open_kernel(void) {
2086+#ifdef CONFIG_ARM_LPAE
2087+ /* TODO */
2088+#else
2089+ preempt_disable();
2090+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2091+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2092+#endif
2093+ return 0;
2094+}
2095+
2096+static inline unsigned long pax_close_kernel(void) {
2097+#ifdef CONFIG_ARM_LPAE
2098+ /* TODO */
2099+#else
2100+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2101+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2102+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2103+ preempt_enable_no_resched();
2104+#endif
2105+ return 0;
2106+}
2107+#else
2108+static inline unsigned long pax_open_kernel(void) { return 0; }
2109+static inline unsigned long pax_close_kernel(void) { return 0; }
2110+#endif
2111+
2112 /*
2113 * This is the lowest virtual address we can permit any user space
2114 * mapping to be mapped at. This is particularly important for
2115@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2116 /*
2117 * The pgprot_* and protection_map entries will be fixed up in runtime
2118 * to include the cachable and bufferable bits based on memory policy,
2119- * as well as any architecture dependent bits like global/ASID and SMP
2120- * shared mapping bits.
2121+ * as well as any architecture dependent bits like global/ASID, PXN,
2122+ * and SMP shared mapping bits.
2123 */
2124 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2125
2126@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2127 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2128 {
2129 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2130- L_PTE_NONE | L_PTE_VALID;
2131+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2132 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2133 return pte;
2134 }
2135diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2136index c25ef3e..735f14b 100644
2137--- a/arch/arm/include/asm/psci.h
2138+++ b/arch/arm/include/asm/psci.h
2139@@ -32,7 +32,7 @@ struct psci_operations {
2140 int (*affinity_info)(unsigned long target_affinity,
2141 unsigned long lowest_affinity_level);
2142 int (*migrate_info_type)(void);
2143-};
2144+} __no_const;
2145
2146 extern struct psci_operations psci_ops;
2147 extern struct smp_operations psci_smp_ops;
2148diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2149index 18f5a55..5072a40 100644
2150--- a/arch/arm/include/asm/smp.h
2151+++ b/arch/arm/include/asm/smp.h
2152@@ -107,7 +107,7 @@ struct smp_operations {
2153 int (*cpu_disable)(unsigned int cpu);
2154 #endif
2155 #endif
2156-};
2157+} __no_const;
2158
2159 struct of_cpu_method {
2160 const char *method;
2161diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2162index bd32ede..bd90a0b 100644
2163--- a/arch/arm/include/asm/thread_info.h
2164+++ b/arch/arm/include/asm/thread_info.h
2165@@ -74,9 +74,9 @@ struct thread_info {
2166 .flags = 0, \
2167 .preempt_count = INIT_PREEMPT_COUNT, \
2168 .addr_limit = KERNEL_DS, \
2169- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2170- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2171- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2172+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2173+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2174+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2175 }
2176
2177 #define init_thread_info (init_thread_union.thread_info)
2178@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2179 #define TIF_SYSCALL_AUDIT 9
2180 #define TIF_SYSCALL_TRACEPOINT 10
2181 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2182-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2183+/* within 8 bits of TIF_SYSCALL_TRACE
2184+ * to meet flexible second operand requirements
2185+ */
2186+#define TIF_GRSEC_SETXID 12
2187+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2188 #define TIF_USING_IWMMXT 17
2189 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2190 #define TIF_RESTORE_SIGMASK 20
2191@@ -166,10 +170,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2192 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2193 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2194 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2195+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2196
2197 /* Checks for any syscall work in entry-common.S */
2198 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2199- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2200+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2201
2202 /*
2203 * Change these and you break ASM code in entry-common.S
2204diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2205index 5f833f7..76e6644 100644
2206--- a/arch/arm/include/asm/tls.h
2207+++ b/arch/arm/include/asm/tls.h
2208@@ -3,6 +3,7 @@
2209
2210 #include <linux/compiler.h>
2211 #include <asm/thread_info.h>
2212+#include <asm/pgtable.h>
2213
2214 #ifdef __ASSEMBLY__
2215 #include <asm/asm-offsets.h>
2216@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2217 * at 0xffff0fe0 must be used instead. (see
2218 * entry-armv.S for details)
2219 */
2220+ pax_open_kernel();
2221 *((unsigned int *)0xffff0ff0) = val;
2222+ pax_close_kernel();
2223 #endif
2224 }
2225
2226diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2227index 74b17d0..57a4bf4 100644
2228--- a/arch/arm/include/asm/uaccess.h
2229+++ b/arch/arm/include/asm/uaccess.h
2230@@ -18,6 +18,7 @@
2231 #include <asm/domain.h>
2232 #include <asm/unified.h>
2233 #include <asm/compiler.h>
2234+#include <asm/pgtable.h>
2235
2236 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2237 #include <asm-generic/uaccess-unaligned.h>
2238@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2239 static inline void set_fs(mm_segment_t fs)
2240 {
2241 current_thread_info()->addr_limit = fs;
2242- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2243+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2244 }
2245
2246 #define segment_eq(a, b) ((a) == (b))
2247
2248+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2249+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2250+
2251+static inline void pax_open_userland(void)
2252+{
2253+
2254+#ifdef CONFIG_PAX_MEMORY_UDEREF
2255+ if (segment_eq(get_fs(), USER_DS)) {
2256+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2257+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2258+ }
2259+#endif
2260+
2261+}
2262+
2263+static inline void pax_close_userland(void)
2264+{
2265+
2266+#ifdef CONFIG_PAX_MEMORY_UDEREF
2267+ if (segment_eq(get_fs(), USER_DS)) {
2268+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2269+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2270+ }
2271+#endif
2272+
2273+}
2274+
2275 #define __addr_ok(addr) ({ \
2276 unsigned long flag; \
2277 __asm__("cmp %2, %0; movlo %0, #0" \
2278@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2279
2280 #define get_user(x, p) \
2281 ({ \
2282+ int __e; \
2283 might_fault(); \
2284- __get_user_check(x, p); \
2285+ pax_open_userland(); \
2286+ __e = __get_user_check((x), (p)); \
2287+ pax_close_userland(); \
2288+ __e; \
2289 })
2290
2291 extern int __put_user_1(void *, unsigned int);
2292@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2293
2294 #define put_user(x, p) \
2295 ({ \
2296+ int __e; \
2297 might_fault(); \
2298- __put_user_check(x, p); \
2299+ pax_open_userland(); \
2300+ __e = __put_user_check((x), (p)); \
2301+ pax_close_userland(); \
2302+ __e; \
2303 })
2304
2305 #else /* CONFIG_MMU */
2306@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2307
2308 #endif /* CONFIG_MMU */
2309
2310+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2311 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2312
2313 #define user_addr_max() \
2314@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2315 #define __get_user(x, ptr) \
2316 ({ \
2317 long __gu_err = 0; \
2318+ pax_open_userland(); \
2319 __get_user_err((x), (ptr), __gu_err); \
2320+ pax_close_userland(); \
2321 __gu_err; \
2322 })
2323
2324 #define __get_user_error(x, ptr, err) \
2325 ({ \
2326+ pax_open_userland(); \
2327 __get_user_err((x), (ptr), err); \
2328+ pax_close_userland(); \
2329 (void) 0; \
2330 })
2331
2332@@ -368,13 +409,17 @@ do { \
2333 #define __put_user(x, ptr) \
2334 ({ \
2335 long __pu_err = 0; \
2336+ pax_open_userland(); \
2337 __put_user_err((x), (ptr), __pu_err); \
2338+ pax_close_userland(); \
2339 __pu_err; \
2340 })
2341
2342 #define __put_user_error(x, ptr, err) \
2343 ({ \
2344+ pax_open_userland(); \
2345 __put_user_err((x), (ptr), err); \
2346+ pax_close_userland(); \
2347 (void) 0; \
2348 })
2349
2350@@ -474,11 +519,44 @@ do { \
2351
2352
2353 #ifdef CONFIG_MMU
2354-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2355-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2356+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2357+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2358+
2359+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2360+{
2361+ unsigned long ret;
2362+
2363+ check_object_size(to, n, false);
2364+ pax_open_userland();
2365+ ret = ___copy_from_user(to, from, n);
2366+ pax_close_userland();
2367+ return ret;
2368+}
2369+
2370+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2371+{
2372+ unsigned long ret;
2373+
2374+ check_object_size(from, n, true);
2375+ pax_open_userland();
2376+ ret = ___copy_to_user(to, from, n);
2377+ pax_close_userland();
2378+ return ret;
2379+}
2380+
2381 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2382-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2383+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2384 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2385+
2386+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2387+{
2388+ unsigned long ret;
2389+ pax_open_userland();
2390+ ret = ___clear_user(addr, n);
2391+ pax_close_userland();
2392+ return ret;
2393+}
2394+
2395 #else
2396 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2397 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2398@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2399
2400 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2401 {
2402+ if ((long)n < 0)
2403+ return n;
2404+
2405 if (access_ok(VERIFY_READ, from, n))
2406 n = __copy_from_user(to, from, n);
2407 else /* security hole - plug it */
2408@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2409
2410 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2411 {
2412+ if ((long)n < 0)
2413+ return n;
2414+
2415 if (access_ok(VERIFY_WRITE, to, n))
2416 n = __copy_to_user(to, from, n);
2417 return n;
2418diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2419index 5af0ed1..cea83883 100644
2420--- a/arch/arm/include/uapi/asm/ptrace.h
2421+++ b/arch/arm/include/uapi/asm/ptrace.h
2422@@ -92,7 +92,7 @@
2423 * ARMv7 groups of PSR bits
2424 */
2425 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2426-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2427+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2428 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2429 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2430
2431diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2432index a88671c..1cc895e 100644
2433--- a/arch/arm/kernel/armksyms.c
2434+++ b/arch/arm/kernel/armksyms.c
2435@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2436
2437 /* networking */
2438 EXPORT_SYMBOL(csum_partial);
2439-EXPORT_SYMBOL(csum_partial_copy_from_user);
2440+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2441 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2442 EXPORT_SYMBOL(__csum_ipv6_magic);
2443
2444@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2445 #ifdef CONFIG_MMU
2446 EXPORT_SYMBOL(copy_page);
2447
2448-EXPORT_SYMBOL(__copy_from_user);
2449-EXPORT_SYMBOL(__copy_to_user);
2450-EXPORT_SYMBOL(__clear_user);
2451+EXPORT_SYMBOL(___copy_from_user);
2452+EXPORT_SYMBOL(___copy_to_user);
2453+EXPORT_SYMBOL(___clear_user);
2454
2455 EXPORT_SYMBOL(__get_user_1);
2456 EXPORT_SYMBOL(__get_user_2);
2457diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
2458index 318da33..373689f 100644
2459--- a/arch/arm/kernel/cpuidle.c
2460+++ b/arch/arm/kernel/cpuidle.c
2461@@ -19,7 +19,7 @@ extern struct of_cpuidle_method __cpuidle_method_of_table[];
2462 static const struct of_cpuidle_method __cpuidle_method_of_table_sentinel
2463 __used __section(__cpuidle_method_of_table_end);
2464
2465-static struct cpuidle_ops cpuidle_ops[NR_CPUS];
2466+static struct cpuidle_ops cpuidle_ops[NR_CPUS] __read_only;
2467
2468 /**
2469 * arm_cpuidle_simple_enter() - a wrapper to cpu_do_idle()
2470diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2471index 570306c..c87f193 100644
2472--- a/arch/arm/kernel/entry-armv.S
2473+++ b/arch/arm/kernel/entry-armv.S
2474@@ -48,6 +48,87 @@
2475 9997:
2476 .endm
2477
2478+ .macro pax_enter_kernel
2479+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2480+ @ make aligned space for saved DACR
2481+ sub sp, sp, #8
2482+ @ save regs
2483+ stmdb sp!, {r1, r2}
2484+ @ read DACR from cpu_domain into r1
2485+ mov r2, sp
2486+ @ assume 8K pages, since we have to split the immediate in two
2487+ bic r2, r2, #(0x1fc0)
2488+ bic r2, r2, #(0x3f)
2489+ ldr r1, [r2, #TI_CPU_DOMAIN]
2490+ @ store old DACR on stack
2491+ str r1, [sp, #8]
2492+#ifdef CONFIG_PAX_KERNEXEC
2493+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2494+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2495+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2496+#endif
2497+#ifdef CONFIG_PAX_MEMORY_UDEREF
2498+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2499+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2500+#endif
2501+ @ write r1 to current_thread_info()->cpu_domain
2502+ str r1, [r2, #TI_CPU_DOMAIN]
2503+ @ write r1 to DACR
2504+ mcr p15, 0, r1, c3, c0, 0
2505+ @ instruction sync
2506+ instr_sync
2507+ @ restore regs
2508+ ldmia sp!, {r1, r2}
2509+#endif
2510+ .endm
2511+
2512+ .macro pax_open_userland
2513+#ifdef CONFIG_PAX_MEMORY_UDEREF
2514+ @ save regs
2515+ stmdb sp!, {r0, r1}
2516+ @ read DACR from cpu_domain into r1
2517+ mov r0, sp
2518+ @ assume 8K pages, since we have to split the immediate in two
2519+ bic r0, r0, #(0x1fc0)
2520+ bic r0, r0, #(0x3f)
2521+ ldr r1, [r0, #TI_CPU_DOMAIN]
2522+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2523+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2524+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2525+ @ write r1 to current_thread_info()->cpu_domain
2526+ str r1, [r0, #TI_CPU_DOMAIN]
2527+ @ write r1 to DACR
2528+ mcr p15, 0, r1, c3, c0, 0
2529+ @ instruction sync
2530+ instr_sync
2531+ @ restore regs
2532+ ldmia sp!, {r0, r1}
2533+#endif
2534+ .endm
2535+
2536+ .macro pax_close_userland
2537+#ifdef CONFIG_PAX_MEMORY_UDEREF
2538+ @ save regs
2539+ stmdb sp!, {r0, r1}
2540+ @ read DACR from cpu_domain into r1
2541+ mov r0, sp
2542+ @ assume 8K pages, since we have to split the immediate in two
2543+ bic r0, r0, #(0x1fc0)
2544+ bic r0, r0, #(0x3f)
2545+ ldr r1, [r0, #TI_CPU_DOMAIN]
2546+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2547+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2548+ @ write r1 to current_thread_info()->cpu_domain
2549+ str r1, [r0, #TI_CPU_DOMAIN]
2550+ @ write r1 to DACR
2551+ mcr p15, 0, r1, c3, c0, 0
2552+ @ instruction sync
2553+ instr_sync
2554+ @ restore regs
2555+ ldmia sp!, {r0, r1}
2556+#endif
2557+ .endm
2558+
2559 .macro pabt_helper
2560 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2561 #ifdef MULTI_PABORT
2562@@ -90,11 +171,15 @@
2563 * Invalid mode handlers
2564 */
2565 .macro inv_entry, reason
2566+
2567+ pax_enter_kernel
2568+
2569 sub sp, sp, #S_FRAME_SIZE
2570 ARM( stmib sp, {r1 - lr} )
2571 THUMB( stmia sp, {r0 - r12} )
2572 THUMB( str sp, [sp, #S_SP] )
2573 THUMB( str lr, [sp, #S_LR] )
2574+
2575 mov r1, #\reason
2576 .endm
2577
2578@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2579 .macro svc_entry, stack_hole=0, trace=1
2580 UNWIND(.fnstart )
2581 UNWIND(.save {r0 - pc} )
2582+
2583+ pax_enter_kernel
2584+
2585 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2586+
2587 #ifdef CONFIG_THUMB2_KERNEL
2588 SPFIX( str r0, [sp] ) @ temporarily saved
2589 SPFIX( mov r0, sp )
2590@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2591 ldmia r0, {r3 - r5}
2592 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2593 mov r6, #-1 @ "" "" "" ""
2594+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2595+ @ offset sp by 8 as done in pax_enter_kernel
2596+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2597+#else
2598 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2599+#endif
2600 SPFIX( addeq r2, r2, #4 )
2601 str r3, [sp, #-4]! @ save the "real" r0 copied
2602 @ from the exception stack
2603@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2604 .macro usr_entry, trace=1
2605 UNWIND(.fnstart )
2606 UNWIND(.cantunwind ) @ don't unwind the user space
2607+
2608+ pax_enter_kernel_user
2609+
2610 sub sp, sp, #S_FRAME_SIZE
2611 ARM( stmib sp, {r1 - r12} )
2612 THUMB( stmia sp, {r0 - r12} )
2613@@ -479,7 +576,9 @@ __und_usr:
2614 tst r3, #PSR_T_BIT @ Thumb mode?
2615 bne __und_usr_thumb
2616 sub r4, r2, #4 @ ARM instr at LR - 4
2617+ pax_open_userland
2618 1: ldrt r0, [r4]
2619+ pax_close_userland
2620 ARM_BE8(rev r0, r0) @ little endian instruction
2621
2622 @ r0 = 32-bit ARM instruction which caused the exception
2623@@ -513,11 +612,15 @@ __und_usr_thumb:
2624 */
2625 .arch armv6t2
2626 #endif
2627+ pax_open_userland
2628 2: ldrht r5, [r4]
2629+ pax_close_userland
2630 ARM_BE8(rev16 r5, r5) @ little endian instruction
2631 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2632 blo __und_usr_fault_16 @ 16bit undefined instruction
2633+ pax_open_userland
2634 3: ldrht r0, [r2]
2635+ pax_close_userland
2636 ARM_BE8(rev16 r0, r0) @ little endian instruction
2637 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2638 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2639@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2640 */
2641 .pushsection .text.fixup, "ax"
2642 .align 2
2643-4: str r4, [sp, #S_PC] @ retry current instruction
2644+4: pax_close_userland
2645+ str r4, [sp, #S_PC] @ retry current instruction
2646 ret r9
2647 .popsection
2648 .pushsection __ex_table,"a"
2649@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2650 THUMB( str lr, [ip], #4 )
2651 ldr r4, [r2, #TI_TP_VALUE]
2652 ldr r5, [r2, #TI_TP_VALUE + 4]
2653-#ifdef CONFIG_CPU_USE_DOMAINS
2654+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2655 ldr r6, [r2, #TI_CPU_DOMAIN]
2656 #endif
2657 switch_tls r1, r4, r5, r3, r7
2658@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2659 ldr r8, =__stack_chk_guard
2660 ldr r7, [r7, #TSK_STACK_CANARY]
2661 #endif
2662-#ifdef CONFIG_CPU_USE_DOMAINS
2663+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2664 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2665 #endif
2666 mov r5, r0
2667diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2668index 4e7f40c..0f9ee2c 100644
2669--- a/arch/arm/kernel/entry-common.S
2670+++ b/arch/arm/kernel/entry-common.S
2671@@ -11,18 +11,46 @@
2672 #include <asm/assembler.h>
2673 #include <asm/unistd.h>
2674 #include <asm/ftrace.h>
2675+#include <asm/domain.h>
2676 #include <asm/unwind.h>
2677
2678+#include "entry-header.S"
2679+
2680 #ifdef CONFIG_NEED_RET_TO_USER
2681 #include <mach/entry-macro.S>
2682 #else
2683 .macro arch_ret_to_user, tmp1, tmp2
2684+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2685+ @ save regs
2686+ stmdb sp!, {r1, r2}
2687+ @ read DACR from cpu_domain into r1
2688+ mov r2, sp
2689+ @ assume 8K pages, since we have to split the immediate in two
2690+ bic r2, r2, #(0x1fc0)
2691+ bic r2, r2, #(0x3f)
2692+ ldr r1, [r2, #TI_CPU_DOMAIN]
2693+#ifdef CONFIG_PAX_KERNEXEC
2694+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2695+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2696+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2697+#endif
2698+#ifdef CONFIG_PAX_MEMORY_UDEREF
2699+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2700+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2701+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2702+#endif
2703+ @ write r1 to current_thread_info()->cpu_domain
2704+ str r1, [r2, #TI_CPU_DOMAIN]
2705+ @ write r1 to DACR
2706+ mcr p15, 0, r1, c3, c0, 0
2707+ @ instruction sync
2708+ instr_sync
2709+ @ restore regs
2710+ ldmia sp!, {r1, r2}
2711+#endif
2712 .endm
2713 #endif
2714
2715-#include "entry-header.S"
2716-
2717-
2718 .align 5
2719 /*
2720 * This is the fast syscall return path. We do as little as
2721@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2722 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2723 #endif
2724
2725+ /*
2726+ * do this here to avoid a performance hit of wrapping the code above
2727+ * that directly dereferences userland to parse the SWI instruction
2728+ */
2729+ pax_enter_kernel_user
2730+
2731 adr tbl, sys_call_table @ load syscall table pointer
2732
2733 #if defined(CONFIG_OABI_COMPAT)
2734diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2735index 1a0045a..9b4f34d 100644
2736--- a/arch/arm/kernel/entry-header.S
2737+++ b/arch/arm/kernel/entry-header.S
2738@@ -196,6 +196,60 @@
2739 msr cpsr_c, \rtemp @ switch back to the SVC mode
2740 .endm
2741
2742+ .macro pax_enter_kernel_user
2743+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2744+ @ save regs
2745+ stmdb sp!, {r0, r1}
2746+ @ read DACR from cpu_domain into r1
2747+ mov r0, sp
2748+ @ assume 8K pages, since we have to split the immediate in two
2749+ bic r0, r0, #(0x1fc0)
2750+ bic r0, r0, #(0x3f)
2751+ ldr r1, [r0, #TI_CPU_DOMAIN]
2752+#ifdef CONFIG_PAX_MEMORY_UDEREF
2753+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2754+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2755+#endif
2756+#ifdef CONFIG_PAX_KERNEXEC
2757+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2758+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2759+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2760+#endif
2761+ @ write r1 to current_thread_info()->cpu_domain
2762+ str r1, [r0, #TI_CPU_DOMAIN]
2763+ @ write r1 to DACR
2764+ mcr p15, 0, r1, c3, c0, 0
2765+ @ instruction sync
2766+ instr_sync
2767+ @ restore regs
2768+ ldmia sp!, {r0, r1}
2769+#endif
2770+ .endm
2771+
2772+ .macro pax_exit_kernel
2773+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2774+ @ save regs
2775+ stmdb sp!, {r0, r1}
2776+ @ read old DACR from stack into r1
2777+ ldr r1, [sp, #(8 + S_SP)]
2778+ sub r1, r1, #8
2779+ ldr r1, [r1]
2780+
2781+ @ write r1 to current_thread_info()->cpu_domain
2782+ mov r0, sp
2783+ @ assume 8K pages, since we have to split the immediate in two
2784+ bic r0, r0, #(0x1fc0)
2785+ bic r0, r0, #(0x3f)
2786+ str r1, [r0, #TI_CPU_DOMAIN]
2787+ @ write r1 to DACR
2788+ mcr p15, 0, r1, c3, c0, 0
2789+ @ instruction sync
2790+ instr_sync
2791+ @ restore regs
2792+ ldmia sp!, {r0, r1}
2793+#endif
2794+ .endm
2795+
2796 #ifndef CONFIG_THUMB2_KERNEL
2797 .macro svc_exit, rpsr, irq = 0
2798 .if \irq != 0
2799@@ -215,6 +269,9 @@
2800 blne trace_hardirqs_off
2801 #endif
2802 .endif
2803+
2804+ pax_exit_kernel
2805+
2806 msr spsr_cxsf, \rpsr
2807 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2808 @ We must avoid clrex due to Cortex-A15 erratum #830321
2809@@ -291,6 +348,9 @@
2810 blne trace_hardirqs_off
2811 #endif
2812 .endif
2813+
2814+ pax_exit_kernel
2815+
2816 ldr lr, [sp, #S_SP] @ top of the stack
2817 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2818
2819diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2820index 059c3da..8e45cfc 100644
2821--- a/arch/arm/kernel/fiq.c
2822+++ b/arch/arm/kernel/fiq.c
2823@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2824 void *base = vectors_page;
2825 unsigned offset = FIQ_OFFSET;
2826
2827+ pax_open_kernel();
2828 memcpy(base + offset, start, length);
2829+ pax_close_kernel();
2830+
2831 if (!cache_is_vipt_nonaliasing())
2832 flush_icache_range((unsigned long)base + offset, offset +
2833 length);
2834diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2835index 3637973..cb29657 100644
2836--- a/arch/arm/kernel/head.S
2837+++ b/arch/arm/kernel/head.S
2838@@ -444,7 +444,7 @@ __enable_mmu:
2839 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2840 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2841 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2842- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2843+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2844 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2845 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2846 #endif
2847diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2848index af791f4..3ff9821 100644
2849--- a/arch/arm/kernel/module.c
2850+++ b/arch/arm/kernel/module.c
2851@@ -38,12 +38,39 @@
2852 #endif
2853
2854 #ifdef CONFIG_MMU
2855-void *module_alloc(unsigned long size)
2856+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2857 {
2858+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2859+ return NULL;
2860 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2861- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2862+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2863 __builtin_return_address(0));
2864 }
2865+
2866+void *module_alloc(unsigned long size)
2867+{
2868+
2869+#ifdef CONFIG_PAX_KERNEXEC
2870+ return __module_alloc(size, PAGE_KERNEL);
2871+#else
2872+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2873+#endif
2874+
2875+}
2876+
2877+#ifdef CONFIG_PAX_KERNEXEC
2878+void module_memfree_exec(void *module_region)
2879+{
2880+ module_memfree(module_region);
2881+}
2882+EXPORT_SYMBOL(module_memfree_exec);
2883+
2884+void *module_alloc_exec(unsigned long size)
2885+{
2886+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2887+}
2888+EXPORT_SYMBOL(module_alloc_exec);
2889+#endif
2890 #endif
2891
2892 int
2893diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2894index 69bda1a..755113a 100644
2895--- a/arch/arm/kernel/patch.c
2896+++ b/arch/arm/kernel/patch.c
2897@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2898 else
2899 __acquire(&patch_lock);
2900
2901+ pax_open_kernel();
2902 if (thumb2 && __opcode_is_thumb16(insn)) {
2903 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2904 size = sizeof(u16);
2905@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2906 *(u32 *)waddr = insn;
2907 size = sizeof(u32);
2908 }
2909+ pax_close_kernel();
2910
2911 if (waddr != addr) {
2912 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2913diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2914index f192a2a..1a40523 100644
2915--- a/arch/arm/kernel/process.c
2916+++ b/arch/arm/kernel/process.c
2917@@ -105,8 +105,8 @@ void __show_regs(struct pt_regs *regs)
2918
2919 show_regs_print_info(KERN_DEFAULT);
2920
2921- print_symbol("PC is at %s\n", instruction_pointer(regs));
2922- print_symbol("LR is at %s\n", regs->ARM_lr);
2923+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2924+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2925 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2926 "sp : %08lx ip : %08lx fp : %08lx\n",
2927 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2928@@ -283,12 +283,6 @@ unsigned long get_wchan(struct task_struct *p)
2929 return 0;
2930 }
2931
2932-unsigned long arch_randomize_brk(struct mm_struct *mm)
2933-{
2934- unsigned long range_end = mm->brk + 0x02000000;
2935- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2936-}
2937-
2938 #ifdef CONFIG_MMU
2939 #ifdef CONFIG_KUSER_HELPERS
2940 /*
2941@@ -304,7 +298,7 @@ static struct vm_area_struct gate_vma = {
2942
2943 static int __init gate_vma_init(void)
2944 {
2945- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2946+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2947 return 0;
2948 }
2949 arch_initcall(gate_vma_init);
2950@@ -333,91 +327,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2951 return is_gate_vma(vma) ? "[vectors]" : NULL;
2952 }
2953
2954-/* If possible, provide a placement hint at a random offset from the
2955- * stack for the sigpage and vdso pages.
2956- */
2957-static unsigned long sigpage_addr(const struct mm_struct *mm,
2958- unsigned int npages)
2959-{
2960- unsigned long offset;
2961- unsigned long first;
2962- unsigned long last;
2963- unsigned long addr;
2964- unsigned int slots;
2965-
2966- first = PAGE_ALIGN(mm->start_stack);
2967-
2968- last = TASK_SIZE - (npages << PAGE_SHIFT);
2969-
2970- /* No room after stack? */
2971- if (first > last)
2972- return 0;
2973-
2974- /* Just enough room? */
2975- if (first == last)
2976- return first;
2977-
2978- slots = ((last - first) >> PAGE_SHIFT) + 1;
2979-
2980- offset = get_random_int() % slots;
2981-
2982- addr = first + (offset << PAGE_SHIFT);
2983-
2984- return addr;
2985-}
2986-
2987-static struct page *signal_page;
2988-extern struct page *get_signal_page(void);
2989-
2990-static const struct vm_special_mapping sigpage_mapping = {
2991- .name = "[sigpage]",
2992- .pages = &signal_page,
2993-};
2994-
2995 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2996 {
2997 struct mm_struct *mm = current->mm;
2998- struct vm_area_struct *vma;
2999- unsigned long npages;
3000- unsigned long addr;
3001- unsigned long hint;
3002- int ret = 0;
3003-
3004- if (!signal_page)
3005- signal_page = get_signal_page();
3006- if (!signal_page)
3007- return -ENOMEM;
3008-
3009- npages = 1; /* for sigpage */
3010- npages += vdso_total_pages;
3011
3012 down_write(&mm->mmap_sem);
3013- hint = sigpage_addr(mm, npages);
3014- addr = get_unmapped_area(NULL, hint, npages << PAGE_SHIFT, 0, 0);
3015- if (IS_ERR_VALUE(addr)) {
3016- ret = addr;
3017- goto up_fail;
3018- }
3019-
3020- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
3021- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
3022- &sigpage_mapping);
3023-
3024- if (IS_ERR(vma)) {
3025- ret = PTR_ERR(vma);
3026- goto up_fail;
3027- }
3028-
3029- mm->context.sigpage = addr;
3030-
3031- /* Unlike the sigpage, failure to install the vdso is unlikely
3032- * to be fatal to the process, so no error check needed
3033- * here.
3034- */
3035- arm_install_vdso(mm, addr + PAGE_SIZE);
3036-
3037- up_fail:
3038+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3039 up_write(&mm->mmap_sem);
3040- return ret;
3041+ return 0;
3042 }
3043 #endif
3044diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3045index f90fdf4..24e8c84 100644
3046--- a/arch/arm/kernel/psci.c
3047+++ b/arch/arm/kernel/psci.c
3048@@ -26,7 +26,7 @@
3049 #include <asm/psci.h>
3050 #include <asm/system_misc.h>
3051
3052-struct psci_operations psci_ops;
3053+struct psci_operations psci_ops __read_only;
3054
3055 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3056 typedef int (*psci_initcall_t)(const struct device_node *);
3057diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3058index ef9119f..31995a3 100644
3059--- a/arch/arm/kernel/ptrace.c
3060+++ b/arch/arm/kernel/ptrace.c
3061@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3062 regs->ARM_ip = ip;
3063 }
3064
3065+#ifdef CONFIG_GRKERNSEC_SETXID
3066+extern void gr_delayed_cred_worker(void);
3067+#endif
3068+
3069 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3070 {
3071 current_thread_info()->syscall = scno;
3072
3073+#ifdef CONFIG_GRKERNSEC_SETXID
3074+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3075+ gr_delayed_cred_worker();
3076+#endif
3077+
3078 /* Do the secure computing check first; failures should be fast. */
3079 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3080 if (secure_computing() == -1)
3081diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
3082index 1a4d232..2677169 100644
3083--- a/arch/arm/kernel/reboot.c
3084+++ b/arch/arm/kernel/reboot.c
3085@@ -122,6 +122,7 @@ void machine_power_off(void)
3086
3087 if (pm_power_off)
3088 pm_power_off();
3089+ while (1);
3090 }
3091
3092 /*
3093diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3094index 6c777e9..3d2d0ca 100644
3095--- a/arch/arm/kernel/setup.c
3096+++ b/arch/arm/kernel/setup.c
3097@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3098 unsigned int elf_hwcap2 __read_mostly;
3099 EXPORT_SYMBOL(elf_hwcap2);
3100
3101+pteval_t __supported_pte_mask __read_only;
3102+pmdval_t __supported_pmd_mask __read_only;
3103
3104 #ifdef MULTI_CPU
3105-struct processor processor __read_mostly;
3106+struct processor processor __read_only;
3107 #endif
3108 #ifdef MULTI_TLB
3109-struct cpu_tlb_fns cpu_tlb __read_mostly;
3110+struct cpu_tlb_fns cpu_tlb __read_only;
3111 #endif
3112 #ifdef MULTI_USER
3113-struct cpu_user_fns cpu_user __read_mostly;
3114+struct cpu_user_fns cpu_user __read_only;
3115 #endif
3116 #ifdef MULTI_CACHE
3117-struct cpu_cache_fns cpu_cache __read_mostly;
3118+struct cpu_cache_fns cpu_cache __read_only;
3119 #endif
3120 #ifdef CONFIG_OUTER_CACHE
3121-struct outer_cache_fns outer_cache __read_mostly;
3122+struct outer_cache_fns outer_cache __read_only;
3123 EXPORT_SYMBOL(outer_cache);
3124 #endif
3125
3126@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3127 * Register 0 and check for VMSAv7 or PMSAv7 */
3128 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3129 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3130- (mmfr0 & 0x000000f0) >= 0x00000030)
3131+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3132 cpu_arch = CPU_ARCH_ARMv7;
3133- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3134+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3135+ __supported_pte_mask |= L_PTE_PXN;
3136+ __supported_pmd_mask |= PMD_PXNTABLE;
3137+ }
3138+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3139 (mmfr0 & 0x000000f0) == 0x00000020)
3140 cpu_arch = CPU_ARCH_ARMv6;
3141 else
3142diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3143index 423663e..bfeb0ff 100644
3144--- a/arch/arm/kernel/signal.c
3145+++ b/arch/arm/kernel/signal.c
3146@@ -24,8 +24,6 @@
3147
3148 extern const unsigned long sigreturn_codes[7];
3149
3150-static unsigned long signal_return_offset;
3151-
3152 #ifdef CONFIG_CRUNCH
3153 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3154 {
3155@@ -385,8 +383,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3156 * except when the MPU has protected the vectors
3157 * page from PL0
3158 */
3159- retcode = mm->context.sigpage + signal_return_offset +
3160- (idx << 2) + thumb;
3161+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3162 } else
3163 #endif
3164 {
3165@@ -592,33 +589,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3166 } while (thread_flags & _TIF_WORK_MASK);
3167 return 0;
3168 }
3169-
3170-struct page *get_signal_page(void)
3171-{
3172- unsigned long ptr;
3173- unsigned offset;
3174- struct page *page;
3175- void *addr;
3176-
3177- page = alloc_pages(GFP_KERNEL, 0);
3178-
3179- if (!page)
3180- return NULL;
3181-
3182- addr = page_address(page);
3183-
3184- /* Give the signal return code some randomness */
3185- offset = 0x200 + (get_random_int() & 0x7fc);
3186- signal_return_offset = offset;
3187-
3188- /*
3189- * Copy signal return handlers into the vector page, and
3190- * set sigreturn to be a pointer to these.
3191- */
3192- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3193-
3194- ptr = (unsigned long)addr + offset;
3195- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3196-
3197- return page;
3198-}
3199diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3200index f11d825..bbe686f 100644
3201--- a/arch/arm/kernel/smp.c
3202+++ b/arch/arm/kernel/smp.c
3203@@ -76,7 +76,7 @@ enum ipi_msg_type {
3204
3205 static DECLARE_COMPLETION(cpu_running);
3206
3207-static struct smp_operations smp_ops;
3208+static struct smp_operations smp_ops __read_only;
3209
3210 void __init smp_set_ops(struct smp_operations *ops)
3211 {
3212diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3213index 7a3be1d..b00c7de 100644
3214--- a/arch/arm/kernel/tcm.c
3215+++ b/arch/arm/kernel/tcm.c
3216@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3217 .virtual = ITCM_OFFSET,
3218 .pfn = __phys_to_pfn(ITCM_OFFSET),
3219 .length = 0,
3220- .type = MT_MEMORY_RWX_ITCM,
3221+ .type = MT_MEMORY_RX_ITCM,
3222 }
3223 };
3224
3225@@ -267,7 +267,9 @@ no_dtcm:
3226 start = &__sitcm_text;
3227 end = &__eitcm_text;
3228 ram = &__itcm_start;
3229+ pax_open_kernel();
3230 memcpy(start, ram, itcm_code_sz);
3231+ pax_close_kernel();
3232 pr_debug("CPU ITCM: copied code from %p - %p\n",
3233 start, end);
3234 itcm_present = true;
3235diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3236index 3dce1a3..60e857f 100644
3237--- a/arch/arm/kernel/traps.c
3238+++ b/arch/arm/kernel/traps.c
3239@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3240 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3241 {
3242 #ifdef CONFIG_KALLSYMS
3243- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3244+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3245 #else
3246 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3247 #endif
3248@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3249 static int die_owner = -1;
3250 static unsigned int die_nest_count;
3251
3252+extern void gr_handle_kernel_exploit(void);
3253+
3254 static unsigned long oops_begin(void)
3255 {
3256 int cpu;
3257@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3258 panic("Fatal exception in interrupt");
3259 if (panic_on_oops)
3260 panic("Fatal exception");
3261+
3262+ gr_handle_kernel_exploit();
3263+
3264 if (signr)
3265 do_exit(signr);
3266 }
3267@@ -878,7 +883,11 @@ void __init early_trap_init(void *vectors_base)
3268 kuser_init(vectors_base);
3269
3270 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3271- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3272+
3273+#ifndef CONFIG_PAX_MEMORY_UDEREF
3274+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3275+#endif
3276+
3277 #else /* ifndef CONFIG_CPU_V7M */
3278 /*
3279 * on V7-M there is no need to copy the vector table to a dedicated
3280diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3281index 8b60fde..8d986dd 100644
3282--- a/arch/arm/kernel/vmlinux.lds.S
3283+++ b/arch/arm/kernel/vmlinux.lds.S
3284@@ -37,7 +37,7 @@
3285 #endif
3286
3287 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3288- defined(CONFIG_GENERIC_BUG)
3289+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3290 #define ARM_EXIT_KEEP(x) x
3291 #define ARM_EXIT_DISCARD(x)
3292 #else
3293@@ -120,6 +120,8 @@ SECTIONS
3294 #ifdef CONFIG_DEBUG_RODATA
3295 . = ALIGN(1<<SECTION_SHIFT);
3296 #endif
3297+ _etext = .; /* End of text section */
3298+
3299 RO_DATA(PAGE_SIZE)
3300
3301 . = ALIGN(4);
3302@@ -150,8 +152,6 @@ SECTIONS
3303
3304 NOTES
3305
3306- _etext = .; /* End of text and rodata section */
3307-
3308 #ifndef CONFIG_XIP_KERNEL
3309 # ifdef CONFIG_ARM_KERNMEM_PERMS
3310 . = ALIGN(1<<SECTION_SHIFT);
3311diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3312index d9631ec..b0c966c 100644
3313--- a/arch/arm/kvm/arm.c
3314+++ b/arch/arm/kvm/arm.c
3315@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3316 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3317
3318 /* The VMID used in the VTTBR */
3319-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3320+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3321 static u8 kvm_next_vmid;
3322 static DEFINE_SPINLOCK(kvm_vmid_lock);
3323
3324@@ -373,7 +373,7 @@ void force_vm_exit(const cpumask_t *mask)
3325 */
3326 static bool need_new_vmid_gen(struct kvm *kvm)
3327 {
3328- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3329+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3330 }
3331
3332 /**
3333@@ -406,7 +406,7 @@ static void update_vttbr(struct kvm *kvm)
3334
3335 /* First user of a new VMID generation? */
3336 if (unlikely(kvm_next_vmid == 0)) {
3337- atomic64_inc(&kvm_vmid_gen);
3338+ atomic64_inc_unchecked(&kvm_vmid_gen);
3339 kvm_next_vmid = 1;
3340
3341 /*
3342@@ -423,7 +423,7 @@ static void update_vttbr(struct kvm *kvm)
3343 kvm_call_hyp(__kvm_flush_vm_context);
3344 }
3345
3346- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3347+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3348 kvm->arch.vmid = kvm_next_vmid;
3349 kvm_next_vmid++;
3350
3351@@ -1098,7 +1098,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3352 /**
3353 * Initialize Hyp-mode and memory mappings on all CPUs.
3354 */
3355-int kvm_arch_init(void *opaque)
3356+int kvm_arch_init(const void *opaque)
3357 {
3358 int err;
3359 int ret, cpu;
3360diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3361index 1710fd7..ec3e014 100644
3362--- a/arch/arm/lib/clear_user.S
3363+++ b/arch/arm/lib/clear_user.S
3364@@ -12,14 +12,14 @@
3365
3366 .text
3367
3368-/* Prototype: int __clear_user(void *addr, size_t sz)
3369+/* Prototype: int ___clear_user(void *addr, size_t sz)
3370 * Purpose : clear some user memory
3371 * Params : addr - user memory address to clear
3372 * : sz - number of bytes to clear
3373 * Returns : number of bytes NOT cleared
3374 */
3375 ENTRY(__clear_user_std)
3376-WEAK(__clear_user)
3377+WEAK(___clear_user)
3378 stmfd sp!, {r1, lr}
3379 mov r2, #0
3380 cmp r1, #4
3381@@ -44,7 +44,7 @@ WEAK(__clear_user)
3382 USER( strnebt r2, [r0])
3383 mov r0, #0
3384 ldmfd sp!, {r1, pc}
3385-ENDPROC(__clear_user)
3386+ENDPROC(___clear_user)
3387 ENDPROC(__clear_user_std)
3388
3389 .pushsection .text.fixup,"ax"
3390diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3391index 7a235b9..73a0556 100644
3392--- a/arch/arm/lib/copy_from_user.S
3393+++ b/arch/arm/lib/copy_from_user.S
3394@@ -17,7 +17,7 @@
3395 /*
3396 * Prototype:
3397 *
3398- * size_t __copy_from_user(void *to, const void *from, size_t n)
3399+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3400 *
3401 * Purpose:
3402 *
3403@@ -89,11 +89,11 @@
3404
3405 .text
3406
3407-ENTRY(__copy_from_user)
3408+ENTRY(___copy_from_user)
3409
3410 #include "copy_template.S"
3411
3412-ENDPROC(__copy_from_user)
3413+ENDPROC(___copy_from_user)
3414
3415 .pushsection .fixup,"ax"
3416 .align 0
3417diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3418index 6ee2f67..d1cce76 100644
3419--- a/arch/arm/lib/copy_page.S
3420+++ b/arch/arm/lib/copy_page.S
3421@@ -10,6 +10,7 @@
3422 * ASM optimised string functions
3423 */
3424 #include <linux/linkage.h>
3425+#include <linux/const.h>
3426 #include <asm/assembler.h>
3427 #include <asm/asm-offsets.h>
3428 #include <asm/cache.h>
3429diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3430index 9648b06..19c333c 100644
3431--- a/arch/arm/lib/copy_to_user.S
3432+++ b/arch/arm/lib/copy_to_user.S
3433@@ -17,7 +17,7 @@
3434 /*
3435 * Prototype:
3436 *
3437- * size_t __copy_to_user(void *to, const void *from, size_t n)
3438+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3439 *
3440 * Purpose:
3441 *
3442@@ -93,11 +93,11 @@
3443 .text
3444
3445 ENTRY(__copy_to_user_std)
3446-WEAK(__copy_to_user)
3447+WEAK(___copy_to_user)
3448
3449 #include "copy_template.S"
3450
3451-ENDPROC(__copy_to_user)
3452+ENDPROC(___copy_to_user)
3453 ENDPROC(__copy_to_user_std)
3454
3455 .pushsection .text.fixup,"ax"
3456diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3457index 1d0957e..f708846 100644
3458--- a/arch/arm/lib/csumpartialcopyuser.S
3459+++ b/arch/arm/lib/csumpartialcopyuser.S
3460@@ -57,8 +57,8 @@
3461 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3462 */
3463
3464-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3465-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3466+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3467+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3468
3469 #include "csumpartialcopygeneric.S"
3470
3471diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3472index 8044591..c9b2609 100644
3473--- a/arch/arm/lib/delay.c
3474+++ b/arch/arm/lib/delay.c
3475@@ -29,7 +29,7 @@
3476 /*
3477 * Default to the loop-based delay implementation.
3478 */
3479-struct arm_delay_ops arm_delay_ops = {
3480+struct arm_delay_ops arm_delay_ops __read_only = {
3481 .delay = __loop_delay,
3482 .const_udelay = __loop_const_udelay,
3483 .udelay = __loop_udelay,
3484diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3485index 3e58d71..029817c 100644
3486--- a/arch/arm/lib/uaccess_with_memcpy.c
3487+++ b/arch/arm/lib/uaccess_with_memcpy.c
3488@@ -136,7 +136,7 @@ out:
3489 }
3490
3491 unsigned long
3492-__copy_to_user(void __user *to, const void *from, unsigned long n)
3493+___copy_to_user(void __user *to, const void *from, unsigned long n)
3494 {
3495 /*
3496 * This test is stubbed out of the main function above to keep
3497@@ -190,7 +190,7 @@ out:
3498 return n;
3499 }
3500
3501-unsigned long __clear_user(void __user *addr, unsigned long n)
3502+unsigned long ___clear_user(void __user *addr, unsigned long n)
3503 {
3504 /* See rational for this in __copy_to_user() above. */
3505 if (n < 64)
3506diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3507index 7d23ce0..5ef383a 100644
3508--- a/arch/arm/mach-exynos/suspend.c
3509+++ b/arch/arm/mach-exynos/suspend.c
3510@@ -738,8 +738,10 @@ void __init exynos_pm_init(void)
3511 tmp |= pm_data->wake_disable_mask;
3512 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3513
3514- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3515- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3516+ pax_open_kernel();
3517+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3518+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3519+ pax_close_kernel();
3520
3521 register_syscore_ops(&exynos_pm_syscore_ops);
3522 suspend_set_ops(&exynos_suspend_ops);
3523diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3524index 0662087..004d163 100644
3525--- a/arch/arm/mach-keystone/keystone.c
3526+++ b/arch/arm/mach-keystone/keystone.c
3527@@ -27,7 +27,7 @@
3528
3529 #include "keystone.h"
3530
3531-static struct notifier_block platform_nb;
3532+static notifier_block_no_const platform_nb;
3533 static unsigned long keystone_dma_pfn_offset __read_mostly;
3534
3535 static int keystone_platform_notifier(struct notifier_block *nb,
3536diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3537index e46e9ea..9141c83 100644
3538--- a/arch/arm/mach-mvebu/coherency.c
3539+++ b/arch/arm/mach-mvebu/coherency.c
3540@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3541
3542 /*
3543 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3544- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3545+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3546 * is needed as a workaround for a deadlock issue between the PCIe
3547 * interface and the cache controller.
3548 */
3549@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3550 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3551
3552 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3553- mtype = MT_UNCACHED;
3554+ mtype = MT_UNCACHED_RW;
3555
3556 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3557 }
3558diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3559index b6443a4..20a0b74 100644
3560--- a/arch/arm/mach-omap2/board-n8x0.c
3561+++ b/arch/arm/mach-omap2/board-n8x0.c
3562@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3563 }
3564 #endif
3565
3566-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3567+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3568 .late_init = n8x0_menelaus_late_init,
3569 };
3570
3571diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3572index 79f49d9..70bf184 100644
3573--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3574+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3575@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3576 void (*resume)(void);
3577 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3578 void (*hotplug_restart)(void);
3579-};
3580+} __no_const;
3581
3582 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3583 static struct powerdomain *mpuss_pd;
3584@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3585 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3586 {}
3587
3588-struct cpu_pm_ops omap_pm_ops = {
3589+static struct cpu_pm_ops omap_pm_ops __read_only = {
3590 .finish_suspend = default_finish_suspend,
3591 .resume = dummy_cpu_resume,
3592 .scu_prepare = dummy_scu_prepare,
3593diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3594index 5305ec7..6d74045 100644
3595--- a/arch/arm/mach-omap2/omap-smp.c
3596+++ b/arch/arm/mach-omap2/omap-smp.c
3597@@ -19,6 +19,7 @@
3598 #include <linux/device.h>
3599 #include <linux/smp.h>
3600 #include <linux/io.h>
3601+#include <linux/irq.h>
3602 #include <linux/irqchip/arm-gic.h>
3603
3604 #include <asm/smp_scu.h>
3605diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3606index 6833df4..3e059b2 100644
3607--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3608+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3609@@ -330,7 +330,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3610 return NOTIFY_OK;
3611 }
3612
3613-static struct notifier_block __refdata irq_hotplug_notifier = {
3614+static struct notifier_block irq_hotplug_notifier = {
3615 .notifier_call = irq_cpu_hotplug_notify,
3616 };
3617
3618diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3619index 166b18f..f985f04 100644
3620--- a/arch/arm/mach-omap2/omap_device.c
3621+++ b/arch/arm/mach-omap2/omap_device.c
3622@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3623 struct platform_device __init *omap_device_build(const char *pdev_name,
3624 int pdev_id,
3625 struct omap_hwmod *oh,
3626- void *pdata, int pdata_len)
3627+ const void *pdata, int pdata_len)
3628 {
3629 struct omap_hwmod *ohs[] = { oh };
3630
3631@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3632 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3633 int pdev_id,
3634 struct omap_hwmod **ohs,
3635- int oh_cnt, void *pdata,
3636+ int oh_cnt, const void *pdata,
3637 int pdata_len)
3638 {
3639 int ret = -ENOMEM;
3640diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3641index 78c02b3..c94109a 100644
3642--- a/arch/arm/mach-omap2/omap_device.h
3643+++ b/arch/arm/mach-omap2/omap_device.h
3644@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3645 /* Core code interface */
3646
3647 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3648- struct omap_hwmod *oh, void *pdata,
3649+ struct omap_hwmod *oh, const void *pdata,
3650 int pdata_len);
3651
3652 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3653 struct omap_hwmod **oh, int oh_cnt,
3654- void *pdata, int pdata_len);
3655+ const void *pdata, int pdata_len);
3656
3657 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3658 struct omap_hwmod **ohs, int oh_cnt);
3659diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3660index 5286e77..fdd234c 100644
3661--- a/arch/arm/mach-omap2/omap_hwmod.c
3662+++ b/arch/arm/mach-omap2/omap_hwmod.c
3663@@ -199,10 +199,10 @@ struct omap_hwmod_soc_ops {
3664 int (*init_clkdm)(struct omap_hwmod *oh);
3665 void (*update_context_lost)(struct omap_hwmod *oh);
3666 int (*get_context_lost)(struct omap_hwmod *oh);
3667-};
3668+} __no_const;
3669
3670 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3671-static struct omap_hwmod_soc_ops soc_ops;
3672+static struct omap_hwmod_soc_ops soc_ops __read_only;
3673
3674 /* omap_hwmod_list contains all registered struct omap_hwmods */
3675 static LIST_HEAD(omap_hwmod_list);
3676diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3677index 95fee54..cfa9cf1 100644
3678--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3679+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3680@@ -10,6 +10,7 @@
3681
3682 #include <linux/kernel.h>
3683 #include <linux/init.h>
3684+#include <asm/pgtable.h>
3685
3686 #include "powerdomain.h"
3687
3688@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3689
3690 void __init am43xx_powerdomains_init(void)
3691 {
3692- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3693+ pax_open_kernel();
3694+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3695+ pax_close_kernel();
3696 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3697 pwrdm_register_pwrdms(powerdomains_am43xx);
3698 pwrdm_complete_init();
3699diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3700index ff0a68c..b312aa0 100644
3701--- a/arch/arm/mach-omap2/wd_timer.c
3702+++ b/arch/arm/mach-omap2/wd_timer.c
3703@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3704 struct omap_hwmod *oh;
3705 char *oh_name = "wd_timer2";
3706 char *dev_name = "omap_wdt";
3707- struct omap_wd_timer_platform_data pdata;
3708+ static struct omap_wd_timer_platform_data pdata = {
3709+ .read_reset_sources = prm_read_reset_sources
3710+ };
3711
3712 if (!cpu_class_is_omap2() || of_have_populated_dt())
3713 return 0;
3714@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3715 return -EINVAL;
3716 }
3717
3718- pdata.read_reset_sources = prm_read_reset_sources;
3719-
3720 pdev = omap_device_build(dev_name, id, oh, &pdata,
3721 sizeof(struct omap_wd_timer_platform_data));
3722 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3723diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3724index 7469347..1ecc350 100644
3725--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3726+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3727@@ -177,7 +177,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3728 bool entered_lp2 = false;
3729
3730 if (tegra_pending_sgi())
3731- ACCESS_ONCE(abort_flag) = true;
3732+ ACCESS_ONCE_RW(abort_flag) = true;
3733
3734 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3735
3736diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3737index 3b9098d..15b390f 100644
3738--- a/arch/arm/mach-tegra/irq.c
3739+++ b/arch/arm/mach-tegra/irq.c
3740@@ -20,6 +20,7 @@
3741 #include <linux/cpu_pm.h>
3742 #include <linux/interrupt.h>
3743 #include <linux/io.h>
3744+#include <linux/irq.h>
3745 #include <linux/irqchip/arm-gic.h>
3746 #include <linux/irq.h>
3747 #include <linux/kernel.h>
3748diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3749index 2cb587b..6ddfebf 100644
3750--- a/arch/arm/mach-ux500/pm.c
3751+++ b/arch/arm/mach-ux500/pm.c
3752@@ -10,6 +10,7 @@
3753 */
3754
3755 #include <linux/kernel.h>
3756+#include <linux/irq.h>
3757 #include <linux/irqchip/arm-gic.h>
3758 #include <linux/delay.h>
3759 #include <linux/io.h>
3760diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3761index 2dea8b5..6499da2 100644
3762--- a/arch/arm/mach-ux500/setup.h
3763+++ b/arch/arm/mach-ux500/setup.h
3764@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3765 .type = MT_DEVICE, \
3766 }
3767
3768-#define __MEM_DEV_DESC(x, sz) { \
3769- .virtual = IO_ADDRESS(x), \
3770- .pfn = __phys_to_pfn(x), \
3771- .length = sz, \
3772- .type = MT_MEMORY_RWX, \
3773-}
3774-
3775 extern struct smp_operations ux500_smp_ops;
3776 extern void ux500_cpu_die(unsigned int cpu);
3777
3778diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3779index f66816c..228b951 100644
3780--- a/arch/arm/mach-zynq/platsmp.c
3781+++ b/arch/arm/mach-zynq/platsmp.c
3782@@ -24,6 +24,7 @@
3783 #include <linux/io.h>
3784 #include <asm/cacheflush.h>
3785 #include <asm/smp_scu.h>
3786+#include <linux/irq.h>
3787 #include <linux/irqchip/arm-gic.h>
3788 #include "common.h"
3789
3790diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3791index b4f92b9..ffefea9 100644
3792--- a/arch/arm/mm/Kconfig
3793+++ b/arch/arm/mm/Kconfig
3794@@ -446,6 +446,7 @@ config CPU_32v5
3795
3796 config CPU_32v6
3797 bool
3798+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3799 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3800
3801 config CPU_32v6K
3802@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3803
3804 config CPU_USE_DOMAINS
3805 bool
3806+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3807 help
3808 This option enables or disables the use of domain switching
3809 via the set_fs() function.
3810@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3811
3812 config KUSER_HELPERS
3813 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3814- depends on MMU
3815+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3816 default y
3817 help
3818 Warning: disabling this option may break user programs.
3819@@ -812,7 +814,7 @@ config KUSER_HELPERS
3820 See Documentation/arm/kernel_user_helpers.txt for details.
3821
3822 However, the fixed address nature of these helpers can be used
3823- by ROP (return orientated programming) authors when creating
3824+ by ROP (Return Oriented Programming) authors when creating
3825 exploits.
3826
3827 If all of the binaries and libraries which run on your platform
3828diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3829index 9769f1e..16aaa55 100644
3830--- a/arch/arm/mm/alignment.c
3831+++ b/arch/arm/mm/alignment.c
3832@@ -216,10 +216,12 @@ union offset_union {
3833 #define __get16_unaligned_check(ins,val,addr) \
3834 do { \
3835 unsigned int err = 0, v, a = addr; \
3836+ pax_open_userland(); \
3837 __get8_unaligned_check(ins,v,a,err); \
3838 val = v << ((BE) ? 8 : 0); \
3839 __get8_unaligned_check(ins,v,a,err); \
3840 val |= v << ((BE) ? 0 : 8); \
3841+ pax_close_userland(); \
3842 if (err) \
3843 goto fault; \
3844 } while (0)
3845@@ -233,6 +235,7 @@ union offset_union {
3846 #define __get32_unaligned_check(ins,val,addr) \
3847 do { \
3848 unsigned int err = 0, v, a = addr; \
3849+ pax_open_userland(); \
3850 __get8_unaligned_check(ins,v,a,err); \
3851 val = v << ((BE) ? 24 : 0); \
3852 __get8_unaligned_check(ins,v,a,err); \
3853@@ -241,6 +244,7 @@ union offset_union {
3854 val |= v << ((BE) ? 8 : 16); \
3855 __get8_unaligned_check(ins,v,a,err); \
3856 val |= v << ((BE) ? 0 : 24); \
3857+ pax_close_userland(); \
3858 if (err) \
3859 goto fault; \
3860 } while (0)
3861@@ -254,6 +258,7 @@ union offset_union {
3862 #define __put16_unaligned_check(ins,val,addr) \
3863 do { \
3864 unsigned int err = 0, v = val, a = addr; \
3865+ pax_open_userland(); \
3866 __asm__( FIRST_BYTE_16 \
3867 ARM( "1: "ins" %1, [%2], #1\n" ) \
3868 THUMB( "1: "ins" %1, [%2]\n" ) \
3869@@ -273,6 +278,7 @@ union offset_union {
3870 " .popsection\n" \
3871 : "=r" (err), "=&r" (v), "=&r" (a) \
3872 : "0" (err), "1" (v), "2" (a)); \
3873+ pax_close_userland(); \
3874 if (err) \
3875 goto fault; \
3876 } while (0)
3877@@ -286,6 +292,7 @@ union offset_union {
3878 #define __put32_unaligned_check(ins,val,addr) \
3879 do { \
3880 unsigned int err = 0, v = val, a = addr; \
3881+ pax_open_userland(); \
3882 __asm__( FIRST_BYTE_32 \
3883 ARM( "1: "ins" %1, [%2], #1\n" ) \
3884 THUMB( "1: "ins" %1, [%2]\n" ) \
3885@@ -315,6 +322,7 @@ union offset_union {
3886 " .popsection\n" \
3887 : "=r" (err), "=&r" (v), "=&r" (a) \
3888 : "0" (err), "1" (v), "2" (a)); \
3889+ pax_close_userland(); \
3890 if (err) \
3891 goto fault; \
3892 } while (0)
3893diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3894index e309c8f..f8965e8 100644
3895--- a/arch/arm/mm/cache-l2x0.c
3896+++ b/arch/arm/mm/cache-l2x0.c
3897@@ -43,7 +43,7 @@ struct l2c_init_data {
3898 void (*save)(void __iomem *);
3899 void (*configure)(void __iomem *);
3900 struct outer_cache_fns outer_cache;
3901-};
3902+} __do_const;
3903
3904 #define CACHE_LINE_SIZE 32
3905
3906diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3907index 845769e..4278fd7 100644
3908--- a/arch/arm/mm/context.c
3909+++ b/arch/arm/mm/context.c
3910@@ -43,7 +43,7 @@
3911 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3912
3913 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3914-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3915+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3916 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3917
3918 static DEFINE_PER_CPU(atomic64_t, active_asids);
3919@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3920 {
3921 static u32 cur_idx = 1;
3922 u64 asid = atomic64_read(&mm->context.id);
3923- u64 generation = atomic64_read(&asid_generation);
3924+ u64 generation = atomic64_read_unchecked(&asid_generation);
3925
3926 if (asid != 0) {
3927 /*
3928@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3929 */
3930 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3931 if (asid == NUM_USER_ASIDS) {
3932- generation = atomic64_add_return(ASID_FIRST_VERSION,
3933+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3934 &asid_generation);
3935 flush_context(cpu);
3936 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3937@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3938 cpu_set_reserved_ttbr0();
3939
3940 asid = atomic64_read(&mm->context.id);
3941- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3942+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3943 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3944 goto switch_mm_fastpath;
3945
3946 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3947 /* Check that our ASID belongs to the current generation. */
3948 asid = atomic64_read(&mm->context.id);
3949- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3950+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3951 asid = new_context(mm, cpu);
3952 atomic64_set(&mm->context.id, asid);
3953 }
3954diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3955index 6333d9c..3bb19f2 100644
3956--- a/arch/arm/mm/fault.c
3957+++ b/arch/arm/mm/fault.c
3958@@ -25,6 +25,7 @@
3959 #include <asm/system_misc.h>
3960 #include <asm/system_info.h>
3961 #include <asm/tlbflush.h>
3962+#include <asm/sections.h>
3963
3964 #include "fault.h"
3965
3966@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3967 if (fixup_exception(regs))
3968 return;
3969
3970+#ifdef CONFIG_PAX_MEMORY_UDEREF
3971+ if (addr < TASK_SIZE) {
3972+ if (current->signal->curr_ip)
3973+ 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),
3974+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3975+ else
3976+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3977+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3978+ }
3979+#endif
3980+
3981+#ifdef CONFIG_PAX_KERNEXEC
3982+ if ((fsr & FSR_WRITE) &&
3983+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3984+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3985+ {
3986+ if (current->signal->curr_ip)
3987+ 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),
3988+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3989+ else
3990+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3991+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3992+ }
3993+#endif
3994+
3995 /*
3996 * No handler, we'll have to terminate things with extreme prejudice.
3997 */
3998@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3999 }
4000 #endif
4001
4002+#ifdef CONFIG_PAX_PAGEEXEC
4003+ if (fsr & FSR_LNX_PF) {
4004+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
4005+ do_group_exit(SIGKILL);
4006+ }
4007+#endif
4008+
4009 tsk->thread.address = addr;
4010 tsk->thread.error_code = fsr;
4011 tsk->thread.trap_no = 14;
4012@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4013 }
4014 #endif /* CONFIG_MMU */
4015
4016+#ifdef CONFIG_PAX_PAGEEXEC
4017+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4018+{
4019+ long i;
4020+
4021+ printk(KERN_ERR "PAX: bytes at PC: ");
4022+ for (i = 0; i < 20; i++) {
4023+ unsigned char c;
4024+ if (get_user(c, (__force unsigned char __user *)pc+i))
4025+ printk(KERN_CONT "?? ");
4026+ else
4027+ printk(KERN_CONT "%02x ", c);
4028+ }
4029+ printk("\n");
4030+
4031+ printk(KERN_ERR "PAX: bytes at SP-4: ");
4032+ for (i = -1; i < 20; i++) {
4033+ unsigned long c;
4034+ if (get_user(c, (__force unsigned long __user *)sp+i))
4035+ printk(KERN_CONT "???????? ");
4036+ else
4037+ printk(KERN_CONT "%08lx ", c);
4038+ }
4039+ printk("\n");
4040+}
4041+#endif
4042+
4043 /*
4044 * First Level Translation Fault Handler
4045 *
4046@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4047 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4048 struct siginfo info;
4049
4050+#ifdef CONFIG_PAX_MEMORY_UDEREF
4051+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4052+ if (current->signal->curr_ip)
4053+ 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),
4054+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4055+ else
4056+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4057+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4058+ goto die;
4059+ }
4060+#endif
4061+
4062 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4063 return;
4064
4065+die:
4066 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4067 inf->name, fsr, addr);
4068 show_pte(current->mm, addr);
4069@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4070 ifsr_info[nr].name = name;
4071 }
4072
4073+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4074+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4075+
4076 asmlinkage void __exception
4077 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4078 {
4079 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4080 struct siginfo info;
4081+ unsigned long pc = instruction_pointer(regs);
4082+
4083+ if (user_mode(regs)) {
4084+ unsigned long sigpage = current->mm->context.sigpage;
4085+
4086+ if (sigpage <= pc && pc < sigpage + 7*4) {
4087+ if (pc < sigpage + 3*4)
4088+ sys_sigreturn(regs);
4089+ else
4090+ sys_rt_sigreturn(regs);
4091+ return;
4092+ }
4093+ if (pc == 0xffff0f60UL) {
4094+ /*
4095+ * PaX: __kuser_cmpxchg64 emulation
4096+ */
4097+ // TODO
4098+ //regs->ARM_pc = regs->ARM_lr;
4099+ //return;
4100+ }
4101+ if (pc == 0xffff0fa0UL) {
4102+ /*
4103+ * PaX: __kuser_memory_barrier emulation
4104+ */
4105+ // dmb(); implied by the exception
4106+ regs->ARM_pc = regs->ARM_lr;
4107+ return;
4108+ }
4109+ if (pc == 0xffff0fc0UL) {
4110+ /*
4111+ * PaX: __kuser_cmpxchg emulation
4112+ */
4113+ // TODO
4114+ //long new;
4115+ //int op;
4116+
4117+ //op = FUTEX_OP_SET << 28;
4118+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4119+ //regs->ARM_r0 = old != new;
4120+ //regs->ARM_pc = regs->ARM_lr;
4121+ //return;
4122+ }
4123+ if (pc == 0xffff0fe0UL) {
4124+ /*
4125+ * PaX: __kuser_get_tls emulation
4126+ */
4127+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4128+ regs->ARM_pc = regs->ARM_lr;
4129+ return;
4130+ }
4131+ }
4132+
4133+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4134+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4135+ if (current->signal->curr_ip)
4136+ 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),
4137+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4138+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4139+ else
4140+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4141+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4142+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4143+ goto die;
4144+ }
4145+#endif
4146+
4147+#ifdef CONFIG_PAX_REFCOUNT
4148+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4149+#ifdef CONFIG_THUMB2_KERNEL
4150+ unsigned short bkpt;
4151+
4152+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4153+#else
4154+ unsigned int bkpt;
4155+
4156+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4157+#endif
4158+ current->thread.error_code = ifsr;
4159+ current->thread.trap_no = 0;
4160+ pax_report_refcount_overflow(regs);
4161+ fixup_exception(regs);
4162+ return;
4163+ }
4164+ }
4165+#endif
4166
4167 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4168 return;
4169
4170+die:
4171 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4172 inf->name, ifsr, addr);
4173
4174diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4175index cf08bdf..772656c 100644
4176--- a/arch/arm/mm/fault.h
4177+++ b/arch/arm/mm/fault.h
4178@@ -3,6 +3,7 @@
4179
4180 /*
4181 * Fault status register encodings. We steal bit 31 for our own purposes.
4182+ * Set when the FSR value is from an instruction fault.
4183 */
4184 #define FSR_LNX_PF (1 << 31)
4185 #define FSR_WRITE (1 << 11)
4186@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4187 }
4188 #endif
4189
4190+/* valid for LPAE and !LPAE */
4191+static inline int is_xn_fault(unsigned int fsr)
4192+{
4193+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4194+}
4195+
4196+static inline int is_domain_fault(unsigned int fsr)
4197+{
4198+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4199+}
4200+
4201 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4202 unsigned long search_exception_table(unsigned long addr);
4203
4204diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4205index be92fa0..5252d7e 100644
4206--- a/arch/arm/mm/init.c
4207+++ b/arch/arm/mm/init.c
4208@@ -709,7 +709,46 @@ void free_tcmmem(void)
4209 {
4210 #ifdef CONFIG_HAVE_TCM
4211 extern char __tcm_start, __tcm_end;
4212+#endif
4213
4214+#ifdef CONFIG_PAX_KERNEXEC
4215+ unsigned long addr;
4216+ pgd_t *pgd;
4217+ pud_t *pud;
4218+ pmd_t *pmd;
4219+ int cpu_arch = cpu_architecture();
4220+ unsigned int cr = get_cr();
4221+
4222+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4223+ /* make pages tables, etc before .text NX */
4224+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4225+ pgd = pgd_offset_k(addr);
4226+ pud = pud_offset(pgd, addr);
4227+ pmd = pmd_offset(pud, addr);
4228+ __section_update(pmd, addr, PMD_SECT_XN);
4229+ }
4230+ /* make init NX */
4231+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4232+ pgd = pgd_offset_k(addr);
4233+ pud = pud_offset(pgd, addr);
4234+ pmd = pmd_offset(pud, addr);
4235+ __section_update(pmd, addr, PMD_SECT_XN);
4236+ }
4237+ /* make kernel code/rodata RX */
4238+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4239+ pgd = pgd_offset_k(addr);
4240+ pud = pud_offset(pgd, addr);
4241+ pmd = pmd_offset(pud, addr);
4242+#ifdef CONFIG_ARM_LPAE
4243+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4244+#else
4245+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4246+#endif
4247+ }
4248+ }
4249+#endif
4250+
4251+#ifdef CONFIG_HAVE_TCM
4252 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4253 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4254 #endif
4255diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4256index d1e5ad7..84dcbf2 100644
4257--- a/arch/arm/mm/ioremap.c
4258+++ b/arch/arm/mm/ioremap.c
4259@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4260 unsigned int mtype;
4261
4262 if (cached)
4263- mtype = MT_MEMORY_RWX;
4264+ mtype = MT_MEMORY_RX;
4265 else
4266- mtype = MT_MEMORY_RWX_NONCACHED;
4267+ mtype = MT_MEMORY_RX_NONCACHED;
4268
4269 return __arm_ioremap_caller(phys_addr, size, mtype,
4270 __builtin_return_address(0));
4271diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4272index 407dc78..047ce9d 100644
4273--- a/arch/arm/mm/mmap.c
4274+++ b/arch/arm/mm/mmap.c
4275@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4276 struct vm_area_struct *vma;
4277 int do_align = 0;
4278 int aliasing = cache_is_vipt_aliasing();
4279+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4280 struct vm_unmapped_area_info info;
4281
4282 /*
4283@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4284 if (len > TASK_SIZE)
4285 return -ENOMEM;
4286
4287+#ifdef CONFIG_PAX_RANDMMAP
4288+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4289+#endif
4290+
4291 if (addr) {
4292 if (do_align)
4293 addr = COLOUR_ALIGN(addr, pgoff);
4294@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4295 addr = PAGE_ALIGN(addr);
4296
4297 vma = find_vma(mm, addr);
4298- if (TASK_SIZE - len >= addr &&
4299- (!vma || addr + len <= vma->vm_start))
4300+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4301 return addr;
4302 }
4303
4304@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4305 info.high_limit = TASK_SIZE;
4306 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4307 info.align_offset = pgoff << PAGE_SHIFT;
4308+ info.threadstack_offset = offset;
4309 return vm_unmapped_area(&info);
4310 }
4311
4312@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4313 unsigned long addr = addr0;
4314 int do_align = 0;
4315 int aliasing = cache_is_vipt_aliasing();
4316+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4317 struct vm_unmapped_area_info info;
4318
4319 /*
4320@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4321 return addr;
4322 }
4323
4324+#ifdef CONFIG_PAX_RANDMMAP
4325+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4326+#endif
4327+
4328 /* requesting a specific address */
4329 if (addr) {
4330 if (do_align)
4331@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4332 else
4333 addr = PAGE_ALIGN(addr);
4334 vma = find_vma(mm, addr);
4335- if (TASK_SIZE - len >= addr &&
4336- (!vma || addr + len <= vma->vm_start))
4337+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4338 return addr;
4339 }
4340
4341@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4342 info.high_limit = mm->mmap_base;
4343 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4344 info.align_offset = pgoff << PAGE_SHIFT;
4345+ info.threadstack_offset = offset;
4346 addr = vm_unmapped_area(&info);
4347
4348 /*
4349@@ -183,14 +193,30 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4350 {
4351 unsigned long random_factor = 0UL;
4352
4353+#ifdef CONFIG_PAX_RANDMMAP
4354+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4355+#endif
4356+
4357 if (current->flags & PF_RANDOMIZE)
4358 random_factor = arch_mmap_rnd();
4359
4360 if (mmap_is_legacy()) {
4361 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4362+
4363+#ifdef CONFIG_PAX_RANDMMAP
4364+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4365+ mm->mmap_base += mm->delta_mmap;
4366+#endif
4367+
4368 mm->get_unmapped_area = arch_get_unmapped_area;
4369 } else {
4370 mm->mmap_base = mmap_base(random_factor);
4371+
4372+#ifdef CONFIG_PAX_RANDMMAP
4373+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4374+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4375+#endif
4376+
4377 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4378 }
4379 }
4380diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4381index 7186382..0c145cf 100644
4382--- a/arch/arm/mm/mmu.c
4383+++ b/arch/arm/mm/mmu.c
4384@@ -41,6 +41,22 @@
4385 #include "mm.h"
4386 #include "tcm.h"
4387
4388+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4389+void modify_domain(unsigned int dom, unsigned int type)
4390+{
4391+ struct thread_info *thread = current_thread_info();
4392+ unsigned int domain = thread->cpu_domain;
4393+ /*
4394+ * DOMAIN_MANAGER might be defined to some other value,
4395+ * use the arch-defined constant
4396+ */
4397+ domain &= ~domain_val(dom, 3);
4398+ thread->cpu_domain = domain | domain_val(dom, type);
4399+ set_domain(thread->cpu_domain);
4400+}
4401+EXPORT_SYMBOL(modify_domain);
4402+#endif
4403+
4404 /*
4405 * empty_zero_page is a special page that is used for
4406 * zero-initialized data and COW.
4407@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4408 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4409 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4410
4411-static struct mem_type mem_types[] = {
4412+#ifdef CONFIG_PAX_KERNEXEC
4413+#define L_PTE_KERNEXEC L_PTE_RDONLY
4414+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4415+#else
4416+#define L_PTE_KERNEXEC L_PTE_DIRTY
4417+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4418+#endif
4419+
4420+static struct mem_type mem_types[] __read_only = {
4421 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4422 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4423 L_PTE_SHARED,
4424@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4425 .prot_sect = PROT_SECT_DEVICE,
4426 .domain = DOMAIN_IO,
4427 },
4428- [MT_UNCACHED] = {
4429+ [MT_UNCACHED_RW] = {
4430 .prot_pte = PROT_PTE_DEVICE,
4431 .prot_l1 = PMD_TYPE_TABLE,
4432 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4433 .domain = DOMAIN_IO,
4434 },
4435- [MT_CACHECLEAN] = {
4436- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4437+ [MT_CACHECLEAN_RO] = {
4438+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4439 .domain = DOMAIN_KERNEL,
4440 },
4441 #ifndef CONFIG_ARM_LPAE
4442- [MT_MINICLEAN] = {
4443- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4444+ [MT_MINICLEAN_RO] = {
4445+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4446 .domain = DOMAIN_KERNEL,
4447 },
4448 #endif
4449@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4450 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4451 L_PTE_RDONLY,
4452 .prot_l1 = PMD_TYPE_TABLE,
4453- .domain = DOMAIN_USER,
4454+ .domain = DOMAIN_VECTORS,
4455 },
4456 [MT_HIGH_VECTORS] = {
4457 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4458 L_PTE_USER | L_PTE_RDONLY,
4459 .prot_l1 = PMD_TYPE_TABLE,
4460- .domain = DOMAIN_USER,
4461+ .domain = DOMAIN_VECTORS,
4462 },
4463- [MT_MEMORY_RWX] = {
4464+ [__MT_MEMORY_RWX] = {
4465 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4466 .prot_l1 = PMD_TYPE_TABLE,
4467 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4468@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4469 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4470 .domain = DOMAIN_KERNEL,
4471 },
4472- [MT_ROM] = {
4473- .prot_sect = PMD_TYPE_SECT,
4474+ [MT_MEMORY_RX] = {
4475+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4476+ .prot_l1 = PMD_TYPE_TABLE,
4477+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4478+ .domain = DOMAIN_KERNEL,
4479+ },
4480+ [MT_ROM_RX] = {
4481+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4482 .domain = DOMAIN_KERNEL,
4483 },
4484- [MT_MEMORY_RWX_NONCACHED] = {
4485+ [MT_MEMORY_RW_NONCACHED] = {
4486 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4487 L_PTE_MT_BUFFERABLE,
4488 .prot_l1 = PMD_TYPE_TABLE,
4489 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4490 .domain = DOMAIN_KERNEL,
4491 },
4492+ [MT_MEMORY_RX_NONCACHED] = {
4493+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4494+ L_PTE_MT_BUFFERABLE,
4495+ .prot_l1 = PMD_TYPE_TABLE,
4496+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4497+ .domain = DOMAIN_KERNEL,
4498+ },
4499 [MT_MEMORY_RW_DTCM] = {
4500 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4501 L_PTE_XN,
4502@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4503 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4504 .domain = DOMAIN_KERNEL,
4505 },
4506- [MT_MEMORY_RWX_ITCM] = {
4507- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4508+ [MT_MEMORY_RX_ITCM] = {
4509+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4510 .prot_l1 = PMD_TYPE_TABLE,
4511+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4512 .domain = DOMAIN_KERNEL,
4513 },
4514 [MT_MEMORY_RW_SO] = {
4515@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4516 * Mark cache clean areas and XIP ROM read only
4517 * from SVC mode and no access from userspace.
4518 */
4519- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4520- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4521- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4522+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4523+#ifdef CONFIG_PAX_KERNEXEC
4524+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4525+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4526+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4527+#endif
4528+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4529+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4530 #endif
4531
4532 /*
4533@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4534 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4535 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4536 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4537- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4538- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4539+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4540+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4541 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4542 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4543+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4544+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4545 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4546- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4547- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4548+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4549+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4550+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4551+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4552 }
4553 }
4554
4555@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4556 if (cpu_arch >= CPU_ARCH_ARMv6) {
4557 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4558 /* Non-cacheable Normal is XCB = 001 */
4559- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4560+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4561+ PMD_SECT_BUFFERED;
4562+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4563 PMD_SECT_BUFFERED;
4564 } else {
4565 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4566- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4567+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4568+ PMD_SECT_TEX(1);
4569+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4570 PMD_SECT_TEX(1);
4571 }
4572 } else {
4573- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4574+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4575+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4576 }
4577
4578 #ifdef CONFIG_ARM_LPAE
4579@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4580 user_pgprot |= PTE_EXT_PXN;
4581 #endif
4582
4583+ user_pgprot |= __supported_pte_mask;
4584+
4585 for (i = 0; i < 16; i++) {
4586 pteval_t v = pgprot_val(protection_map[i]);
4587 protection_map[i] = __pgprot(v | user_pgprot);
4588@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4589
4590 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4591 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4592- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4593- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4594+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4595+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4596 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4597 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4598+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4599+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4600 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4601- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4602- mem_types[MT_ROM].prot_sect |= cp->pmd;
4603+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4604+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4605+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4606
4607 switch (cp->pmd) {
4608 case PMD_SECT_WT:
4609- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4610+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4611 break;
4612 case PMD_SECT_WB:
4613 case PMD_SECT_WBWA:
4614- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4615+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4616 break;
4617 }
4618 pr_info("Memory policy: %sData cache %s\n",
4619@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4620 return;
4621 }
4622
4623- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4624+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4625 md->virtual >= PAGE_OFFSET &&
4626 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4627 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4628@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4629 * called function. This means you can't use any function or debugging
4630 * method which may touch any device, otherwise the kernel _will_ crash.
4631 */
4632+
4633+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4634+
4635 static void __init devicemaps_init(const struct machine_desc *mdesc)
4636 {
4637 struct map_desc map;
4638 unsigned long addr;
4639- void *vectors;
4640
4641- /*
4642- * Allocate the vector page early.
4643- */
4644- vectors = early_alloc(PAGE_SIZE * 2);
4645-
4646- early_trap_init(vectors);
4647+ early_trap_init(&vectors);
4648
4649 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4650 pmd_clear(pmd_off_k(addr));
4651@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4652 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4653 map.virtual = MODULES_VADDR;
4654 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4655- map.type = MT_ROM;
4656+ map.type = MT_ROM_RX;
4657 create_mapping(&map);
4658 #endif
4659
4660@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4661 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4662 map.virtual = FLUSH_BASE;
4663 map.length = SZ_1M;
4664- map.type = MT_CACHECLEAN;
4665+ map.type = MT_CACHECLEAN_RO;
4666 create_mapping(&map);
4667 #endif
4668 #ifdef FLUSH_BASE_MINICACHE
4669 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4670 map.virtual = FLUSH_BASE_MINICACHE;
4671 map.length = SZ_1M;
4672- map.type = MT_MINICLEAN;
4673+ map.type = MT_MINICLEAN_RO;
4674 create_mapping(&map);
4675 #endif
4676
4677@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4678 * location (0xffff0000). If we aren't using high-vectors, also
4679 * create a mapping at the low-vectors virtual address.
4680 */
4681- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4682+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4683 map.virtual = 0xffff0000;
4684 map.length = PAGE_SIZE;
4685 #ifdef CONFIG_KUSER_HELPERS
4686@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4687 static void __init map_lowmem(void)
4688 {
4689 struct memblock_region *reg;
4690+#ifndef CONFIG_PAX_KERNEXEC
4691 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4692 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4693+#endif
4694
4695 /* Map all the lowmem memory banks. */
4696 for_each_memblock(memory, reg) {
4697@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4698 if (start >= end)
4699 break;
4700
4701+#ifdef CONFIG_PAX_KERNEXEC
4702+ map.pfn = __phys_to_pfn(start);
4703+ map.virtual = __phys_to_virt(start);
4704+ map.length = end - start;
4705+
4706+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4707+ struct map_desc kernel;
4708+ struct map_desc initmap;
4709+
4710+ /* when freeing initmem we will make this RW */
4711+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4712+ initmap.virtual = (unsigned long)__init_begin;
4713+ initmap.length = _sdata - __init_begin;
4714+ initmap.type = __MT_MEMORY_RWX;
4715+ create_mapping(&initmap);
4716+
4717+ /* when freeing initmem we will make this RX */
4718+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4719+ kernel.virtual = (unsigned long)_stext;
4720+ kernel.length = __init_begin - _stext;
4721+ kernel.type = __MT_MEMORY_RWX;
4722+ create_mapping(&kernel);
4723+
4724+ if (map.virtual < (unsigned long)_stext) {
4725+ map.length = (unsigned long)_stext - map.virtual;
4726+ map.type = __MT_MEMORY_RWX;
4727+ create_mapping(&map);
4728+ }
4729+
4730+ map.pfn = __phys_to_pfn(__pa(_sdata));
4731+ map.virtual = (unsigned long)_sdata;
4732+ map.length = end - __pa(_sdata);
4733+ }
4734+
4735+ map.type = MT_MEMORY_RW;
4736+ create_mapping(&map);
4737+#else
4738 if (end < kernel_x_start) {
4739 map.pfn = __phys_to_pfn(start);
4740 map.virtual = __phys_to_virt(start);
4741 map.length = end - start;
4742- map.type = MT_MEMORY_RWX;
4743+ map.type = __MT_MEMORY_RWX;
4744
4745 create_mapping(&map);
4746 } else if (start >= kernel_x_end) {
4747@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4748 map.pfn = __phys_to_pfn(kernel_x_start);
4749 map.virtual = __phys_to_virt(kernel_x_start);
4750 map.length = kernel_x_end - kernel_x_start;
4751- map.type = MT_MEMORY_RWX;
4752+ map.type = __MT_MEMORY_RWX;
4753
4754 create_mapping(&map);
4755
4756@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4757 create_mapping(&map);
4758 }
4759 }
4760+#endif
4761 }
4762 }
4763
4764diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4765index e0e2358..96c6791 100644
4766--- a/arch/arm/net/bpf_jit_32.c
4767+++ b/arch/arm/net/bpf_jit_32.c
4768@@ -20,6 +20,7 @@
4769 #include <asm/cacheflush.h>
4770 #include <asm/hwcap.h>
4771 #include <asm/opcodes.h>
4772+#include <asm/pgtable.h>
4773
4774 #include "bpf_jit_32.h"
4775
4776@@ -72,7 +73,11 @@ struct jit_ctx {
4777 #endif
4778 };
4779
4780+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4781+int bpf_jit_enable __read_only;
4782+#else
4783 int bpf_jit_enable __read_mostly;
4784+#endif
4785
4786 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4787 {
4788@@ -179,8 +184,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4789 {
4790 u32 *ptr;
4791 /* We are guaranteed to have aligned memory. */
4792+ pax_open_kernel();
4793 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4794 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4795+ pax_close_kernel();
4796 }
4797
4798 static void build_prologue(struct jit_ctx *ctx)
4799@@ -547,7 +554,7 @@ load_common:
4800 emit(ARM_SUB_I(r_scratch, r_skb_hl,
4801 1 << load_order), ctx);
4802 emit(ARM_CMP_R(r_scratch, r_off), ctx);
4803- condt = ARM_COND_HS;
4804+ condt = ARM_COND_GE;
4805 } else {
4806 emit(ARM_CMP_R(r_skb_hl, r_off), ctx);
4807 condt = ARM_COND_HI;
4808@@ -860,9 +867,11 @@ b_epilogue:
4809 off = offsetof(struct sk_buff, vlan_tci);
4810 emit(ARM_LDRH_I(r_A, r_skb, off), ctx);
4811 if (code == (BPF_ANC | SKF_AD_VLAN_TAG))
4812- OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);
4813- else
4814- OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);
4815+ OP_IMM3(ARM_AND, r_A, r_A, ~VLAN_TAG_PRESENT, ctx);
4816+ else {
4817+ OP_IMM3(ARM_LSR, r_A, r_A, 12, ctx);
4818+ OP_IMM3(ARM_AND, r_A, r_A, 0x1, ctx);
4819+ }
4820 break;
4821 case BPF_ANC | SKF_AD_QUEUE:
4822 ctx->seen |= SEEN_SKB;
4823diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4824index 5b217f4..c23f40e 100644
4825--- a/arch/arm/plat-iop/setup.c
4826+++ b/arch/arm/plat-iop/setup.c
4827@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4828 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4829 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4830 .length = IOP3XX_PERIPHERAL_SIZE,
4831- .type = MT_UNCACHED,
4832+ .type = MT_UNCACHED_RW,
4833 },
4834 };
4835
4836diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4837index a5bc92d..0bb4730 100644
4838--- a/arch/arm/plat-omap/sram.c
4839+++ b/arch/arm/plat-omap/sram.c
4840@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4841 * Looks like we need to preserve some bootloader code at the
4842 * beginning of SRAM for jumping to flash for reboot to work...
4843 */
4844+ pax_open_kernel();
4845 memset_io(omap_sram_base + omap_sram_skip, 0,
4846 omap_sram_size - omap_sram_skip);
4847+ pax_close_kernel();
4848 }
4849diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4850index 7047051..44e8675 100644
4851--- a/arch/arm64/include/asm/atomic.h
4852+++ b/arch/arm64/include/asm/atomic.h
4853@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4854 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4855 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4856
4857+#define atomic64_read_unchecked(v) atomic64_read(v)
4858+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4859+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4860+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4861+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4862+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4863+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4864+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4865+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4866+
4867 #endif
4868 #endif
4869diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4870index 71f19c4..2b13cfe 100644
4871--- a/arch/arm64/include/asm/barrier.h
4872+++ b/arch/arm64/include/asm/barrier.h
4873@@ -44,7 +44,7 @@
4874 do { \
4875 compiletime_assert_atomic_type(*p); \
4876 barrier(); \
4877- ACCESS_ONCE(*p) = (v); \
4878+ ACCESS_ONCE_RW(*p) = (v); \
4879 } while (0)
4880
4881 #define smp_load_acquire(p) \
4882diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4883index 4fde8c1..441f84f 100644
4884--- a/arch/arm64/include/asm/percpu.h
4885+++ b/arch/arm64/include/asm/percpu.h
4886@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4887 {
4888 switch (size) {
4889 case 1:
4890- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4891+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4892 break;
4893 case 2:
4894- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4895+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4896 break;
4897 case 4:
4898- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4899+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4900 break;
4901 case 8:
4902- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4903+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4904 break;
4905 default:
4906 BUILD_BUG();
4907diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4908index 7642056..bffc904 100644
4909--- a/arch/arm64/include/asm/pgalloc.h
4910+++ b/arch/arm64/include/asm/pgalloc.h
4911@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4912 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4913 }
4914
4915+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4916+{
4917+ pud_populate(mm, pud, pmd);
4918+}
4919+
4920 #endif /* CONFIG_PGTABLE_LEVELS > 2 */
4921
4922 #if CONFIG_PGTABLE_LEVELS > 3
4923diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4924index 07e1ba44..ec8cbbb 100644
4925--- a/arch/arm64/include/asm/uaccess.h
4926+++ b/arch/arm64/include/asm/uaccess.h
4927@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4928 flag; \
4929 })
4930
4931+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4932 #define access_ok(type, addr, size) __range_ok(addr, size)
4933 #define user_addr_max get_fs
4934
4935diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4936index b0bd4e5..54e82f6 100644
4937--- a/arch/arm64/mm/dma-mapping.c
4938+++ b/arch/arm64/mm/dma-mapping.c
4939@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4940 phys_to_page(paddr),
4941 size >> PAGE_SHIFT);
4942 if (!freed)
4943- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4944+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4945 }
4946
4947 static void *__dma_alloc(struct device *dev, size_t size,
4948diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4949index c3a58a1..78fbf54 100644
4950--- a/arch/avr32/include/asm/cache.h
4951+++ b/arch/avr32/include/asm/cache.h
4952@@ -1,8 +1,10 @@
4953 #ifndef __ASM_AVR32_CACHE_H
4954 #define __ASM_AVR32_CACHE_H
4955
4956+#include <linux/const.h>
4957+
4958 #define L1_CACHE_SHIFT 5
4959-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4960+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4961
4962 /*
4963 * Memory returned by kmalloc() may be used for DMA, so we must make
4964diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4965index 0388ece..87c8df1 100644
4966--- a/arch/avr32/include/asm/elf.h
4967+++ b/arch/avr32/include/asm/elf.h
4968@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4969 the loader. We need to make sure that it is out of the way of the program
4970 that it will "exec", and that there is sufficient room for the brk. */
4971
4972-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4973+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4974
4975+#ifdef CONFIG_PAX_ASLR
4976+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4977+
4978+#define PAX_DELTA_MMAP_LEN 15
4979+#define PAX_DELTA_STACK_LEN 15
4980+#endif
4981
4982 /* This yields a mask that user programs can use to figure out what
4983 instruction set this CPU supports. This could be done in user space,
4984diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4985index 479330b..53717a8 100644
4986--- a/arch/avr32/include/asm/kmap_types.h
4987+++ b/arch/avr32/include/asm/kmap_types.h
4988@@ -2,9 +2,9 @@
4989 #define __ASM_AVR32_KMAP_TYPES_H
4990
4991 #ifdef CONFIG_DEBUG_HIGHMEM
4992-# define KM_TYPE_NR 29
4993+# define KM_TYPE_NR 30
4994 #else
4995-# define KM_TYPE_NR 14
4996+# define KM_TYPE_NR 15
4997 #endif
4998
4999 #endif /* __ASM_AVR32_KMAP_TYPES_H */
5000diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
5001index d223a8b..69c5210 100644
5002--- a/arch/avr32/mm/fault.c
5003+++ b/arch/avr32/mm/fault.c
5004@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
5005
5006 int exception_trace = 1;
5007
5008+#ifdef CONFIG_PAX_PAGEEXEC
5009+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5010+{
5011+ unsigned long i;
5012+
5013+ printk(KERN_ERR "PAX: bytes at PC: ");
5014+ for (i = 0; i < 20; i++) {
5015+ unsigned char c;
5016+ if (get_user(c, (unsigned char *)pc+i))
5017+ printk(KERN_CONT "???????? ");
5018+ else
5019+ printk(KERN_CONT "%02x ", c);
5020+ }
5021+ printk("\n");
5022+}
5023+#endif
5024+
5025 /*
5026 * This routine handles page faults. It determines the address and the
5027 * problem, and then passes it off to one of the appropriate routines.
5028@@ -178,6 +195,16 @@ bad_area:
5029 up_read(&mm->mmap_sem);
5030
5031 if (user_mode(regs)) {
5032+
5033+#ifdef CONFIG_PAX_PAGEEXEC
5034+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
5035+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
5036+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
5037+ do_group_exit(SIGKILL);
5038+ }
5039+ }
5040+#endif
5041+
5042 if (exception_trace && printk_ratelimit())
5043 printk("%s%s[%d]: segfault at %08lx pc %08lx "
5044 "sp %08lx ecr %lu\n",
5045diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
5046index 568885a..f8008df 100644
5047--- a/arch/blackfin/include/asm/cache.h
5048+++ b/arch/blackfin/include/asm/cache.h
5049@@ -7,6 +7,7 @@
5050 #ifndef __ARCH_BLACKFIN_CACHE_H
5051 #define __ARCH_BLACKFIN_CACHE_H
5052
5053+#include <linux/const.h>
5054 #include <linux/linkage.h> /* for asmlinkage */
5055
5056 /*
5057@@ -14,7 +15,7 @@
5058 * Blackfin loads 32 bytes for cache
5059 */
5060 #define L1_CACHE_SHIFT 5
5061-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5062+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5063 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5064
5065 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5066diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
5067index aea2718..3639a60 100644
5068--- a/arch/cris/include/arch-v10/arch/cache.h
5069+++ b/arch/cris/include/arch-v10/arch/cache.h
5070@@ -1,8 +1,9 @@
5071 #ifndef _ASM_ARCH_CACHE_H
5072 #define _ASM_ARCH_CACHE_H
5073
5074+#include <linux/const.h>
5075 /* Etrax 100LX have 32-byte cache-lines. */
5076-#define L1_CACHE_BYTES 32
5077 #define L1_CACHE_SHIFT 5
5078+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5079
5080 #endif /* _ASM_ARCH_CACHE_H */
5081diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5082index 7caf25d..ee65ac5 100644
5083--- a/arch/cris/include/arch-v32/arch/cache.h
5084+++ b/arch/cris/include/arch-v32/arch/cache.h
5085@@ -1,11 +1,12 @@
5086 #ifndef _ASM_CRIS_ARCH_CACHE_H
5087 #define _ASM_CRIS_ARCH_CACHE_H
5088
5089+#include <linux/const.h>
5090 #include <arch/hwregs/dma.h>
5091
5092 /* A cache-line is 32 bytes. */
5093-#define L1_CACHE_BYTES 32
5094 #define L1_CACHE_SHIFT 5
5095+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5096
5097 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5098
5099diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5100index 102190a..5334cea 100644
5101--- a/arch/frv/include/asm/atomic.h
5102+++ b/arch/frv/include/asm/atomic.h
5103@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5104 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5105 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5106
5107+#define atomic64_read_unchecked(v) atomic64_read(v)
5108+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5109+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5110+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5111+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5112+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5113+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5114+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5115+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5116+
5117 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5118 {
5119 int c, old;
5120diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5121index 2797163..c2a401df9 100644
5122--- a/arch/frv/include/asm/cache.h
5123+++ b/arch/frv/include/asm/cache.h
5124@@ -12,10 +12,11 @@
5125 #ifndef __ASM_CACHE_H
5126 #define __ASM_CACHE_H
5127
5128+#include <linux/const.h>
5129
5130 /* bytes per L1 cache line */
5131 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5132-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5133+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5134
5135 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5136 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5137diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5138index 43901f2..0d8b865 100644
5139--- a/arch/frv/include/asm/kmap_types.h
5140+++ b/arch/frv/include/asm/kmap_types.h
5141@@ -2,6 +2,6 @@
5142 #ifndef _ASM_KMAP_TYPES_H
5143 #define _ASM_KMAP_TYPES_H
5144
5145-#define KM_TYPE_NR 17
5146+#define KM_TYPE_NR 18
5147
5148 #endif
5149diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5150index 836f147..4cf23f5 100644
5151--- a/arch/frv/mm/elf-fdpic.c
5152+++ b/arch/frv/mm/elf-fdpic.c
5153@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5154 {
5155 struct vm_area_struct *vma;
5156 struct vm_unmapped_area_info info;
5157+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5158
5159 if (len > TASK_SIZE)
5160 return -ENOMEM;
5161@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5162 if (addr) {
5163 addr = PAGE_ALIGN(addr);
5164 vma = find_vma(current->mm, addr);
5165- if (TASK_SIZE - len >= addr &&
5166- (!vma || addr + len <= vma->vm_start))
5167+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5168 goto success;
5169 }
5170
5171@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5172 info.high_limit = (current->mm->start_stack - 0x00200000);
5173 info.align_mask = 0;
5174 info.align_offset = 0;
5175+ info.threadstack_offset = offset;
5176 addr = vm_unmapped_area(&info);
5177 if (!(addr & ~PAGE_MASK))
5178 goto success;
5179diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5180index 69952c18..4fa2908 100644
5181--- a/arch/hexagon/include/asm/cache.h
5182+++ b/arch/hexagon/include/asm/cache.h
5183@@ -21,9 +21,11 @@
5184 #ifndef __ASM_CACHE_H
5185 #define __ASM_CACHE_H
5186
5187+#include <linux/const.h>
5188+
5189 /* Bytes per L1 cache line */
5190-#define L1_CACHE_SHIFT (5)
5191-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5192+#define L1_CACHE_SHIFT 5
5193+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5194
5195 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5196
5197diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5198index 76d25b2..d3793a0f 100644
5199--- a/arch/ia64/Kconfig
5200+++ b/arch/ia64/Kconfig
5201@@ -541,6 +541,7 @@ source "drivers/sn/Kconfig"
5202 config KEXEC
5203 bool "kexec system call"
5204 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5205+ depends on !GRKERNSEC_KMEM
5206 help
5207 kexec is a system call that implements the ability to shutdown your
5208 current kernel, and to start another kernel. It is like a reboot
5209diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5210index 970d0bd..e750b9b 100644
5211--- a/arch/ia64/Makefile
5212+++ b/arch/ia64/Makefile
5213@@ -98,5 +98,6 @@ endef
5214 archprepare: make_nr_irqs_h FORCE
5215 PHONY += make_nr_irqs_h FORCE
5216
5217+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5218 make_nr_irqs_h: FORCE
5219 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5220diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5221index 0bf0350..2ad1957 100644
5222--- a/arch/ia64/include/asm/atomic.h
5223+++ b/arch/ia64/include/asm/atomic.h
5224@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5225 #define atomic64_inc(v) atomic64_add(1, (v))
5226 #define atomic64_dec(v) atomic64_sub(1, (v))
5227
5228+#define atomic64_read_unchecked(v) atomic64_read(v)
5229+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5230+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5231+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5232+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5233+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5234+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5235+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5236+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5237+
5238 #endif /* _ASM_IA64_ATOMIC_H */
5239diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5240index f6769eb..1cdb590 100644
5241--- a/arch/ia64/include/asm/barrier.h
5242+++ b/arch/ia64/include/asm/barrier.h
5243@@ -66,7 +66,7 @@
5244 do { \
5245 compiletime_assert_atomic_type(*p); \
5246 barrier(); \
5247- ACCESS_ONCE(*p) = (v); \
5248+ ACCESS_ONCE_RW(*p) = (v); \
5249 } while (0)
5250
5251 #define smp_load_acquire(p) \
5252diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5253index 988254a..e1ee885 100644
5254--- a/arch/ia64/include/asm/cache.h
5255+++ b/arch/ia64/include/asm/cache.h
5256@@ -1,6 +1,7 @@
5257 #ifndef _ASM_IA64_CACHE_H
5258 #define _ASM_IA64_CACHE_H
5259
5260+#include <linux/const.h>
5261
5262 /*
5263 * Copyright (C) 1998-2000 Hewlett-Packard Co
5264@@ -9,7 +10,7 @@
5265
5266 /* Bytes per L1 (data) cache line. */
5267 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5268-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5269+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5270
5271 #ifdef CONFIG_SMP
5272 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5273diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5274index 5a83c5c..4d7f553 100644
5275--- a/arch/ia64/include/asm/elf.h
5276+++ b/arch/ia64/include/asm/elf.h
5277@@ -42,6 +42,13 @@
5278 */
5279 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5280
5281+#ifdef CONFIG_PAX_ASLR
5282+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5283+
5284+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5285+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5286+#endif
5287+
5288 #define PT_IA_64_UNWIND 0x70000001
5289
5290 /* IA-64 relocations: */
5291diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5292index f5e70e9..624fad5 100644
5293--- a/arch/ia64/include/asm/pgalloc.h
5294+++ b/arch/ia64/include/asm/pgalloc.h
5295@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5296 pgd_val(*pgd_entry) = __pa(pud);
5297 }
5298
5299+static inline void
5300+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5301+{
5302+ pgd_populate(mm, pgd_entry, pud);
5303+}
5304+
5305 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5306 {
5307 return quicklist_alloc(0, GFP_KERNEL, NULL);
5308@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5309 pud_val(*pud_entry) = __pa(pmd);
5310 }
5311
5312+static inline void
5313+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5314+{
5315+ pud_populate(mm, pud_entry, pmd);
5316+}
5317+
5318 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5319 {
5320 return quicklist_alloc(0, GFP_KERNEL, NULL);
5321diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5322index 9f3ed9e..c99b418 100644
5323--- a/arch/ia64/include/asm/pgtable.h
5324+++ b/arch/ia64/include/asm/pgtable.h
5325@@ -12,7 +12,7 @@
5326 * David Mosberger-Tang <davidm@hpl.hp.com>
5327 */
5328
5329-
5330+#include <linux/const.h>
5331 #include <asm/mman.h>
5332 #include <asm/page.h>
5333 #include <asm/processor.h>
5334@@ -139,6 +139,17 @@
5335 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5336 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5337 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5338+
5339+#ifdef CONFIG_PAX_PAGEEXEC
5340+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5341+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5342+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5343+#else
5344+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5345+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5346+# define PAGE_COPY_NOEXEC PAGE_COPY
5347+#endif
5348+
5349 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5350 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5351 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5352diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5353index 45698cd..e8e2dbc 100644
5354--- a/arch/ia64/include/asm/spinlock.h
5355+++ b/arch/ia64/include/asm/spinlock.h
5356@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5357 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5358
5359 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5360- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5361+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5362 }
5363
5364 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5365diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5366index 4f3fb6cc..254055e 100644
5367--- a/arch/ia64/include/asm/uaccess.h
5368+++ b/arch/ia64/include/asm/uaccess.h
5369@@ -70,6 +70,7 @@
5370 && ((segment).seg == KERNEL_DS.seg \
5371 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5372 })
5373+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5374 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5375
5376 /*
5377@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5378 static inline unsigned long
5379 __copy_to_user (void __user *to, const void *from, unsigned long count)
5380 {
5381+ if (count > INT_MAX)
5382+ return count;
5383+
5384+ if (!__builtin_constant_p(count))
5385+ check_object_size(from, count, true);
5386+
5387 return __copy_user(to, (__force void __user *) from, count);
5388 }
5389
5390 static inline unsigned long
5391 __copy_from_user (void *to, const void __user *from, unsigned long count)
5392 {
5393+ if (count > INT_MAX)
5394+ return count;
5395+
5396+ if (!__builtin_constant_p(count))
5397+ check_object_size(to, count, false);
5398+
5399 return __copy_user((__force void __user *) to, from, count);
5400 }
5401
5402@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5403 ({ \
5404 void __user *__cu_to = (to); \
5405 const void *__cu_from = (from); \
5406- long __cu_len = (n); \
5407+ unsigned long __cu_len = (n); \
5408 \
5409- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5410+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5411+ if (!__builtin_constant_p(n)) \
5412+ check_object_size(__cu_from, __cu_len, true); \
5413 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5414+ } \
5415 __cu_len; \
5416 })
5417
5418@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5419 ({ \
5420 void *__cu_to = (to); \
5421 const void __user *__cu_from = (from); \
5422- long __cu_len = (n); \
5423+ unsigned long __cu_len = (n); \
5424 \
5425 __chk_user_ptr(__cu_from); \
5426- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5427+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5428+ if (!__builtin_constant_p(n)) \
5429+ check_object_size(__cu_to, __cu_len, false); \
5430 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5431+ } \
5432 __cu_len; \
5433 })
5434
5435diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5436index 29754aa..06d2838 100644
5437--- a/arch/ia64/kernel/module.c
5438+++ b/arch/ia64/kernel/module.c
5439@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5440 }
5441
5442 static inline int
5443+in_init_rx (const struct module *mod, uint64_t addr)
5444+{
5445+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5446+}
5447+
5448+static inline int
5449+in_init_rw (const struct module *mod, uint64_t addr)
5450+{
5451+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5452+}
5453+
5454+static inline int
5455 in_init (const struct module *mod, uint64_t addr)
5456 {
5457- return addr - (uint64_t) mod->module_init < mod->init_size;
5458+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5459+}
5460+
5461+static inline int
5462+in_core_rx (const struct module *mod, uint64_t addr)
5463+{
5464+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5465+}
5466+
5467+static inline int
5468+in_core_rw (const struct module *mod, uint64_t addr)
5469+{
5470+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5471 }
5472
5473 static inline int
5474 in_core (const struct module *mod, uint64_t addr)
5475 {
5476- return addr - (uint64_t) mod->module_core < mod->core_size;
5477+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5478 }
5479
5480 static inline int
5481@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5482 break;
5483
5484 case RV_BDREL:
5485- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5486+ if (in_init_rx(mod, val))
5487+ val -= (uint64_t) mod->module_init_rx;
5488+ else if (in_init_rw(mod, val))
5489+ val -= (uint64_t) mod->module_init_rw;
5490+ else if (in_core_rx(mod, val))
5491+ val -= (uint64_t) mod->module_core_rx;
5492+ else if (in_core_rw(mod, val))
5493+ val -= (uint64_t) mod->module_core_rw;
5494 break;
5495
5496 case RV_LTV:
5497@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5498 * addresses have been selected...
5499 */
5500 uint64_t gp;
5501- if (mod->core_size > MAX_LTOFF)
5502+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5503 /*
5504 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5505 * at the end of the module.
5506 */
5507- gp = mod->core_size - MAX_LTOFF / 2;
5508+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5509 else
5510- gp = mod->core_size / 2;
5511- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5512+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5513+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5514 mod->arch.gp = gp;
5515 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5516 }
5517diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5518index c39c3cd..3c77738 100644
5519--- a/arch/ia64/kernel/palinfo.c
5520+++ b/arch/ia64/kernel/palinfo.c
5521@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5522 return NOTIFY_OK;
5523 }
5524
5525-static struct notifier_block __refdata palinfo_cpu_notifier =
5526+static struct notifier_block palinfo_cpu_notifier =
5527 {
5528 .notifier_call = palinfo_cpu_callback,
5529 .priority = 0,
5530diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5531index 41e33f8..65180b2a 100644
5532--- a/arch/ia64/kernel/sys_ia64.c
5533+++ b/arch/ia64/kernel/sys_ia64.c
5534@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5535 unsigned long align_mask = 0;
5536 struct mm_struct *mm = current->mm;
5537 struct vm_unmapped_area_info info;
5538+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5539
5540 if (len > RGN_MAP_LIMIT)
5541 return -ENOMEM;
5542@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5543 if (REGION_NUMBER(addr) == RGN_HPAGE)
5544 addr = 0;
5545 #endif
5546+
5547+#ifdef CONFIG_PAX_RANDMMAP
5548+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5549+ addr = mm->free_area_cache;
5550+ else
5551+#endif
5552+
5553 if (!addr)
5554 addr = TASK_UNMAPPED_BASE;
5555
5556@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5557 info.high_limit = TASK_SIZE;
5558 info.align_mask = align_mask;
5559 info.align_offset = 0;
5560+ info.threadstack_offset = offset;
5561 return vm_unmapped_area(&info);
5562 }
5563
5564diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5565index 84f8a52..7c76178 100644
5566--- a/arch/ia64/kernel/vmlinux.lds.S
5567+++ b/arch/ia64/kernel/vmlinux.lds.S
5568@@ -192,7 +192,7 @@ SECTIONS {
5569 /* Per-cpu data: */
5570 . = ALIGN(PERCPU_PAGE_SIZE);
5571 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5572- __phys_per_cpu_start = __per_cpu_load;
5573+ __phys_per_cpu_start = per_cpu_load;
5574 /*
5575 * ensure percpu data fits
5576 * into percpu page size
5577diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5578index ba5ba7a..36e9d3a 100644
5579--- a/arch/ia64/mm/fault.c
5580+++ b/arch/ia64/mm/fault.c
5581@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5582 return pte_present(pte);
5583 }
5584
5585+#ifdef CONFIG_PAX_PAGEEXEC
5586+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5587+{
5588+ unsigned long i;
5589+
5590+ printk(KERN_ERR "PAX: bytes at PC: ");
5591+ for (i = 0; i < 8; i++) {
5592+ unsigned int c;
5593+ if (get_user(c, (unsigned int *)pc+i))
5594+ printk(KERN_CONT "???????? ");
5595+ else
5596+ printk(KERN_CONT "%08x ", c);
5597+ }
5598+ printk("\n");
5599+}
5600+#endif
5601+
5602 # define VM_READ_BIT 0
5603 # define VM_WRITE_BIT 1
5604 # define VM_EXEC_BIT 2
5605@@ -151,8 +168,21 @@ retry:
5606 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5607 goto bad_area;
5608
5609- if ((vma->vm_flags & mask) != mask)
5610+ if ((vma->vm_flags & mask) != mask) {
5611+
5612+#ifdef CONFIG_PAX_PAGEEXEC
5613+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5614+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5615+ goto bad_area;
5616+
5617+ up_read(&mm->mmap_sem);
5618+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5619+ do_group_exit(SIGKILL);
5620+ }
5621+#endif
5622+
5623 goto bad_area;
5624+ }
5625
5626 /*
5627 * If for any reason at all we couldn't handle the fault, make
5628diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5629index 52b7604b..455cb85 100644
5630--- a/arch/ia64/mm/hugetlbpage.c
5631+++ b/arch/ia64/mm/hugetlbpage.c
5632@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5633 unsigned long pgoff, unsigned long flags)
5634 {
5635 struct vm_unmapped_area_info info;
5636+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5637
5638 if (len > RGN_MAP_LIMIT)
5639 return -ENOMEM;
5640@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5641 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5642 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5643 info.align_offset = 0;
5644+ info.threadstack_offset = offset;
5645 return vm_unmapped_area(&info);
5646 }
5647
5648diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5649index a9b65cf..49ae1cf 100644
5650--- a/arch/ia64/mm/init.c
5651+++ b/arch/ia64/mm/init.c
5652@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5653 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5654 vma->vm_end = vma->vm_start + PAGE_SIZE;
5655 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5656+
5657+#ifdef CONFIG_PAX_PAGEEXEC
5658+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5659+ vma->vm_flags &= ~VM_EXEC;
5660+
5661+#ifdef CONFIG_PAX_MPROTECT
5662+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5663+ vma->vm_flags &= ~VM_MAYEXEC;
5664+#endif
5665+
5666+ }
5667+#endif
5668+
5669 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5670 down_write(&current->mm->mmap_sem);
5671 if (insert_vm_struct(current->mm, vma)) {
5672@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5673 gate_vma.vm_start = FIXADDR_USER_START;
5674 gate_vma.vm_end = FIXADDR_USER_END;
5675 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5676- gate_vma.vm_page_prot = __P101;
5677+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5678
5679 return 0;
5680 }
5681diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5682index 40b3ee98..8c2c112 100644
5683--- a/arch/m32r/include/asm/cache.h
5684+++ b/arch/m32r/include/asm/cache.h
5685@@ -1,8 +1,10 @@
5686 #ifndef _ASM_M32R_CACHE_H
5687 #define _ASM_M32R_CACHE_H
5688
5689+#include <linux/const.h>
5690+
5691 /* L1 cache line size */
5692 #define L1_CACHE_SHIFT 4
5693-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5694+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5695
5696 #endif /* _ASM_M32R_CACHE_H */
5697diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5698index 82abd15..d95ae5d 100644
5699--- a/arch/m32r/lib/usercopy.c
5700+++ b/arch/m32r/lib/usercopy.c
5701@@ -14,6 +14,9 @@
5702 unsigned long
5703 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5704 {
5705+ if ((long)n < 0)
5706+ return n;
5707+
5708 prefetch(from);
5709 if (access_ok(VERIFY_WRITE, to, n))
5710 __copy_user(to,from,n);
5711@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5712 unsigned long
5713 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5714 {
5715+ if ((long)n < 0)
5716+ return n;
5717+
5718 prefetchw(to);
5719 if (access_ok(VERIFY_READ, from, n))
5720 __copy_user_zeroing(to,from,n);
5721diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5722index 0395c51..5f26031 100644
5723--- a/arch/m68k/include/asm/cache.h
5724+++ b/arch/m68k/include/asm/cache.h
5725@@ -4,9 +4,11 @@
5726 #ifndef __ARCH_M68K_CACHE_H
5727 #define __ARCH_M68K_CACHE_H
5728
5729+#include <linux/const.h>
5730+
5731 /* bytes per L1 cache line */
5732 #define L1_CACHE_SHIFT 4
5733-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5734+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5735
5736 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5737
5738diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5739index d703d8e..a8e2d70 100644
5740--- a/arch/metag/include/asm/barrier.h
5741+++ b/arch/metag/include/asm/barrier.h
5742@@ -90,7 +90,7 @@ static inline void fence(void)
5743 do { \
5744 compiletime_assert_atomic_type(*p); \
5745 smp_mb(); \
5746- ACCESS_ONCE(*p) = (v); \
5747+ ACCESS_ONCE_RW(*p) = (v); \
5748 } while (0)
5749
5750 #define smp_load_acquire(p) \
5751diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5752index 7ca80ac..794ba72 100644
5753--- a/arch/metag/mm/hugetlbpage.c
5754+++ b/arch/metag/mm/hugetlbpage.c
5755@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5756 info.high_limit = TASK_SIZE;
5757 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5758 info.align_offset = 0;
5759+ info.threadstack_offset = 0;
5760 return vm_unmapped_area(&info);
5761 }
5762
5763diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5764index 4efe96a..60e8699 100644
5765--- a/arch/microblaze/include/asm/cache.h
5766+++ b/arch/microblaze/include/asm/cache.h
5767@@ -13,11 +13,12 @@
5768 #ifndef _ASM_MICROBLAZE_CACHE_H
5769 #define _ASM_MICROBLAZE_CACHE_H
5770
5771+#include <linux/const.h>
5772 #include <asm/registers.h>
5773
5774 #define L1_CACHE_SHIFT 5
5775 /* word-granular cache in microblaze */
5776-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5777+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5778
5779 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5780
5781diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5782index a3b1ffe..7d61ca6 100644
5783--- a/arch/mips/Kconfig
5784+++ b/arch/mips/Kconfig
5785@@ -2586,6 +2586,7 @@ source "kernel/Kconfig.preempt"
5786
5787 config KEXEC
5788 bool "Kexec system call"
5789+ depends on !GRKERNSEC_KMEM
5790 help
5791 kexec is a system call that implements the ability to shutdown your
5792 current kernel, and to start another kernel. It is like a reboot
5793diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5794index d8960d4..77dbd31 100644
5795--- a/arch/mips/cavium-octeon/dma-octeon.c
5796+++ b/arch/mips/cavium-octeon/dma-octeon.c
5797@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5798 if (dma_release_from_coherent(dev, order, vaddr))
5799 return;
5800
5801- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5802+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5803 }
5804
5805 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5806diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5807index 26d4363..3c9a82e 100644
5808--- a/arch/mips/include/asm/atomic.h
5809+++ b/arch/mips/include/asm/atomic.h
5810@@ -22,15 +22,39 @@
5811 #include <asm/cmpxchg.h>
5812 #include <asm/war.h>
5813
5814+#ifdef CONFIG_GENERIC_ATOMIC64
5815+#include <asm-generic/atomic64.h>
5816+#endif
5817+
5818 #define ATOMIC_INIT(i) { (i) }
5819
5820+#ifdef CONFIG_64BIT
5821+#define _ASM_EXTABLE(from, to) \
5822+" .section __ex_table,\"a\"\n" \
5823+" .dword " #from ", " #to"\n" \
5824+" .previous\n"
5825+#else
5826+#define _ASM_EXTABLE(from, to) \
5827+" .section __ex_table,\"a\"\n" \
5828+" .word " #from ", " #to"\n" \
5829+" .previous\n"
5830+#endif
5831+
5832 /*
5833 * atomic_read - read atomic variable
5834 * @v: pointer of type atomic_t
5835 *
5836 * Atomically reads the value of @v.
5837 */
5838-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5839+static inline int atomic_read(const atomic_t *v)
5840+{
5841+ return ACCESS_ONCE(v->counter);
5842+}
5843+
5844+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5845+{
5846+ return ACCESS_ONCE(v->counter);
5847+}
5848
5849 /*
5850 * atomic_set - set atomic variable
5851@@ -39,47 +63,77 @@
5852 *
5853 * Atomically sets the value of @v to @i.
5854 */
5855-#define atomic_set(v, i) ((v)->counter = (i))
5856+static inline void atomic_set(atomic_t *v, int i)
5857+{
5858+ v->counter = i;
5859+}
5860
5861-#define ATOMIC_OP(op, c_op, asm_op) \
5862-static __inline__ void atomic_##op(int i, atomic_t * v) \
5863+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5864+{
5865+ v->counter = i;
5866+}
5867+
5868+#ifdef CONFIG_PAX_REFCOUNT
5869+#define __OVERFLOW_POST \
5870+ " b 4f \n" \
5871+ " .set noreorder \n" \
5872+ "3: b 5f \n" \
5873+ " move %0, %1 \n" \
5874+ " .set reorder \n"
5875+#define __OVERFLOW_EXTABLE \
5876+ "3:\n" \
5877+ _ASM_EXTABLE(2b, 3b)
5878+#else
5879+#define __OVERFLOW_POST
5880+#define __OVERFLOW_EXTABLE
5881+#endif
5882+
5883+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5884+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5885 { \
5886 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5887 int temp; \
5888 \
5889 __asm__ __volatile__( \
5890- " .set arch=r4000 \n" \
5891- "1: ll %0, %1 # atomic_" #op " \n" \
5892- " " #asm_op " %0, %2 \n" \
5893+ " .set mips3 \n" \
5894+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5895+ "2: " #asm_op " %0, %2 \n" \
5896 " sc %0, %1 \n" \
5897 " beqzl %0, 1b \n" \
5898+ extable \
5899 " .set mips0 \n" \
5900 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5901 : "Ir" (i)); \
5902 } else if (kernel_uses_llsc) { \
5903 int temp; \
5904 \
5905- do { \
5906- __asm__ __volatile__( \
5907- " .set "MIPS_ISA_LEVEL" \n" \
5908- " ll %0, %1 # atomic_" #op "\n" \
5909- " " #asm_op " %0, %2 \n" \
5910- " sc %0, %1 \n" \
5911- " .set mips0 \n" \
5912- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5913- : "Ir" (i)); \
5914- } while (unlikely(!temp)); \
5915+ __asm__ __volatile__( \
5916+ " .set "MIPS_ISA_LEVEL" \n" \
5917+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5918+ "2: " #asm_op " %0, %2 \n" \
5919+ " sc %0, %1 \n" \
5920+ " beqz %0, 1b \n" \
5921+ extable \
5922+ " .set mips0 \n" \
5923+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5924+ : "Ir" (i)); \
5925 } else { \
5926 unsigned long flags; \
5927 \
5928 raw_local_irq_save(flags); \
5929- v->counter c_op i; \
5930+ __asm__ __volatile__( \
5931+ "2: " #asm_op " %0, %1 \n" \
5932+ extable \
5933+ : "+r" (v->counter) : "Ir" (i)); \
5934 raw_local_irq_restore(flags); \
5935 } \
5936 }
5937
5938-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5939-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5940+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5941+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5942+
5943+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5944+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5945 { \
5946 int result; \
5947 \
5948@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5949 int temp; \
5950 \
5951 __asm__ __volatile__( \
5952- " .set arch=r4000 \n" \
5953- "1: ll %1, %2 # atomic_" #op "_return \n" \
5954- " " #asm_op " %0, %1, %3 \n" \
5955+ " .set mips3 \n" \
5956+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5957+ "2: " #asm_op " %0, %1, %3 \n" \
5958 " sc %0, %2 \n" \
5959 " beqzl %0, 1b \n" \
5960- " " #asm_op " %0, %1, %3 \n" \
5961+ post_op \
5962+ extable \
5963+ "4: " #asm_op " %0, %1, %3 \n" \
5964+ "5: \n" \
5965 " .set mips0 \n" \
5966 : "=&r" (result), "=&r" (temp), \
5967 "+" GCC_OFF_SMALL_ASM() (v->counter) \
5968@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5969 } else if (kernel_uses_llsc) { \
5970 int temp; \
5971 \
5972- do { \
5973- __asm__ __volatile__( \
5974- " .set "MIPS_ISA_LEVEL" \n" \
5975- " ll %1, %2 # atomic_" #op "_return \n" \
5976- " " #asm_op " %0, %1, %3 \n" \
5977- " sc %0, %2 \n" \
5978- " .set mips0 \n" \
5979- : "=&r" (result), "=&r" (temp), \
5980- "+" GCC_OFF_SMALL_ASM() (v->counter) \
5981- : "Ir" (i)); \
5982- } while (unlikely(!result)); \
5983+ __asm__ __volatile__( \
5984+ " .set "MIPS_ISA_LEVEL" \n" \
5985+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5986+ "2: " #asm_op " %0, %1, %3 \n" \
5987+ " sc %0, %2 \n" \
5988+ post_op \
5989+ extable \
5990+ "4: " #asm_op " %0, %1, %3 \n" \
5991+ "5: \n" \
5992+ " .set mips0 \n" \
5993+ : "=&r" (result), "=&r" (temp), \
5994+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
5995+ : "Ir" (i)); \
5996 \
5997 result = temp; result c_op i; \
5998 } else { \
5999 unsigned long flags; \
6000 \
6001 raw_local_irq_save(flags); \
6002- result = v->counter; \
6003- result c_op i; \
6004- v->counter = result; \
6005+ __asm__ __volatile__( \
6006+ " lw %0, %1 \n" \
6007+ "2: " #asm_op " %0, %1, %2 \n" \
6008+ " sw %0, %1 \n" \
6009+ "3: \n" \
6010+ extable \
6011+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6012+ : "Ir" (i)); \
6013 raw_local_irq_restore(flags); \
6014 } \
6015 \
6016@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6017 return result; \
6018 }
6019
6020-#define ATOMIC_OPS(op, c_op, asm_op) \
6021- ATOMIC_OP(op, c_op, asm_op) \
6022- ATOMIC_OP_RETURN(op, c_op, asm_op)
6023+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6024+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6025
6026-ATOMIC_OPS(add, +=, addu)
6027-ATOMIC_OPS(sub, -=, subu)
6028+#define ATOMIC_OPS(op, asm_op) \
6029+ ATOMIC_OP(op, asm_op) \
6030+ ATOMIC_OP_RETURN(op, asm_op)
6031+
6032+ATOMIC_OPS(add, add)
6033+ATOMIC_OPS(sub, sub)
6034
6035 #undef ATOMIC_OPS
6036 #undef ATOMIC_OP_RETURN
6037+#undef __ATOMIC_OP_RETURN
6038 #undef ATOMIC_OP
6039+#undef __ATOMIC_OP
6040
6041 /*
6042 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
6043@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
6044 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6045 * The function returns the old value of @v minus @i.
6046 */
6047-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6048+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
6049 {
6050 int result;
6051
6052@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6053 int temp;
6054
6055 __asm__ __volatile__(
6056- " .set arch=r4000 \n"
6057+ " .set "MIPS_ISA_LEVEL" \n"
6058 "1: ll %1, %2 # atomic_sub_if_positive\n"
6059 " subu %0, %1, %3 \n"
6060 " bltz %0, 1f \n"
6061@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6062 return result;
6063 }
6064
6065-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6066-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6067+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6068+{
6069+ return cmpxchg(&v->counter, old, new);
6070+}
6071+
6072+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6073+ int new)
6074+{
6075+ return cmpxchg(&(v->counter), old, new);
6076+}
6077+
6078+static inline int atomic_xchg(atomic_t *v, int new)
6079+{
6080+ return xchg(&v->counter, new);
6081+}
6082+
6083+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6084+{
6085+ return xchg(&(v->counter), new);
6086+}
6087
6088 /**
6089 * __atomic_add_unless - add unless the number is a given value
6090@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6091
6092 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6093 #define atomic_inc_return(v) atomic_add_return(1, (v))
6094+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6095+{
6096+ return atomic_add_return_unchecked(1, v);
6097+}
6098
6099 /*
6100 * atomic_sub_and_test - subtract value from variable and test result
6101@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6102 * other cases.
6103 */
6104 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6105+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6106+{
6107+ return atomic_add_return_unchecked(1, v) == 0;
6108+}
6109
6110 /*
6111 * atomic_dec_and_test - decrement by 1 and test
6112@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6113 * Atomically increments @v by 1.
6114 */
6115 #define atomic_inc(v) atomic_add(1, (v))
6116+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6117+{
6118+ atomic_add_unchecked(1, v);
6119+}
6120
6121 /*
6122 * atomic_dec - decrement and test
6123@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6124 * Atomically decrements @v by 1.
6125 */
6126 #define atomic_dec(v) atomic_sub(1, (v))
6127+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6128+{
6129+ atomic_sub_unchecked(1, v);
6130+}
6131
6132 /*
6133 * atomic_add_negative - add and test if negative
6134@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6135 * @v: pointer of type atomic64_t
6136 *
6137 */
6138-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6139+static inline long atomic64_read(const atomic64_t *v)
6140+{
6141+ return ACCESS_ONCE(v->counter);
6142+}
6143+
6144+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6145+{
6146+ return ACCESS_ONCE(v->counter);
6147+}
6148
6149 /*
6150 * atomic64_set - set atomic variable
6151 * @v: pointer of type atomic64_t
6152 * @i: required value
6153 */
6154-#define atomic64_set(v, i) ((v)->counter = (i))
6155+static inline void atomic64_set(atomic64_t *v, long i)
6156+{
6157+ v->counter = i;
6158+}
6159
6160-#define ATOMIC64_OP(op, c_op, asm_op) \
6161-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6162+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6163+{
6164+ v->counter = i;
6165+}
6166+
6167+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6168+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6169 { \
6170 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6171 long temp; \
6172 \
6173 __asm__ __volatile__( \
6174- " .set arch=r4000 \n" \
6175- "1: lld %0, %1 # atomic64_" #op " \n" \
6176- " " #asm_op " %0, %2 \n" \
6177+ " .set "MIPS_ISA_LEVEL" \n" \
6178+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6179+ "2: " #asm_op " %0, %2 \n" \
6180 " scd %0, %1 \n" \
6181 " beqzl %0, 1b \n" \
6182+ extable \
6183 " .set mips0 \n" \
6184 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6185 : "Ir" (i)); \
6186 } else if (kernel_uses_llsc) { \
6187 long temp; \
6188 \
6189- do { \
6190- __asm__ __volatile__( \
6191- " .set "MIPS_ISA_LEVEL" \n" \
6192- " lld %0, %1 # atomic64_" #op "\n" \
6193- " " #asm_op " %0, %2 \n" \
6194- " scd %0, %1 \n" \
6195- " .set mips0 \n" \
6196- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6197- : "Ir" (i)); \
6198- } while (unlikely(!temp)); \
6199+ __asm__ __volatile__( \
6200+ " .set "MIPS_ISA_LEVEL" \n" \
6201+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6202+ "2: " #asm_op " %0, %2 \n" \
6203+ " scd %0, %1 \n" \
6204+ " beqz %0, 1b \n" \
6205+ extable \
6206+ " .set mips0 \n" \
6207+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6208+ : "Ir" (i)); \
6209 } else { \
6210 unsigned long flags; \
6211 \
6212 raw_local_irq_save(flags); \
6213- v->counter c_op i; \
6214+ __asm__ __volatile__( \
6215+ "2: " #asm_op " %0, %1 \n" \
6216+ extable \
6217+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6218 raw_local_irq_restore(flags); \
6219 } \
6220 }
6221
6222-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6223-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6224+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6225+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6226+
6227+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6228+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6229 { \
6230 long result; \
6231 \
6232@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6233 long temp; \
6234 \
6235 __asm__ __volatile__( \
6236- " .set arch=r4000 \n" \
6237+ " .set mips3 \n" \
6238 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6239- " " #asm_op " %0, %1, %3 \n" \
6240+ "2: " #asm_op " %0, %1, %3 \n" \
6241 " scd %0, %2 \n" \
6242 " beqzl %0, 1b \n" \
6243- " " #asm_op " %0, %1, %3 \n" \
6244+ post_op \
6245+ extable \
6246+ "4: " #asm_op " %0, %1, %3 \n" \
6247+ "5: \n" \
6248 " .set mips0 \n" \
6249 : "=&r" (result), "=&r" (temp), \
6250 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6251@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6252 } else if (kernel_uses_llsc) { \
6253 long temp; \
6254 \
6255- do { \
6256- __asm__ __volatile__( \
6257- " .set "MIPS_ISA_LEVEL" \n" \
6258- " lld %1, %2 # atomic64_" #op "_return\n" \
6259- " " #asm_op " %0, %1, %3 \n" \
6260- " scd %0, %2 \n" \
6261- " .set mips0 \n" \
6262- : "=&r" (result), "=&r" (temp), \
6263- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6264- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6265- : "memory"); \
6266- } while (unlikely(!result)); \
6267+ __asm__ __volatile__( \
6268+ " .set "MIPS_ISA_LEVEL" \n" \
6269+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6270+ "2: " #asm_op " %0, %1, %3 \n" \
6271+ " scd %0, %2 \n" \
6272+ " beqz %0, 1b \n" \
6273+ post_op \
6274+ extable \
6275+ "4: " #asm_op " %0, %1, %3 \n" \
6276+ "5: \n" \
6277+ " .set mips0 \n" \
6278+ : "=&r" (result), "=&r" (temp), \
6279+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6280+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6281+ : "memory"); \
6282 \
6283 result = temp; result c_op i; \
6284 } else { \
6285 unsigned long flags; \
6286 \
6287 raw_local_irq_save(flags); \
6288- result = v->counter; \
6289- result c_op i; \
6290- v->counter = result; \
6291+ __asm__ __volatile__( \
6292+ " ld %0, %1 \n" \
6293+ "2: " #asm_op " %0, %1, %2 \n" \
6294+ " sd %0, %1 \n" \
6295+ "3: \n" \
6296+ extable \
6297+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6298+ : "Ir" (i)); \
6299 raw_local_irq_restore(flags); \
6300 } \
6301 \
6302@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6303 return result; \
6304 }
6305
6306-#define ATOMIC64_OPS(op, c_op, asm_op) \
6307- ATOMIC64_OP(op, c_op, asm_op) \
6308- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6309+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6310+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6311
6312-ATOMIC64_OPS(add, +=, daddu)
6313-ATOMIC64_OPS(sub, -=, dsubu)
6314+#define ATOMIC64_OPS(op, asm_op) \
6315+ ATOMIC64_OP(op, asm_op) \
6316+ ATOMIC64_OP_RETURN(op, asm_op)
6317+
6318+ATOMIC64_OPS(add, dadd)
6319+ATOMIC64_OPS(sub, dsub)
6320
6321 #undef ATOMIC64_OPS
6322 #undef ATOMIC64_OP_RETURN
6323+#undef __ATOMIC64_OP_RETURN
6324 #undef ATOMIC64_OP
6325+#undef __ATOMIC64_OP
6326+#undef __OVERFLOW_EXTABLE
6327+#undef __OVERFLOW_POST
6328
6329 /*
6330 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6331@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6332 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6333 * The function returns the old value of @v minus @i.
6334 */
6335-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6336+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6337 {
6338 long result;
6339
6340@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6341 long temp;
6342
6343 __asm__ __volatile__(
6344- " .set arch=r4000 \n"
6345+ " .set "MIPS_ISA_LEVEL" \n"
6346 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6347 " dsubu %0, %1, %3 \n"
6348 " bltz %0, 1f \n"
6349@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6350 return result;
6351 }
6352
6353-#define atomic64_cmpxchg(v, o, n) \
6354- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6355-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6356+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6357+{
6358+ return cmpxchg(&v->counter, old, new);
6359+}
6360+
6361+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6362+ long new)
6363+{
6364+ return cmpxchg(&(v->counter), old, new);
6365+}
6366+
6367+static inline long atomic64_xchg(atomic64_t *v, long new)
6368+{
6369+ return xchg(&v->counter, new);
6370+}
6371+
6372+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6373+{
6374+ return xchg(&(v->counter), new);
6375+}
6376
6377 /**
6378 * atomic64_add_unless - add unless the number is a given value
6379@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6380
6381 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6382 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6383+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6384
6385 /*
6386 * atomic64_sub_and_test - subtract value from variable and test result
6387@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6388 * other cases.
6389 */
6390 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6391+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6392
6393 /*
6394 * atomic64_dec_and_test - decrement by 1 and test
6395@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6396 * Atomically increments @v by 1.
6397 */
6398 #define atomic64_inc(v) atomic64_add(1, (v))
6399+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6400
6401 /*
6402 * atomic64_dec - decrement and test
6403@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6404 * Atomically decrements @v by 1.
6405 */
6406 #define atomic64_dec(v) atomic64_sub(1, (v))
6407+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6408
6409 /*
6410 * atomic64_add_negative - add and test if negative
6411diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6412index 2b8bbbc..4556df6 100644
6413--- a/arch/mips/include/asm/barrier.h
6414+++ b/arch/mips/include/asm/barrier.h
6415@@ -133,7 +133,7 @@
6416 do { \
6417 compiletime_assert_atomic_type(*p); \
6418 smp_mb(); \
6419- ACCESS_ONCE(*p) = (v); \
6420+ ACCESS_ONCE_RW(*p) = (v); \
6421 } while (0)
6422
6423 #define smp_load_acquire(p) \
6424diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6425index b4db69f..8f3b093 100644
6426--- a/arch/mips/include/asm/cache.h
6427+++ b/arch/mips/include/asm/cache.h
6428@@ -9,10 +9,11 @@
6429 #ifndef _ASM_CACHE_H
6430 #define _ASM_CACHE_H
6431
6432+#include <linux/const.h>
6433 #include <kmalloc.h>
6434
6435 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6436-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6437+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6438
6439 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6440 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6441diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6442index f19e890..a4f8177 100644
6443--- a/arch/mips/include/asm/elf.h
6444+++ b/arch/mips/include/asm/elf.h
6445@@ -417,6 +417,13 @@ extern const char *__elf_platform;
6446 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6447 #endif
6448
6449+#ifdef CONFIG_PAX_ASLR
6450+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6451+
6452+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6453+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6454+#endif
6455+
6456 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6457 struct linux_binprm;
6458 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6459diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6460index c1f6afa..38cc6e9 100644
6461--- a/arch/mips/include/asm/exec.h
6462+++ b/arch/mips/include/asm/exec.h
6463@@ -12,6 +12,6 @@
6464 #ifndef _ASM_EXEC_H
6465 #define _ASM_EXEC_H
6466
6467-extern unsigned long arch_align_stack(unsigned long sp);
6468+#define arch_align_stack(x) ((x) & ~0xfUL)
6469
6470 #endif /* _ASM_EXEC_H */
6471diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6472index 9e8ef59..1139d6b 100644
6473--- a/arch/mips/include/asm/hw_irq.h
6474+++ b/arch/mips/include/asm/hw_irq.h
6475@@ -10,7 +10,7 @@
6476
6477 #include <linux/atomic.h>
6478
6479-extern atomic_t irq_err_count;
6480+extern atomic_unchecked_t irq_err_count;
6481
6482 /*
6483 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6484diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6485index 8feaed6..1bd8a64 100644
6486--- a/arch/mips/include/asm/local.h
6487+++ b/arch/mips/include/asm/local.h
6488@@ -13,15 +13,25 @@ typedef struct
6489 atomic_long_t a;
6490 } local_t;
6491
6492+typedef struct {
6493+ atomic_long_unchecked_t a;
6494+} local_unchecked_t;
6495+
6496 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6497
6498 #define local_read(l) atomic_long_read(&(l)->a)
6499+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6500 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6501+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6502
6503 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6504+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6505 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6506+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6507 #define local_inc(l) atomic_long_inc(&(l)->a)
6508+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6509 #define local_dec(l) atomic_long_dec(&(l)->a)
6510+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6511
6512 /*
6513 * Same as above, but return the result value
6514@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6515 return result;
6516 }
6517
6518+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6519+{
6520+ unsigned long result;
6521+
6522+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6523+ unsigned long temp;
6524+
6525+ __asm__ __volatile__(
6526+ " .set mips3 \n"
6527+ "1:" __LL "%1, %2 # local_add_return \n"
6528+ " addu %0, %1, %3 \n"
6529+ __SC "%0, %2 \n"
6530+ " beqzl %0, 1b \n"
6531+ " addu %0, %1, %3 \n"
6532+ " .set mips0 \n"
6533+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6534+ : "Ir" (i), "m" (l->a.counter)
6535+ : "memory");
6536+ } else if (kernel_uses_llsc) {
6537+ unsigned long temp;
6538+
6539+ __asm__ __volatile__(
6540+ " .set mips3 \n"
6541+ "1:" __LL "%1, %2 # local_add_return \n"
6542+ " addu %0, %1, %3 \n"
6543+ __SC "%0, %2 \n"
6544+ " beqz %0, 1b \n"
6545+ " addu %0, %1, %3 \n"
6546+ " .set mips0 \n"
6547+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6548+ : "Ir" (i), "m" (l->a.counter)
6549+ : "memory");
6550+ } else {
6551+ unsigned long flags;
6552+
6553+ local_irq_save(flags);
6554+ result = l->a.counter;
6555+ result += i;
6556+ l->a.counter = result;
6557+ local_irq_restore(flags);
6558+ }
6559+
6560+ return result;
6561+}
6562+
6563 static __inline__ long local_sub_return(long i, local_t * l)
6564 {
6565 unsigned long result;
6566@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6567
6568 #define local_cmpxchg(l, o, n) \
6569 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6570+#define local_cmpxchg_unchecked(l, o, n) \
6571+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6572 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6573
6574 /**
6575diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6576index 89dd7fe..a123c97 100644
6577--- a/arch/mips/include/asm/page.h
6578+++ b/arch/mips/include/asm/page.h
6579@@ -118,7 +118,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6580 #ifdef CONFIG_CPU_MIPS32
6581 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6582 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6583- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6584+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6585 #else
6586 typedef struct { unsigned long long pte; } pte_t;
6587 #define pte_val(x) ((x).pte)
6588diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6589index b336037..5b874cc 100644
6590--- a/arch/mips/include/asm/pgalloc.h
6591+++ b/arch/mips/include/asm/pgalloc.h
6592@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6593 {
6594 set_pud(pud, __pud((unsigned long)pmd));
6595 }
6596+
6597+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6598+{
6599+ pud_populate(mm, pud, pmd);
6600+}
6601 #endif
6602
6603 /*
6604diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6605index 70f6e7f..11f4ada 100644
6606--- a/arch/mips/include/asm/pgtable.h
6607+++ b/arch/mips/include/asm/pgtable.h
6608@@ -20,6 +20,9 @@
6609 #include <asm/io.h>
6610 #include <asm/pgtable-bits.h>
6611
6612+#define ktla_ktva(addr) (addr)
6613+#define ktva_ktla(addr) (addr)
6614+
6615 struct mm_struct;
6616 struct vm_area_struct;
6617
6618diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6619index 9c0014e..5101ef5 100644
6620--- a/arch/mips/include/asm/thread_info.h
6621+++ b/arch/mips/include/asm/thread_info.h
6622@@ -100,6 +100,9 @@ static inline struct thread_info *current_thread_info(void)
6623 #define TIF_SECCOMP 4 /* secure computing */
6624 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6625 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6626+/* li takes a 32bit immediate */
6627+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6628+
6629 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6630 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6631 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6632@@ -135,14 +138,16 @@ static inline struct thread_info *current_thread_info(void)
6633 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6634 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6635 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6636+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6637
6638 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6639 _TIF_SYSCALL_AUDIT | \
6640- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6641+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6642+ _TIF_GRSEC_SETXID)
6643
6644 /* work to do in syscall_trace_leave() */
6645 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6646- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6647+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6648
6649 /* work to do on interrupt/exception return */
6650 #define _TIF_WORK_MASK \
6651@@ -150,7 +155,7 @@ static inline struct thread_info *current_thread_info(void)
6652 /* work to do on any return to u-space */
6653 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6654 _TIF_WORK_SYSCALL_EXIT | \
6655- _TIF_SYSCALL_TRACEPOINT)
6656+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6657
6658 /*
6659 * We stash processor id into a COP0 register to retrieve it fast
6660diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6661index bf8b324..cec5705 100644
6662--- a/arch/mips/include/asm/uaccess.h
6663+++ b/arch/mips/include/asm/uaccess.h
6664@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6665 __ok == 0; \
6666 })
6667
6668+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6669 #define access_ok(type, addr, size) \
6670 likely(__access_ok((addr), (size), __access_mask))
6671
6672diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6673index 1188e00..41cf144 100644
6674--- a/arch/mips/kernel/binfmt_elfn32.c
6675+++ b/arch/mips/kernel/binfmt_elfn32.c
6676@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6677 #undef ELF_ET_DYN_BASE
6678 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6679
6680+#ifdef CONFIG_PAX_ASLR
6681+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6682+
6683+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6684+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6685+#endif
6686+
6687 #include <asm/processor.h>
6688 #include <linux/module.h>
6689 #include <linux/elfcore.h>
6690diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6691index 9287678..f870e47 100644
6692--- a/arch/mips/kernel/binfmt_elfo32.c
6693+++ b/arch/mips/kernel/binfmt_elfo32.c
6694@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6695 #undef ELF_ET_DYN_BASE
6696 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6697
6698+#ifdef CONFIG_PAX_ASLR
6699+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6700+
6701+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6702+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6703+#endif
6704+
6705 #include <asm/processor.h>
6706
6707 #include <linux/module.h>
6708diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6709index a74ec3a..4f06f18 100644
6710--- a/arch/mips/kernel/i8259.c
6711+++ b/arch/mips/kernel/i8259.c
6712@@ -202,7 +202,7 @@ spurious_8259A_irq:
6713 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6714 spurious_irq_mask |= irqmask;
6715 }
6716- atomic_inc(&irq_err_count);
6717+ atomic_inc_unchecked(&irq_err_count);
6718 /*
6719 * Theoretically we do not have to handle this IRQ,
6720 * but in Linux this does not cause problems and is
6721diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6722index 44a1f79..2bd6aa3 100644
6723--- a/arch/mips/kernel/irq-gt641xx.c
6724+++ b/arch/mips/kernel/irq-gt641xx.c
6725@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6726 }
6727 }
6728
6729- atomic_inc(&irq_err_count);
6730+ atomic_inc_unchecked(&irq_err_count);
6731 }
6732
6733 void __init gt641xx_irq_init(void)
6734diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6735index 3c8a18a..b4929b6 100644
6736--- a/arch/mips/kernel/irq.c
6737+++ b/arch/mips/kernel/irq.c
6738@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6739 printk("unexpected IRQ # %d\n", irq);
6740 }
6741
6742-atomic_t irq_err_count;
6743+atomic_unchecked_t irq_err_count;
6744
6745 int arch_show_interrupts(struct seq_file *p, int prec)
6746 {
6747- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6748+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6749 return 0;
6750 }
6751
6752 asmlinkage void spurious_interrupt(void)
6753 {
6754- atomic_inc(&irq_err_count);
6755+ atomic_inc_unchecked(&irq_err_count);
6756 }
6757
6758 void __init init_IRQ(void)
6759@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6760 }
6761
6762 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6763+
6764+extern void gr_handle_kernel_exploit(void);
6765 static inline void check_stack_overflow(void)
6766 {
6767 unsigned long sp;
6768@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6769 printk("do_IRQ: stack overflow: %ld\n",
6770 sp - sizeof(struct thread_info));
6771 dump_stack();
6772+ gr_handle_kernel_exploit();
6773 }
6774 }
6775 #else
6776diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6777index 0614717..002fa43 100644
6778--- a/arch/mips/kernel/pm-cps.c
6779+++ b/arch/mips/kernel/pm-cps.c
6780@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6781 nc_core_ready_count = nc_addr;
6782
6783 /* Ensure ready_count is zero-initialised before the assembly runs */
6784- ACCESS_ONCE(*nc_core_ready_count) = 0;
6785+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6786 coupled_barrier(&per_cpu(pm_barrier, core), online);
6787
6788 /* Run the generated entry code */
6789diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6790index f2975d4..f61d355 100644
6791--- a/arch/mips/kernel/process.c
6792+++ b/arch/mips/kernel/process.c
6793@@ -541,18 +541,6 @@ out:
6794 return pc;
6795 }
6796
6797-/*
6798- * Don't forget that the stack pointer must be aligned on a 8 bytes
6799- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6800- */
6801-unsigned long arch_align_stack(unsigned long sp)
6802-{
6803- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6804- sp -= get_random_int() & ~PAGE_MASK;
6805-
6806- return sp & ALMASK;
6807-}
6808-
6809 static void arch_dump_stack(void *info)
6810 {
6811 struct pt_regs *regs;
6812diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6813index e933a30..0d02625 100644
6814--- a/arch/mips/kernel/ptrace.c
6815+++ b/arch/mips/kernel/ptrace.c
6816@@ -785,6 +785,10 @@ long arch_ptrace(struct task_struct *child, long request,
6817 return ret;
6818 }
6819
6820+#ifdef CONFIG_GRKERNSEC_SETXID
6821+extern void gr_delayed_cred_worker(void);
6822+#endif
6823+
6824 /*
6825 * Notification of system call entry/exit
6826 * - triggered by current->work.syscall_trace
6827@@ -803,6 +807,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6828 tracehook_report_syscall_entry(regs))
6829 ret = -1;
6830
6831+#ifdef CONFIG_GRKERNSEC_SETXID
6832+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6833+ gr_delayed_cred_worker();
6834+#endif
6835+
6836 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6837 trace_sys_enter(regs, regs->regs[2]);
6838
6839diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6840index 2242bdd..b284048 100644
6841--- a/arch/mips/kernel/sync-r4k.c
6842+++ b/arch/mips/kernel/sync-r4k.c
6843@@ -18,8 +18,8 @@
6844 #include <asm/mipsregs.h>
6845
6846 static atomic_t count_start_flag = ATOMIC_INIT(0);
6847-static atomic_t count_count_start = ATOMIC_INIT(0);
6848-static atomic_t count_count_stop = ATOMIC_INIT(0);
6849+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6850+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6851 static atomic_t count_reference = ATOMIC_INIT(0);
6852
6853 #define COUNTON 100
6854@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6855
6856 for (i = 0; i < NR_LOOPS; i++) {
6857 /* slaves loop on '!= 2' */
6858- while (atomic_read(&count_count_start) != 1)
6859+ while (atomic_read_unchecked(&count_count_start) != 1)
6860 mb();
6861- atomic_set(&count_count_stop, 0);
6862+ atomic_set_unchecked(&count_count_stop, 0);
6863 smp_wmb();
6864
6865 /* this lets the slaves write their count register */
6866- atomic_inc(&count_count_start);
6867+ atomic_inc_unchecked(&count_count_start);
6868
6869 /*
6870 * Everyone initialises count in the last loop:
6871@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6872 /*
6873 * Wait for all slaves to leave the synchronization point:
6874 */
6875- while (atomic_read(&count_count_stop) != 1)
6876+ while (atomic_read_unchecked(&count_count_stop) != 1)
6877 mb();
6878- atomic_set(&count_count_start, 0);
6879+ atomic_set_unchecked(&count_count_start, 0);
6880 smp_wmb();
6881- atomic_inc(&count_count_stop);
6882+ atomic_inc_unchecked(&count_count_stop);
6883 }
6884 /* Arrange for an interrupt in a short while */
6885 write_c0_compare(read_c0_count() + COUNTON);
6886@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6887 initcount = atomic_read(&count_reference);
6888
6889 for (i = 0; i < NR_LOOPS; i++) {
6890- atomic_inc(&count_count_start);
6891- while (atomic_read(&count_count_start) != 2)
6892+ atomic_inc_unchecked(&count_count_start);
6893+ while (atomic_read_unchecked(&count_count_start) != 2)
6894 mb();
6895
6896 /*
6897@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6898 if (i == NR_LOOPS-1)
6899 write_c0_count(initcount);
6900
6901- atomic_inc(&count_count_stop);
6902- while (atomic_read(&count_count_stop) != 2)
6903+ atomic_inc_unchecked(&count_count_stop);
6904+ while (atomic_read_unchecked(&count_count_stop) != 2)
6905 mb();
6906 }
6907 /* Arrange for an interrupt in a short while */
6908diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6909index 5f5f44e..cf10625 100644
6910--- a/arch/mips/kernel/traps.c
6911+++ b/arch/mips/kernel/traps.c
6912@@ -696,7 +696,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6913 siginfo_t info;
6914
6915 prev_state = exception_enter();
6916- die_if_kernel("Integer overflow", regs);
6917+ if (unlikely(!user_mode(regs))) {
6918+
6919+#ifdef CONFIG_PAX_REFCOUNT
6920+ if (fixup_exception(regs)) {
6921+ pax_report_refcount_overflow(regs);
6922+ exception_exit(prev_state);
6923+ return;
6924+ }
6925+#endif
6926+
6927+ die("Integer overflow", regs);
6928+ }
6929
6930 info.si_code = FPE_INTOVF;
6931 info.si_signo = SIGFPE;
6932diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6933index 52f205a..335927c 100644
6934--- a/arch/mips/kvm/mips.c
6935+++ b/arch/mips/kvm/mips.c
6936@@ -1013,7 +1013,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6937 return r;
6938 }
6939
6940-int kvm_arch_init(void *opaque)
6941+int kvm_arch_init(const void *opaque)
6942 {
6943 if (kvm_mips_callbacks) {
6944 kvm_err("kvm: module already exists\n");
6945diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6946index 7ff8637..6004edb 100644
6947--- a/arch/mips/mm/fault.c
6948+++ b/arch/mips/mm/fault.c
6949@@ -31,6 +31,23 @@
6950
6951 int show_unhandled_signals = 1;
6952
6953+#ifdef CONFIG_PAX_PAGEEXEC
6954+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6955+{
6956+ unsigned long i;
6957+
6958+ printk(KERN_ERR "PAX: bytes at PC: ");
6959+ for (i = 0; i < 5; i++) {
6960+ unsigned int c;
6961+ if (get_user(c, (unsigned int *)pc+i))
6962+ printk(KERN_CONT "???????? ");
6963+ else
6964+ printk(KERN_CONT "%08x ", c);
6965+ }
6966+ printk("\n");
6967+}
6968+#endif
6969+
6970 /*
6971 * This routine handles page faults. It determines the address,
6972 * and the problem, and then passes it off to one of the appropriate
6973@@ -206,6 +223,14 @@ bad_area:
6974 bad_area_nosemaphore:
6975 /* User mode accesses just cause a SIGSEGV */
6976 if (user_mode(regs)) {
6977+
6978+#ifdef CONFIG_PAX_PAGEEXEC
6979+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6980+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6981+ do_group_exit(SIGKILL);
6982+ }
6983+#endif
6984+
6985 tsk->thread.cp0_badvaddr = address;
6986 tsk->thread.error_code = write;
6987 if (show_unhandled_signals &&
6988diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6989index 5c81fdd..db158d3 100644
6990--- a/arch/mips/mm/mmap.c
6991+++ b/arch/mips/mm/mmap.c
6992@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6993 struct vm_area_struct *vma;
6994 unsigned long addr = addr0;
6995 int do_color_align;
6996+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6997 struct vm_unmapped_area_info info;
6998
6999 if (unlikely(len > TASK_SIZE))
7000@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7001 do_color_align = 1;
7002
7003 /* requesting a specific address */
7004+
7005+#ifdef CONFIG_PAX_RANDMMAP
7006+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
7007+#endif
7008+
7009 if (addr) {
7010 if (do_color_align)
7011 addr = COLOUR_ALIGN(addr, pgoff);
7012@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7013 addr = PAGE_ALIGN(addr);
7014
7015 vma = find_vma(mm, addr);
7016- if (TASK_SIZE - len >= addr &&
7017- (!vma || addr + len <= vma->vm_start))
7018+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7019 return addr;
7020 }
7021
7022 info.length = len;
7023 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7024 info.align_offset = pgoff << PAGE_SHIFT;
7025+ info.threadstack_offset = offset;
7026
7027 if (dir == DOWN) {
7028 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7029@@ -160,45 +166,34 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7030 {
7031 unsigned long random_factor = 0UL;
7032
7033+#ifdef CONFIG_PAX_RANDMMAP
7034+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7035+#endif
7036+
7037 if (current->flags & PF_RANDOMIZE)
7038 random_factor = arch_mmap_rnd();
7039
7040 if (mmap_is_legacy()) {
7041 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7042+
7043+#ifdef CONFIG_PAX_RANDMMAP
7044+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7045+ mm->mmap_base += mm->delta_mmap;
7046+#endif
7047+
7048 mm->get_unmapped_area = arch_get_unmapped_area;
7049 } else {
7050 mm->mmap_base = mmap_base(random_factor);
7051+
7052+#ifdef CONFIG_PAX_RANDMMAP
7053+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7054+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7055+#endif
7056+
7057 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7058 }
7059 }
7060
7061-static inline unsigned long brk_rnd(void)
7062-{
7063- unsigned long rnd = get_random_int();
7064-
7065- rnd = rnd << PAGE_SHIFT;
7066- /* 8MB for 32bit, 256MB for 64bit */
7067- if (TASK_IS_32BIT_ADDR)
7068- rnd = rnd & 0x7ffffful;
7069- else
7070- rnd = rnd & 0xffffffful;
7071-
7072- return rnd;
7073-}
7074-
7075-unsigned long arch_randomize_brk(struct mm_struct *mm)
7076-{
7077- unsigned long base = mm->brk;
7078- unsigned long ret;
7079-
7080- ret = PAGE_ALIGN(base + brk_rnd());
7081-
7082- if (ret < mm->brk)
7083- return mm->brk;
7084-
7085- return ret;
7086-}
7087-
7088 int __virt_addr_valid(const volatile void *kaddr)
7089 {
7090 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7091diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7092index a2358b4..7cead4f 100644
7093--- a/arch/mips/sgi-ip27/ip27-nmi.c
7094+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7095@@ -187,9 +187,9 @@ void
7096 cont_nmi_dump(void)
7097 {
7098 #ifndef REAL_NMI_SIGNAL
7099- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7100+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7101
7102- atomic_inc(&nmied_cpus);
7103+ atomic_inc_unchecked(&nmied_cpus);
7104 #endif
7105 /*
7106 * Only allow 1 cpu to proceed
7107@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7108 udelay(10000);
7109 }
7110 #else
7111- while (atomic_read(&nmied_cpus) != num_online_cpus());
7112+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7113 #endif
7114
7115 /*
7116diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7117index a046b30..6799527 100644
7118--- a/arch/mips/sni/rm200.c
7119+++ b/arch/mips/sni/rm200.c
7120@@ -270,7 +270,7 @@ spurious_8259A_irq:
7121 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7122 spurious_irq_mask |= irqmask;
7123 }
7124- atomic_inc(&irq_err_count);
7125+ atomic_inc_unchecked(&irq_err_count);
7126 /*
7127 * Theoretically we do not have to handle this IRQ,
7128 * but in Linux this does not cause problems and is
7129diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7130index 41e873b..34d33a7 100644
7131--- a/arch/mips/vr41xx/common/icu.c
7132+++ b/arch/mips/vr41xx/common/icu.c
7133@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7134
7135 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7136
7137- atomic_inc(&irq_err_count);
7138+ atomic_inc_unchecked(&irq_err_count);
7139
7140 return -1;
7141 }
7142diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7143index ae0e4ee..e8f0692 100644
7144--- a/arch/mips/vr41xx/common/irq.c
7145+++ b/arch/mips/vr41xx/common/irq.c
7146@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7147 irq_cascade_t *cascade;
7148
7149 if (irq >= NR_IRQS) {
7150- atomic_inc(&irq_err_count);
7151+ atomic_inc_unchecked(&irq_err_count);
7152 return;
7153 }
7154
7155@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7156 ret = cascade->get_irq(irq);
7157 irq = ret;
7158 if (ret < 0)
7159- atomic_inc(&irq_err_count);
7160+ atomic_inc_unchecked(&irq_err_count);
7161 else
7162 irq_dispatch(irq);
7163 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7164diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7165index 967d144..db12197 100644
7166--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7167+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7168@@ -11,12 +11,14 @@
7169 #ifndef _ASM_PROC_CACHE_H
7170 #define _ASM_PROC_CACHE_H
7171
7172+#include <linux/const.h>
7173+
7174 /* L1 cache */
7175
7176 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7177 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7178-#define L1_CACHE_BYTES 16 /* bytes per entry */
7179 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7180+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7181 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7182
7183 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7184diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7185index bcb5df2..84fabd2 100644
7186--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7187+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7188@@ -16,13 +16,15 @@
7189 #ifndef _ASM_PROC_CACHE_H
7190 #define _ASM_PROC_CACHE_H
7191
7192+#include <linux/const.h>
7193+
7194 /*
7195 * L1 cache
7196 */
7197 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7198 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7199-#define L1_CACHE_BYTES 32 /* bytes per entry */
7200 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7201+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7202 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7203
7204 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7205diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7206index 4ce7a01..449202a 100644
7207--- a/arch/openrisc/include/asm/cache.h
7208+++ b/arch/openrisc/include/asm/cache.h
7209@@ -19,11 +19,13 @@
7210 #ifndef __ASM_OPENRISC_CACHE_H
7211 #define __ASM_OPENRISC_CACHE_H
7212
7213+#include <linux/const.h>
7214+
7215 /* FIXME: How can we replace these with values from the CPU...
7216 * they shouldn't be hard-coded!
7217 */
7218
7219-#define L1_CACHE_BYTES 16
7220 #define L1_CACHE_SHIFT 4
7221+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7222
7223 #endif /* __ASM_OPENRISC_CACHE_H */
7224diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7225index 226f8ca9..9d9b87d 100644
7226--- a/arch/parisc/include/asm/atomic.h
7227+++ b/arch/parisc/include/asm/atomic.h
7228@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7229 return dec;
7230 }
7231
7232+#define atomic64_read_unchecked(v) atomic64_read(v)
7233+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7234+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7235+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7236+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7237+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7238+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7239+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7240+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7241+
7242 #endif /* !CONFIG_64BIT */
7243
7244
7245diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7246index 47f11c7..3420df2 100644
7247--- a/arch/parisc/include/asm/cache.h
7248+++ b/arch/parisc/include/asm/cache.h
7249@@ -5,6 +5,7 @@
7250 #ifndef __ARCH_PARISC_CACHE_H
7251 #define __ARCH_PARISC_CACHE_H
7252
7253+#include <linux/const.h>
7254
7255 /*
7256 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7257@@ -15,13 +16,13 @@
7258 * just ruin performance.
7259 */
7260 #ifdef CONFIG_PA20
7261-#define L1_CACHE_BYTES 64
7262 #define L1_CACHE_SHIFT 6
7263 #else
7264-#define L1_CACHE_BYTES 32
7265 #define L1_CACHE_SHIFT 5
7266 #endif
7267
7268+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7269+
7270 #ifndef __ASSEMBLY__
7271
7272 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7273diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7274index 78c9fd3..42fa66a 100644
7275--- a/arch/parisc/include/asm/elf.h
7276+++ b/arch/parisc/include/asm/elf.h
7277@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7278
7279 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7280
7281+#ifdef CONFIG_PAX_ASLR
7282+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7283+
7284+#define PAX_DELTA_MMAP_LEN 16
7285+#define PAX_DELTA_STACK_LEN 16
7286+#endif
7287+
7288 /* This yields a mask that user programs can use to figure out what
7289 instruction set this CPU supports. This could be done in user space,
7290 but it's not easy, and we've already done it here. */
7291diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7292index 3edbb9f..08fef28 100644
7293--- a/arch/parisc/include/asm/pgalloc.h
7294+++ b/arch/parisc/include/asm/pgalloc.h
7295@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7296 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7297 }
7298
7299+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7300+{
7301+ pgd_populate(mm, pgd, pmd);
7302+}
7303+
7304 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7305 {
7306 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7307@@ -97,6 +102,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7308 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7309 #define pmd_free(mm, x) do { } while (0)
7310 #define pgd_populate(mm, pmd, pte) BUG()
7311+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7312
7313 #endif
7314
7315diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7316index f93c4a4..cfd5663 100644
7317--- a/arch/parisc/include/asm/pgtable.h
7318+++ b/arch/parisc/include/asm/pgtable.h
7319@@ -231,6 +231,17 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
7320 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7321 #define PAGE_COPY PAGE_EXECREAD
7322 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7323+
7324+#ifdef CONFIG_PAX_PAGEEXEC
7325+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7326+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7327+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7328+#else
7329+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7330+# define PAGE_COPY_NOEXEC PAGE_COPY
7331+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7332+#endif
7333+
7334 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7335 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7336 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7337diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7338index 0abdd4c..1af92f0 100644
7339--- a/arch/parisc/include/asm/uaccess.h
7340+++ b/arch/parisc/include/asm/uaccess.h
7341@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7342 const void __user *from,
7343 unsigned long n)
7344 {
7345- int sz = __compiletime_object_size(to);
7346+ size_t sz = __compiletime_object_size(to);
7347 int ret = -EFAULT;
7348
7349- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7350+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7351 ret = __copy_from_user(to, from, n);
7352 else
7353 copy_from_user_overflow();
7354diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7355index 3c63a82..b1d6ee9 100644
7356--- a/arch/parisc/kernel/module.c
7357+++ b/arch/parisc/kernel/module.c
7358@@ -98,16 +98,38 @@
7359
7360 /* three functions to determine where in the module core
7361 * or init pieces the location is */
7362+static inline int in_init_rx(struct module *me, void *loc)
7363+{
7364+ return (loc >= me->module_init_rx &&
7365+ loc < (me->module_init_rx + me->init_size_rx));
7366+}
7367+
7368+static inline int in_init_rw(struct module *me, void *loc)
7369+{
7370+ return (loc >= me->module_init_rw &&
7371+ loc < (me->module_init_rw + me->init_size_rw));
7372+}
7373+
7374 static inline int in_init(struct module *me, void *loc)
7375 {
7376- return (loc >= me->module_init &&
7377- loc <= (me->module_init + me->init_size));
7378+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7379+}
7380+
7381+static inline int in_core_rx(struct module *me, void *loc)
7382+{
7383+ return (loc >= me->module_core_rx &&
7384+ loc < (me->module_core_rx + me->core_size_rx));
7385+}
7386+
7387+static inline int in_core_rw(struct module *me, void *loc)
7388+{
7389+ return (loc >= me->module_core_rw &&
7390+ loc < (me->module_core_rw + me->core_size_rw));
7391 }
7392
7393 static inline int in_core(struct module *me, void *loc)
7394 {
7395- return (loc >= me->module_core &&
7396- loc <= (me->module_core + me->core_size));
7397+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7398 }
7399
7400 static inline int in_local(struct module *me, void *loc)
7401@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7402 }
7403
7404 /* align things a bit */
7405- me->core_size = ALIGN(me->core_size, 16);
7406- me->arch.got_offset = me->core_size;
7407- me->core_size += gots * sizeof(struct got_entry);
7408+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7409+ me->arch.got_offset = me->core_size_rw;
7410+ me->core_size_rw += gots * sizeof(struct got_entry);
7411
7412- me->core_size = ALIGN(me->core_size, 16);
7413- me->arch.fdesc_offset = me->core_size;
7414- me->core_size += fdescs * sizeof(Elf_Fdesc);
7415+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7416+ me->arch.fdesc_offset = me->core_size_rw;
7417+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7418
7419 me->arch.got_max = gots;
7420 me->arch.fdesc_max = fdescs;
7421@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7422
7423 BUG_ON(value == 0);
7424
7425- got = me->module_core + me->arch.got_offset;
7426+ got = me->module_core_rw + me->arch.got_offset;
7427 for (i = 0; got[i].addr; i++)
7428 if (got[i].addr == value)
7429 goto out;
7430@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7431 #ifdef CONFIG_64BIT
7432 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7433 {
7434- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7435+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7436
7437 if (!value) {
7438 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7439@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7440
7441 /* Create new one */
7442 fdesc->addr = value;
7443- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7444+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7445 return (Elf_Addr)fdesc;
7446 }
7447 #endif /* CONFIG_64BIT */
7448@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7449
7450 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7451 end = table + sechdrs[me->arch.unwind_section].sh_size;
7452- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7453+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7454
7455 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7456 me->arch.unwind_section, table, end, gp);
7457diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7458index 5aba01a..47cdd5a 100644
7459--- a/arch/parisc/kernel/sys_parisc.c
7460+++ b/arch/parisc/kernel/sys_parisc.c
7461@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7462 unsigned long task_size = TASK_SIZE;
7463 int do_color_align, last_mmap;
7464 struct vm_unmapped_area_info info;
7465+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7466
7467 if (len > task_size)
7468 return -ENOMEM;
7469@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7470 goto found_addr;
7471 }
7472
7473+#ifdef CONFIG_PAX_RANDMMAP
7474+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7475+#endif
7476+
7477 if (addr) {
7478 if (do_color_align && last_mmap)
7479 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7480@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7481 info.high_limit = mmap_upper_limit();
7482 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7483 info.align_offset = shared_align_offset(last_mmap, pgoff);
7484+ info.threadstack_offset = offset;
7485 addr = vm_unmapped_area(&info);
7486
7487 found_addr:
7488@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7489 unsigned long addr = addr0;
7490 int do_color_align, last_mmap;
7491 struct vm_unmapped_area_info info;
7492+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7493
7494 #ifdef CONFIG_64BIT
7495 /* This should only ever run for 32-bit processes. */
7496@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7497 }
7498
7499 /* requesting a specific address */
7500+#ifdef CONFIG_PAX_RANDMMAP
7501+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7502+#endif
7503+
7504 if (addr) {
7505 if (do_color_align && last_mmap)
7506 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7507@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7508 info.high_limit = mm->mmap_base;
7509 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7510 info.align_offset = shared_align_offset(last_mmap, pgoff);
7511+ info.threadstack_offset = offset;
7512 addr = vm_unmapped_area(&info);
7513 if (!(addr & ~PAGE_MASK))
7514 goto found_addr;
7515@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7516 mm->mmap_legacy_base = mmap_legacy_base();
7517 mm->mmap_base = mmap_upper_limit();
7518
7519+#ifdef CONFIG_PAX_RANDMMAP
7520+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7521+ mm->mmap_legacy_base += mm->delta_mmap;
7522+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7523+ }
7524+#endif
7525+
7526 if (mmap_is_legacy()) {
7527 mm->mmap_base = mm->mmap_legacy_base;
7528 mm->get_unmapped_area = arch_get_unmapped_area;
7529diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7530index 7f67c4c..d85c11d 100644
7531--- a/arch/parisc/kernel/traps.c
7532+++ b/arch/parisc/kernel/traps.c
7533@@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7534
7535 down_read(&current->mm->mmap_sem);
7536 vma = find_vma(current->mm,regs->iaoq[0]);
7537- if (vma && (regs->iaoq[0] >= vma->vm_start)
7538- && (vma->vm_flags & VM_EXEC)) {
7539-
7540+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7541 fault_address = regs->iaoq[0];
7542 fault_space = regs->iasq[0];
7543
7544diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7545index e5120e6..8ddb5cc 100644
7546--- a/arch/parisc/mm/fault.c
7547+++ b/arch/parisc/mm/fault.c
7548@@ -15,6 +15,7 @@
7549 #include <linux/sched.h>
7550 #include <linux/interrupt.h>
7551 #include <linux/module.h>
7552+#include <linux/unistd.h>
7553
7554 #include <asm/uaccess.h>
7555 #include <asm/traps.h>
7556@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7557 static unsigned long
7558 parisc_acctyp(unsigned long code, unsigned int inst)
7559 {
7560- if (code == 6 || code == 16)
7561+ if (code == 6 || code == 7 || code == 16)
7562 return VM_EXEC;
7563
7564 switch (inst & 0xf0000000) {
7565@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7566 }
7567 #endif
7568
7569+#ifdef CONFIG_PAX_PAGEEXEC
7570+/*
7571+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7572+ *
7573+ * returns 1 when task should be killed
7574+ * 2 when rt_sigreturn trampoline was detected
7575+ * 3 when unpatched PLT trampoline was detected
7576+ */
7577+static int pax_handle_fetch_fault(struct pt_regs *regs)
7578+{
7579+
7580+#ifdef CONFIG_PAX_EMUPLT
7581+ int err;
7582+
7583+ do { /* PaX: unpatched PLT emulation */
7584+ unsigned int bl, depwi;
7585+
7586+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7587+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7588+
7589+ if (err)
7590+ break;
7591+
7592+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7593+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7594+
7595+ err = get_user(ldw, (unsigned int *)addr);
7596+ err |= get_user(bv, (unsigned int *)(addr+4));
7597+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7598+
7599+ if (err)
7600+ break;
7601+
7602+ if (ldw == 0x0E801096U &&
7603+ bv == 0xEAC0C000U &&
7604+ ldw2 == 0x0E881095U)
7605+ {
7606+ unsigned int resolver, map;
7607+
7608+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7609+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7610+ if (err)
7611+ break;
7612+
7613+ regs->gr[20] = instruction_pointer(regs)+8;
7614+ regs->gr[21] = map;
7615+ regs->gr[22] = resolver;
7616+ regs->iaoq[0] = resolver | 3UL;
7617+ regs->iaoq[1] = regs->iaoq[0] + 4;
7618+ return 3;
7619+ }
7620+ }
7621+ } while (0);
7622+#endif
7623+
7624+#ifdef CONFIG_PAX_EMUTRAMP
7625+
7626+#ifndef CONFIG_PAX_EMUSIGRT
7627+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7628+ return 1;
7629+#endif
7630+
7631+ do { /* PaX: rt_sigreturn emulation */
7632+ unsigned int ldi1, ldi2, bel, nop;
7633+
7634+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7635+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7636+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7637+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7638+
7639+ if (err)
7640+ break;
7641+
7642+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7643+ ldi2 == 0x3414015AU &&
7644+ bel == 0xE4008200U &&
7645+ nop == 0x08000240U)
7646+ {
7647+ regs->gr[25] = (ldi1 & 2) >> 1;
7648+ regs->gr[20] = __NR_rt_sigreturn;
7649+ regs->gr[31] = regs->iaoq[1] + 16;
7650+ regs->sr[0] = regs->iasq[1];
7651+ regs->iaoq[0] = 0x100UL;
7652+ regs->iaoq[1] = regs->iaoq[0] + 4;
7653+ regs->iasq[0] = regs->sr[2];
7654+ regs->iasq[1] = regs->sr[2];
7655+ return 2;
7656+ }
7657+ } while (0);
7658+#endif
7659+
7660+ return 1;
7661+}
7662+
7663+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7664+{
7665+ unsigned long i;
7666+
7667+ printk(KERN_ERR "PAX: bytes at PC: ");
7668+ for (i = 0; i < 5; i++) {
7669+ unsigned int c;
7670+ if (get_user(c, (unsigned int *)pc+i))
7671+ printk(KERN_CONT "???????? ");
7672+ else
7673+ printk(KERN_CONT "%08x ", c);
7674+ }
7675+ printk("\n");
7676+}
7677+#endif
7678+
7679 int fixup_exception(struct pt_regs *regs)
7680 {
7681 const struct exception_table_entry *fix;
7682@@ -234,8 +345,33 @@ retry:
7683
7684 good_area:
7685
7686- if ((vma->vm_flags & acc_type) != acc_type)
7687+ if ((vma->vm_flags & acc_type) != acc_type) {
7688+
7689+#ifdef CONFIG_PAX_PAGEEXEC
7690+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7691+ (address & ~3UL) == instruction_pointer(regs))
7692+ {
7693+ up_read(&mm->mmap_sem);
7694+ switch (pax_handle_fetch_fault(regs)) {
7695+
7696+#ifdef CONFIG_PAX_EMUPLT
7697+ case 3:
7698+ return;
7699+#endif
7700+
7701+#ifdef CONFIG_PAX_EMUTRAMP
7702+ case 2:
7703+ return;
7704+#endif
7705+
7706+ }
7707+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7708+ do_group_exit(SIGKILL);
7709+ }
7710+#endif
7711+
7712 goto bad_area;
7713+ }
7714
7715 /*
7716 * If for any reason at all we couldn't handle the fault, make
7717diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7718index 190cc48..48439ce 100644
7719--- a/arch/powerpc/Kconfig
7720+++ b/arch/powerpc/Kconfig
7721@@ -413,6 +413,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7722 config KEXEC
7723 bool "kexec system call"
7724 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7725+ depends on !GRKERNSEC_KMEM
7726 help
7727 kexec is a system call that implements the ability to shutdown your
7728 current kernel, and to start another kernel. It is like a reboot
7729diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7730index 512d278..d31fadd 100644
7731--- a/arch/powerpc/include/asm/atomic.h
7732+++ b/arch/powerpc/include/asm/atomic.h
7733@@ -12,6 +12,11 @@
7734
7735 #define ATOMIC_INIT(i) { (i) }
7736
7737+#define _ASM_EXTABLE(from, to) \
7738+" .section __ex_table,\"a\"\n" \
7739+ PPC_LONG" " #from ", " #to"\n" \
7740+" .previous\n"
7741+
7742 static __inline__ int atomic_read(const atomic_t *v)
7743 {
7744 int t;
7745@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7746 return t;
7747 }
7748
7749+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7750+{
7751+ int t;
7752+
7753+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7754+
7755+ return t;
7756+}
7757+
7758 static __inline__ void atomic_set(atomic_t *v, int i)
7759 {
7760 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7761 }
7762
7763-#define ATOMIC_OP(op, asm_op) \
7764-static __inline__ void atomic_##op(int a, atomic_t *v) \
7765+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7766+{
7767+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7768+}
7769+
7770+#ifdef CONFIG_PAX_REFCOUNT
7771+#define __REFCOUNT_OP(op) op##o.
7772+#define __OVERFLOW_PRE \
7773+ " mcrxr cr0\n"
7774+#define __OVERFLOW_POST \
7775+ " bf 4*cr0+so, 3f\n" \
7776+ "2: .long 0x00c00b00\n" \
7777+ "3:\n"
7778+#define __OVERFLOW_EXTABLE \
7779+ "\n4:\n"
7780+ _ASM_EXTABLE(2b, 4b)
7781+#else
7782+#define __REFCOUNT_OP(op) op
7783+#define __OVERFLOW_PRE
7784+#define __OVERFLOW_POST
7785+#define __OVERFLOW_EXTABLE
7786+#endif
7787+
7788+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7789+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7790 { \
7791 int t; \
7792 \
7793 __asm__ __volatile__( \
7794-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7795+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7796+ pre_op \
7797 #asm_op " %0,%2,%0\n" \
7798+ post_op \
7799 PPC405_ERR77(0,%3) \
7800 " stwcx. %0,0,%3 \n" \
7801 " bne- 1b\n" \
7802+ extable \
7803 : "=&r" (t), "+m" (v->counter) \
7804 : "r" (a), "r" (&v->counter) \
7805 : "cc"); \
7806 } \
7807
7808-#define ATOMIC_OP_RETURN(op, asm_op) \
7809-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7810+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7811+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7812+
7813+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7814+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7815 { \
7816 int t; \
7817 \
7818 __asm__ __volatile__( \
7819 PPC_ATOMIC_ENTRY_BARRIER \
7820-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7821+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7822+ pre_op \
7823 #asm_op " %0,%1,%0\n" \
7824+ post_op \
7825 PPC405_ERR77(0,%2) \
7826 " stwcx. %0,0,%2 \n" \
7827 " bne- 1b\n" \
7828+ extable \
7829 PPC_ATOMIC_EXIT_BARRIER \
7830 : "=&r" (t) \
7831 : "r" (a), "r" (&v->counter) \
7832@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7833 return t; \
7834 }
7835
7836+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7837+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7838+
7839 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7840
7841 ATOMIC_OPS(add, add)
7842@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7843
7844 #undef ATOMIC_OPS
7845 #undef ATOMIC_OP_RETURN
7846+#undef __ATOMIC_OP_RETURN
7847 #undef ATOMIC_OP
7848+#undef __ATOMIC_OP
7849
7850 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7851
7852-static __inline__ void atomic_inc(atomic_t *v)
7853-{
7854- int t;
7855+/*
7856+ * atomic_inc - increment atomic variable
7857+ * @v: pointer of type atomic_t
7858+ *
7859+ * Automatically increments @v by 1
7860+ */
7861+#define atomic_inc(v) atomic_add(1, (v))
7862+#define atomic_inc_return(v) atomic_add_return(1, (v))
7863
7864- __asm__ __volatile__(
7865-"1: lwarx %0,0,%2 # atomic_inc\n\
7866- addic %0,%0,1\n"
7867- PPC405_ERR77(0,%2)
7868-" stwcx. %0,0,%2 \n\
7869- bne- 1b"
7870- : "=&r" (t), "+m" (v->counter)
7871- : "r" (&v->counter)
7872- : "cc", "xer");
7873+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7874+{
7875+ atomic_add_unchecked(1, v);
7876 }
7877
7878-static __inline__ int atomic_inc_return(atomic_t *v)
7879+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7880 {
7881- int t;
7882-
7883- __asm__ __volatile__(
7884- PPC_ATOMIC_ENTRY_BARRIER
7885-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7886- addic %0,%0,1\n"
7887- PPC405_ERR77(0,%1)
7888-" stwcx. %0,0,%1 \n\
7889- bne- 1b"
7890- PPC_ATOMIC_EXIT_BARRIER
7891- : "=&r" (t)
7892- : "r" (&v->counter)
7893- : "cc", "xer", "memory");
7894-
7895- return t;
7896+ return atomic_add_return_unchecked(1, v);
7897 }
7898
7899 /*
7900@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7901 */
7902 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7903
7904-static __inline__ void atomic_dec(atomic_t *v)
7905+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7906 {
7907- int t;
7908-
7909- __asm__ __volatile__(
7910-"1: lwarx %0,0,%2 # atomic_dec\n\
7911- addic %0,%0,-1\n"
7912- PPC405_ERR77(0,%2)\
7913-" stwcx. %0,0,%2\n\
7914- bne- 1b"
7915- : "=&r" (t), "+m" (v->counter)
7916- : "r" (&v->counter)
7917- : "cc", "xer");
7918+ return atomic_add_return_unchecked(1, v) == 0;
7919 }
7920
7921-static __inline__ int atomic_dec_return(atomic_t *v)
7922+/*
7923+ * atomic_dec - decrement atomic variable
7924+ * @v: pointer of type atomic_t
7925+ *
7926+ * Atomically decrements @v by 1
7927+ */
7928+#define atomic_dec(v) atomic_sub(1, (v))
7929+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7930+
7931+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7932 {
7933- int t;
7934-
7935- __asm__ __volatile__(
7936- PPC_ATOMIC_ENTRY_BARRIER
7937-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7938- addic %0,%0,-1\n"
7939- PPC405_ERR77(0,%1)
7940-" stwcx. %0,0,%1\n\
7941- bne- 1b"
7942- PPC_ATOMIC_EXIT_BARRIER
7943- : "=&r" (t)
7944- : "r" (&v->counter)
7945- : "cc", "xer", "memory");
7946-
7947- return t;
7948+ atomic_sub_unchecked(1, v);
7949 }
7950
7951 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7952 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7953
7954+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7955+{
7956+ return cmpxchg(&(v->counter), old, new);
7957+}
7958+
7959+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7960+{
7961+ return xchg(&(v->counter), new);
7962+}
7963+
7964 /**
7965 * __atomic_add_unless - add unless the number is a given value
7966 * @v: pointer of type atomic_t
7967@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7968 PPC_ATOMIC_ENTRY_BARRIER
7969 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7970 cmpw 0,%0,%3 \n\
7971- beq- 2f \n\
7972- add %0,%2,%0 \n"
7973+ beq- 2f \n"
7974+
7975+#ifdef CONFIG_PAX_REFCOUNT
7976+" mcrxr cr0\n"
7977+" addo. %0,%2,%0\n"
7978+" bf 4*cr0+so, 4f\n"
7979+"3:.long " "0x00c00b00""\n"
7980+"4:\n"
7981+#else
7982+ "add %0,%2,%0 \n"
7983+#endif
7984+
7985 PPC405_ERR77(0,%2)
7986 " stwcx. %0,0,%1 \n\
7987 bne- 1b \n"
7988+"5:"
7989+
7990+#ifdef CONFIG_PAX_REFCOUNT
7991+ _ASM_EXTABLE(3b, 5b)
7992+#endif
7993+
7994 PPC_ATOMIC_EXIT_BARRIER
7995 " subf %0,%2,%0 \n\
7996 2:"
7997@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7998 }
7999 #define atomic_dec_if_positive atomic_dec_if_positive
8000
8001+#define smp_mb__before_atomic_dec() smp_mb()
8002+#define smp_mb__after_atomic_dec() smp_mb()
8003+#define smp_mb__before_atomic_inc() smp_mb()
8004+#define smp_mb__after_atomic_inc() smp_mb()
8005+
8006 #ifdef __powerpc64__
8007
8008 #define ATOMIC64_INIT(i) { (i) }
8009@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8010 return t;
8011 }
8012
8013+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8014+{
8015+ long t;
8016+
8017+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8018+
8019+ return t;
8020+}
8021+
8022 static __inline__ void atomic64_set(atomic64_t *v, long i)
8023 {
8024 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8025 }
8026
8027-#define ATOMIC64_OP(op, asm_op) \
8028-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8029+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8030+{
8031+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8032+}
8033+
8034+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8035+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8036 { \
8037 long t; \
8038 \
8039 __asm__ __volatile__( \
8040 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8041+ pre_op \
8042 #asm_op " %0,%2,%0\n" \
8043+ post_op \
8044 " stdcx. %0,0,%3 \n" \
8045 " bne- 1b\n" \
8046+ extable \
8047 : "=&r" (t), "+m" (v->counter) \
8048 : "r" (a), "r" (&v->counter) \
8049 : "cc"); \
8050 }
8051
8052-#define ATOMIC64_OP_RETURN(op, asm_op) \
8053-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8054+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8055+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8056+
8057+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8058+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8059 { \
8060 long t; \
8061 \
8062 __asm__ __volatile__( \
8063 PPC_ATOMIC_ENTRY_BARRIER \
8064 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8065+ pre_op \
8066 #asm_op " %0,%1,%0\n" \
8067+ post_op \
8068 " stdcx. %0,0,%2 \n" \
8069 " bne- 1b\n" \
8070+ extable \
8071 PPC_ATOMIC_EXIT_BARRIER \
8072 : "=&r" (t) \
8073 : "r" (a), "r" (&v->counter) \
8074@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8075 return t; \
8076 }
8077
8078+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8079+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8080+
8081 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8082
8083 ATOMIC64_OPS(add, add)
8084@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8085
8086 #undef ATOMIC64_OPS
8087 #undef ATOMIC64_OP_RETURN
8088+#undef __ATOMIC64_OP_RETURN
8089 #undef ATOMIC64_OP
8090+#undef __ATOMIC64_OP
8091+#undef __OVERFLOW_EXTABLE
8092+#undef __OVERFLOW_POST
8093+#undef __OVERFLOW_PRE
8094+#undef __REFCOUNT_OP
8095
8096 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8097
8098-static __inline__ void atomic64_inc(atomic64_t *v)
8099-{
8100- long t;
8101+/*
8102+ * atomic64_inc - increment atomic variable
8103+ * @v: pointer of type atomic64_t
8104+ *
8105+ * Automatically increments @v by 1
8106+ */
8107+#define atomic64_inc(v) atomic64_add(1, (v))
8108+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8109
8110- __asm__ __volatile__(
8111-"1: ldarx %0,0,%2 # atomic64_inc\n\
8112- addic %0,%0,1\n\
8113- stdcx. %0,0,%2 \n\
8114- bne- 1b"
8115- : "=&r" (t), "+m" (v->counter)
8116- : "r" (&v->counter)
8117- : "cc", "xer");
8118+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8119+{
8120+ atomic64_add_unchecked(1, v);
8121 }
8122
8123-static __inline__ long atomic64_inc_return(atomic64_t *v)
8124+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8125 {
8126- long t;
8127-
8128- __asm__ __volatile__(
8129- PPC_ATOMIC_ENTRY_BARRIER
8130-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8131- addic %0,%0,1\n\
8132- stdcx. %0,0,%1 \n\
8133- bne- 1b"
8134- PPC_ATOMIC_EXIT_BARRIER
8135- : "=&r" (t)
8136- : "r" (&v->counter)
8137- : "cc", "xer", "memory");
8138-
8139- return t;
8140+ return atomic64_add_return_unchecked(1, v);
8141 }
8142
8143 /*
8144@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8145 */
8146 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8147
8148-static __inline__ void atomic64_dec(atomic64_t *v)
8149+/*
8150+ * atomic64_dec - decrement atomic variable
8151+ * @v: pointer of type atomic64_t
8152+ *
8153+ * Atomically decrements @v by 1
8154+ */
8155+#define atomic64_dec(v) atomic64_sub(1, (v))
8156+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8157+
8158+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8159 {
8160- long t;
8161-
8162- __asm__ __volatile__(
8163-"1: ldarx %0,0,%2 # atomic64_dec\n\
8164- addic %0,%0,-1\n\
8165- stdcx. %0,0,%2\n\
8166- bne- 1b"
8167- : "=&r" (t), "+m" (v->counter)
8168- : "r" (&v->counter)
8169- : "cc", "xer");
8170-}
8171-
8172-static __inline__ long atomic64_dec_return(atomic64_t *v)
8173-{
8174- long t;
8175-
8176- __asm__ __volatile__(
8177- PPC_ATOMIC_ENTRY_BARRIER
8178-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8179- addic %0,%0,-1\n\
8180- stdcx. %0,0,%1\n\
8181- bne- 1b"
8182- PPC_ATOMIC_EXIT_BARRIER
8183- : "=&r" (t)
8184- : "r" (&v->counter)
8185- : "cc", "xer", "memory");
8186-
8187- return t;
8188+ atomic64_sub_unchecked(1, v);
8189 }
8190
8191 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8192@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8193 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8194 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8195
8196+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8197+{
8198+ return cmpxchg(&(v->counter), old, new);
8199+}
8200+
8201+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8202+{
8203+ return xchg(&(v->counter), new);
8204+}
8205+
8206 /**
8207 * atomic64_add_unless - add unless the number is a given value
8208 * @v: pointer of type atomic64_t
8209@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8210
8211 __asm__ __volatile__ (
8212 PPC_ATOMIC_ENTRY_BARRIER
8213-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8214+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8215 cmpd 0,%0,%3 \n\
8216- beq- 2f \n\
8217- add %0,%2,%0 \n"
8218+ beq- 2f \n"
8219+
8220+#ifdef CONFIG_PAX_REFCOUNT
8221+" mcrxr cr0\n"
8222+" addo. %0,%2,%0\n"
8223+" bf 4*cr0+so, 4f\n"
8224+"3:.long " "0x00c00b00""\n"
8225+"4:\n"
8226+#else
8227+ "add %0,%2,%0 \n"
8228+#endif
8229+
8230 " stdcx. %0,0,%1 \n\
8231 bne- 1b \n"
8232 PPC_ATOMIC_EXIT_BARRIER
8233+"5:"
8234+
8235+#ifdef CONFIG_PAX_REFCOUNT
8236+ _ASM_EXTABLE(3b, 5b)
8237+#endif
8238+
8239 " subf %0,%2,%0 \n\
8240 2:"
8241 : "=&r" (t)
8242diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8243index a3bf5be..e03ba81 100644
8244--- a/arch/powerpc/include/asm/barrier.h
8245+++ b/arch/powerpc/include/asm/barrier.h
8246@@ -76,7 +76,7 @@
8247 do { \
8248 compiletime_assert_atomic_type(*p); \
8249 smp_lwsync(); \
8250- ACCESS_ONCE(*p) = (v); \
8251+ ACCESS_ONCE_RW(*p) = (v); \
8252 } while (0)
8253
8254 #define smp_load_acquire(p) \
8255diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8256index 0dc42c5..b80a3a1 100644
8257--- a/arch/powerpc/include/asm/cache.h
8258+++ b/arch/powerpc/include/asm/cache.h
8259@@ -4,6 +4,7 @@
8260 #ifdef __KERNEL__
8261
8262 #include <asm/reg.h>
8263+#include <linux/const.h>
8264
8265 /* bytes per L1 cache line */
8266 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8267@@ -23,7 +24,7 @@
8268 #define L1_CACHE_SHIFT 7
8269 #endif
8270
8271-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8272+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8273
8274 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8275
8276diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8277index ee46ffe..b36c98c 100644
8278--- a/arch/powerpc/include/asm/elf.h
8279+++ b/arch/powerpc/include/asm/elf.h
8280@@ -30,6 +30,18 @@
8281
8282 #define ELF_ET_DYN_BASE 0x20000000
8283
8284+#ifdef CONFIG_PAX_ASLR
8285+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8286+
8287+#ifdef __powerpc64__
8288+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8289+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8290+#else
8291+#define PAX_DELTA_MMAP_LEN 15
8292+#define PAX_DELTA_STACK_LEN 15
8293+#endif
8294+#endif
8295+
8296 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8297
8298 /*
8299diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8300index 8196e9c..d83a9f3 100644
8301--- a/arch/powerpc/include/asm/exec.h
8302+++ b/arch/powerpc/include/asm/exec.h
8303@@ -4,6 +4,6 @@
8304 #ifndef _ASM_POWERPC_EXEC_H
8305 #define _ASM_POWERPC_EXEC_H
8306
8307-extern unsigned long arch_align_stack(unsigned long sp);
8308+#define arch_align_stack(x) ((x) & ~0xfUL)
8309
8310 #endif /* _ASM_POWERPC_EXEC_H */
8311diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8312index 5acabbd..7ea14fa 100644
8313--- a/arch/powerpc/include/asm/kmap_types.h
8314+++ b/arch/powerpc/include/asm/kmap_types.h
8315@@ -10,7 +10,7 @@
8316 * 2 of the License, or (at your option) any later version.
8317 */
8318
8319-#define KM_TYPE_NR 16
8320+#define KM_TYPE_NR 17
8321
8322 #endif /* __KERNEL__ */
8323 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8324diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8325index b8da913..c02b593 100644
8326--- a/arch/powerpc/include/asm/local.h
8327+++ b/arch/powerpc/include/asm/local.h
8328@@ -9,21 +9,65 @@ typedef struct
8329 atomic_long_t a;
8330 } local_t;
8331
8332+typedef struct
8333+{
8334+ atomic_long_unchecked_t a;
8335+} local_unchecked_t;
8336+
8337 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8338
8339 #define local_read(l) atomic_long_read(&(l)->a)
8340+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8341 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8342+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8343
8344 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8345+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8346 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8347+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8348 #define local_inc(l) atomic_long_inc(&(l)->a)
8349+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8350 #define local_dec(l) atomic_long_dec(&(l)->a)
8351+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8352
8353 static __inline__ long local_add_return(long a, local_t *l)
8354 {
8355 long t;
8356
8357 __asm__ __volatile__(
8358+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8359+
8360+#ifdef CONFIG_PAX_REFCOUNT
8361+" mcrxr cr0\n"
8362+" addo. %0,%1,%0\n"
8363+" bf 4*cr0+so, 3f\n"
8364+"2:.long " "0x00c00b00""\n"
8365+#else
8366+" add %0,%1,%0\n"
8367+#endif
8368+
8369+"3:\n"
8370+ PPC405_ERR77(0,%2)
8371+ PPC_STLCX "%0,0,%2 \n\
8372+ bne- 1b"
8373+
8374+#ifdef CONFIG_PAX_REFCOUNT
8375+"\n4:\n"
8376+ _ASM_EXTABLE(2b, 4b)
8377+#endif
8378+
8379+ : "=&r" (t)
8380+ : "r" (a), "r" (&(l->a.counter))
8381+ : "cc", "memory");
8382+
8383+ return t;
8384+}
8385+
8386+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8387+{
8388+ long t;
8389+
8390+ __asm__ __volatile__(
8391 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8392 add %0,%1,%0\n"
8393 PPC405_ERR77(0,%2)
8394@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8395
8396 #define local_cmpxchg(l, o, n) \
8397 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8398+#define local_cmpxchg_unchecked(l, o, n) \
8399+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8400 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8401
8402 /**
8403diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8404index 8565c25..2865190 100644
8405--- a/arch/powerpc/include/asm/mman.h
8406+++ b/arch/powerpc/include/asm/mman.h
8407@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8408 }
8409 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8410
8411-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8412+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8413 {
8414 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8415 }
8416diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8417index 69c0598..2c56964 100644
8418--- a/arch/powerpc/include/asm/page.h
8419+++ b/arch/powerpc/include/asm/page.h
8420@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8421 * and needs to be executable. This means the whole heap ends
8422 * up being executable.
8423 */
8424-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8425- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8426+#define VM_DATA_DEFAULT_FLAGS32 \
8427+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8428+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8429
8430 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8431 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8432@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8433 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8434 #endif
8435
8436+#define ktla_ktva(addr) (addr)
8437+#define ktva_ktla(addr) (addr)
8438+
8439 #ifndef CONFIG_PPC_BOOK3S_64
8440 /*
8441 * Use the top bit of the higher-level page table entries to indicate whether
8442diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8443index d908a46..3753f71 100644
8444--- a/arch/powerpc/include/asm/page_64.h
8445+++ b/arch/powerpc/include/asm/page_64.h
8446@@ -172,15 +172,18 @@ do { \
8447 * stack by default, so in the absence of a PT_GNU_STACK program header
8448 * we turn execute permission off.
8449 */
8450-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8451- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8452+#define VM_STACK_DEFAULT_FLAGS32 \
8453+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8454+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8455
8456 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8457 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8458
8459+#ifndef CONFIG_PAX_PAGEEXEC
8460 #define VM_STACK_DEFAULT_FLAGS \
8461 (is_32bit_task() ? \
8462 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8463+#endif
8464
8465 #include <asm-generic/getorder.h>
8466
8467diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8468index 4b0be20..c15a27d 100644
8469--- a/arch/powerpc/include/asm/pgalloc-64.h
8470+++ b/arch/powerpc/include/asm/pgalloc-64.h
8471@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8472 #ifndef CONFIG_PPC_64K_PAGES
8473
8474 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8475+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8476
8477 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8478 {
8479@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8480 pud_set(pud, (unsigned long)pmd);
8481 }
8482
8483+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8484+{
8485+ pud_populate(mm, pud, pmd);
8486+}
8487+
8488 #define pmd_populate(mm, pmd, pte_page) \
8489 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8490 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8491@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8492 #endif
8493
8494 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8495+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8496
8497 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8498 pte_t *pte)
8499diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8500index 11a3863..108f194 100644
8501--- a/arch/powerpc/include/asm/pgtable.h
8502+++ b/arch/powerpc/include/asm/pgtable.h
8503@@ -2,6 +2,7 @@
8504 #define _ASM_POWERPC_PGTABLE_H
8505 #ifdef __KERNEL__
8506
8507+#include <linux/const.h>
8508 #ifndef __ASSEMBLY__
8509 #include <linux/mmdebug.h>
8510 #include <linux/mmzone.h>
8511diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8512index 62cfb0c..50c6402 100644
8513--- a/arch/powerpc/include/asm/pte-hash32.h
8514+++ b/arch/powerpc/include/asm/pte-hash32.h
8515@@ -20,6 +20,7 @@
8516 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8517 #define _PAGE_USER 0x004 /* usermode access allowed */
8518 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8519+#define _PAGE_EXEC _PAGE_GUARDED
8520 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8521 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8522 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8523diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8524index af56b5c..f86f3f6 100644
8525--- a/arch/powerpc/include/asm/reg.h
8526+++ b/arch/powerpc/include/asm/reg.h
8527@@ -253,6 +253,7 @@
8528 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8529 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8530 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8531+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8532 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8533 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8534 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8535diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8536index 825663c..f9e9134 100644
8537--- a/arch/powerpc/include/asm/smp.h
8538+++ b/arch/powerpc/include/asm/smp.h
8539@@ -51,7 +51,7 @@ struct smp_ops_t {
8540 int (*cpu_disable)(void);
8541 void (*cpu_die)(unsigned int nr);
8542 int (*cpu_bootable)(unsigned int nr);
8543-};
8544+} __no_const;
8545
8546 extern void smp_send_debugger_break(void);
8547 extern void start_secondary_resume(void);
8548diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8549index 4dbe072..b803275 100644
8550--- a/arch/powerpc/include/asm/spinlock.h
8551+++ b/arch/powerpc/include/asm/spinlock.h
8552@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8553 __asm__ __volatile__(
8554 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8555 __DO_SIGN_EXTEND
8556-" addic. %0,%0,1\n\
8557- ble- 2f\n"
8558+
8559+#ifdef CONFIG_PAX_REFCOUNT
8560+" mcrxr cr0\n"
8561+" addico. %0,%0,1\n"
8562+" bf 4*cr0+so, 3f\n"
8563+"2:.long " "0x00c00b00""\n"
8564+#else
8565+" addic. %0,%0,1\n"
8566+#endif
8567+
8568+"3:\n"
8569+ "ble- 4f\n"
8570 PPC405_ERR77(0,%1)
8571 " stwcx. %0,0,%1\n\
8572 bne- 1b\n"
8573 PPC_ACQUIRE_BARRIER
8574-"2:" : "=&r" (tmp)
8575+"4:"
8576+
8577+#ifdef CONFIG_PAX_REFCOUNT
8578+ _ASM_EXTABLE(2b,4b)
8579+#endif
8580+
8581+ : "=&r" (tmp)
8582 : "r" (&rw->lock)
8583 : "cr0", "xer", "memory");
8584
8585@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8586 __asm__ __volatile__(
8587 "# read_unlock\n\t"
8588 PPC_RELEASE_BARRIER
8589-"1: lwarx %0,0,%1\n\
8590- addic %0,%0,-1\n"
8591+"1: lwarx %0,0,%1\n"
8592+
8593+#ifdef CONFIG_PAX_REFCOUNT
8594+" mcrxr cr0\n"
8595+" addico. %0,%0,-1\n"
8596+" bf 4*cr0+so, 3f\n"
8597+"2:.long " "0x00c00b00""\n"
8598+#else
8599+" addic. %0,%0,-1\n"
8600+#endif
8601+
8602+"3:\n"
8603 PPC405_ERR77(0,%1)
8604 " stwcx. %0,0,%1\n\
8605 bne- 1b"
8606+
8607+#ifdef CONFIG_PAX_REFCOUNT
8608+"\n4:\n"
8609+ _ASM_EXTABLE(2b, 4b)
8610+#endif
8611+
8612 : "=&r"(tmp)
8613 : "r"(&rw->lock)
8614 : "cr0", "xer", "memory");
8615diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8616index 7efee4a..48d47cc 100644
8617--- a/arch/powerpc/include/asm/thread_info.h
8618+++ b/arch/powerpc/include/asm/thread_info.h
8619@@ -101,6 +101,8 @@ static inline struct thread_info *current_thread_info(void)
8620 #if defined(CONFIG_PPC64)
8621 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8622 #endif
8623+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8624+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8625
8626 /* as above, but as bit values */
8627 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8628@@ -119,9 +121,10 @@ static inline struct thread_info *current_thread_info(void)
8629 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8630 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8631 #define _TIF_NOHZ (1<<TIF_NOHZ)
8632+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8633 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8634 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8635- _TIF_NOHZ)
8636+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8637
8638 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8639 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8640diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8641index a0c071d..49cdc7f 100644
8642--- a/arch/powerpc/include/asm/uaccess.h
8643+++ b/arch/powerpc/include/asm/uaccess.h
8644@@ -58,6 +58,7 @@
8645
8646 #endif
8647
8648+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8649 #define access_ok(type, addr, size) \
8650 (__chk_user_ptr(addr), \
8651 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8652@@ -318,52 +319,6 @@ do { \
8653 extern unsigned long __copy_tofrom_user(void __user *to,
8654 const void __user *from, unsigned long size);
8655
8656-#ifndef __powerpc64__
8657-
8658-static inline unsigned long copy_from_user(void *to,
8659- const void __user *from, unsigned long n)
8660-{
8661- unsigned long over;
8662-
8663- if (access_ok(VERIFY_READ, from, n))
8664- return __copy_tofrom_user((__force void __user *)to, from, n);
8665- if ((unsigned long)from < TASK_SIZE) {
8666- over = (unsigned long)from + n - TASK_SIZE;
8667- return __copy_tofrom_user((__force void __user *)to, from,
8668- n - over) + over;
8669- }
8670- return n;
8671-}
8672-
8673-static inline unsigned long copy_to_user(void __user *to,
8674- const void *from, unsigned long n)
8675-{
8676- unsigned long over;
8677-
8678- if (access_ok(VERIFY_WRITE, to, n))
8679- return __copy_tofrom_user(to, (__force void __user *)from, n);
8680- if ((unsigned long)to < TASK_SIZE) {
8681- over = (unsigned long)to + n - TASK_SIZE;
8682- return __copy_tofrom_user(to, (__force void __user *)from,
8683- n - over) + over;
8684- }
8685- return n;
8686-}
8687-
8688-#else /* __powerpc64__ */
8689-
8690-#define __copy_in_user(to, from, size) \
8691- __copy_tofrom_user((to), (from), (size))
8692-
8693-extern unsigned long copy_from_user(void *to, const void __user *from,
8694- unsigned long n);
8695-extern unsigned long copy_to_user(void __user *to, const void *from,
8696- unsigned long n);
8697-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8698- unsigned long n);
8699-
8700-#endif /* __powerpc64__ */
8701-
8702 static inline unsigned long __copy_from_user_inatomic(void *to,
8703 const void __user *from, unsigned long n)
8704 {
8705@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8706 if (ret == 0)
8707 return 0;
8708 }
8709+
8710+ if (!__builtin_constant_p(n))
8711+ check_object_size(to, n, false);
8712+
8713 return __copy_tofrom_user((__force void __user *)to, from, n);
8714 }
8715
8716@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8717 if (ret == 0)
8718 return 0;
8719 }
8720+
8721+ if (!__builtin_constant_p(n))
8722+ check_object_size(from, n, true);
8723+
8724 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8725 }
8726
8727@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8728 return __copy_to_user_inatomic(to, from, size);
8729 }
8730
8731+#ifndef __powerpc64__
8732+
8733+static inline unsigned long __must_check copy_from_user(void *to,
8734+ const void __user *from, unsigned long n)
8735+{
8736+ unsigned long over;
8737+
8738+ if ((long)n < 0)
8739+ return n;
8740+
8741+ if (access_ok(VERIFY_READ, from, n)) {
8742+ if (!__builtin_constant_p(n))
8743+ check_object_size(to, n, false);
8744+ return __copy_tofrom_user((__force void __user *)to, from, n);
8745+ }
8746+ if ((unsigned long)from < TASK_SIZE) {
8747+ over = (unsigned long)from + n - TASK_SIZE;
8748+ if (!__builtin_constant_p(n - over))
8749+ check_object_size(to, n - over, false);
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 __must_check copy_to_user(void __user *to,
8757+ const void *from, unsigned long n)
8758+{
8759+ unsigned long over;
8760+
8761+ if ((long)n < 0)
8762+ return n;
8763+
8764+ if (access_ok(VERIFY_WRITE, to, n)) {
8765+ if (!__builtin_constant_p(n))
8766+ check_object_size(from, n, true);
8767+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8768+ }
8769+ if ((unsigned long)to < TASK_SIZE) {
8770+ over = (unsigned long)to + n - TASK_SIZE;
8771+ if (!__builtin_constant_p(n))
8772+ check_object_size(from, n - over, true);
8773+ return __copy_tofrom_user(to, (__force void __user *)from,
8774+ n - over) + over;
8775+ }
8776+ return n;
8777+}
8778+
8779+#else /* __powerpc64__ */
8780+
8781+#define __copy_in_user(to, from, size) \
8782+ __copy_tofrom_user((to), (from), (size))
8783+
8784+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8785+{
8786+ if ((long)n < 0 || n > INT_MAX)
8787+ return n;
8788+
8789+ if (!__builtin_constant_p(n))
8790+ check_object_size(to, n, false);
8791+
8792+ if (likely(access_ok(VERIFY_READ, from, n)))
8793+ n = __copy_from_user(to, from, n);
8794+ else
8795+ memset(to, 0, n);
8796+ return n;
8797+}
8798+
8799+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8800+{
8801+ if ((long)n < 0 || n > INT_MAX)
8802+ return n;
8803+
8804+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8805+ if (!__builtin_constant_p(n))
8806+ check_object_size(from, n, true);
8807+ n = __copy_to_user(to, from, n);
8808+ }
8809+ return n;
8810+}
8811+
8812+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8813+ unsigned long n);
8814+
8815+#endif /* __powerpc64__ */
8816+
8817 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8818
8819 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8820diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8821index c1ebbda..fd8a98d 100644
8822--- a/arch/powerpc/kernel/Makefile
8823+++ b/arch/powerpc/kernel/Makefile
8824@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8825 CFLAGS_btext.o += -fPIC
8826 endif
8827
8828+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8829+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8830+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8831+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8832+
8833 ifdef CONFIG_FUNCTION_TRACER
8834 # Do not trace early boot code
8835 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8836@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8837 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8838 endif
8839
8840+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8841+
8842 obj-y := cputable.o ptrace.o syscalls.o \
8843 irq.o align.o signal_32.o pmc.o vdso.o \
8844 process.o systbl.o idle.o \
8845diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8846index 3e68d1c..72a5ee6 100644
8847--- a/arch/powerpc/kernel/exceptions-64e.S
8848+++ b/arch/powerpc/kernel/exceptions-64e.S
8849@@ -1010,6 +1010,7 @@ storage_fault_common:
8850 std r14,_DAR(r1)
8851 std r15,_DSISR(r1)
8852 addi r3,r1,STACK_FRAME_OVERHEAD
8853+ bl save_nvgprs
8854 mr r4,r14
8855 mr r5,r15
8856 ld r14,PACA_EXGEN+EX_R14(r13)
8857@@ -1018,8 +1019,7 @@ storage_fault_common:
8858 cmpdi r3,0
8859 bne- 1f
8860 b ret_from_except_lite
8861-1: bl save_nvgprs
8862- mr r5,r3
8863+1: mr r5,r3
8864 addi r3,r1,STACK_FRAME_OVERHEAD
8865 ld r4,_DAR(r1)
8866 bl bad_page_fault
8867diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8868index 9519e6b..13f6c38 100644
8869--- a/arch/powerpc/kernel/exceptions-64s.S
8870+++ b/arch/powerpc/kernel/exceptions-64s.S
8871@@ -1599,10 +1599,10 @@ handle_page_fault:
8872 11: ld r4,_DAR(r1)
8873 ld r5,_DSISR(r1)
8874 addi r3,r1,STACK_FRAME_OVERHEAD
8875+ bl save_nvgprs
8876 bl do_page_fault
8877 cmpdi r3,0
8878 beq+ 12f
8879- bl save_nvgprs
8880 mr r5,r3
8881 addi r3,r1,STACK_FRAME_OVERHEAD
8882 lwz r4,_DAR(r1)
8883diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8884index 4509603..cdb491f 100644
8885--- a/arch/powerpc/kernel/irq.c
8886+++ b/arch/powerpc/kernel/irq.c
8887@@ -460,6 +460,8 @@ void migrate_irqs(void)
8888 }
8889 #endif
8890
8891+extern void gr_handle_kernel_exploit(void);
8892+
8893 static inline void check_stack_overflow(void)
8894 {
8895 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8896@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8897 pr_err("do_IRQ: stack overflow: %ld\n",
8898 sp - sizeof(struct thread_info));
8899 dump_stack();
8900+ gr_handle_kernel_exploit();
8901 }
8902 #endif
8903 }
8904diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8905index c94d2e0..992a9ce 100644
8906--- a/arch/powerpc/kernel/module_32.c
8907+++ b/arch/powerpc/kernel/module_32.c
8908@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8909 me->arch.core_plt_section = i;
8910 }
8911 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8912- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8913+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8914 return -ENOEXEC;
8915 }
8916
8917@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8918
8919 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8920 /* Init, or core PLT? */
8921- if (location >= mod->module_core
8922- && location < mod->module_core + mod->core_size)
8923+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8924+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8925 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8926- else
8927+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8928+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8929 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8930+ else {
8931+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8932+ return ~0UL;
8933+ }
8934
8935 /* Find this entry, or if that fails, the next avail. entry */
8936 while (entry->jump[0]) {
8937@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8938 }
8939 #ifdef CONFIG_DYNAMIC_FTRACE
8940 module->arch.tramp =
8941- do_plt_call(module->module_core,
8942+ do_plt_call(module->module_core_rx,
8943 (unsigned long)ftrace_caller,
8944 sechdrs, module);
8945 #endif
8946diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8947index febb50d..bb10020 100644
8948--- a/arch/powerpc/kernel/process.c
8949+++ b/arch/powerpc/kernel/process.c
8950@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8951 * Lookup NIP late so we have the best change of getting the
8952 * above info out without failing
8953 */
8954- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8955- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8956+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8957+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8958 #endif
8959 show_stack(current, (unsigned long *) regs->gpr[1]);
8960 if (!user_mode(regs))
8961@@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8962 newsp = stack[0];
8963 ip = stack[STACK_FRAME_LR_SAVE];
8964 if (!firstframe || ip != lr) {
8965- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8966+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8967 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8968 if ((ip == rth) && curr_frame >= 0) {
8969- printk(" (%pS)",
8970+ printk(" (%pA)",
8971 (void *)current->ret_stack[curr_frame].ret);
8972 curr_frame--;
8973 }
8974@@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8975 struct pt_regs *regs = (struct pt_regs *)
8976 (sp + STACK_FRAME_OVERHEAD);
8977 lr = regs->link;
8978- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8979+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8980 regs->trap, (void *)regs->nip, (void *)lr);
8981 firstframe = 1;
8982 }
8983@@ -1613,49 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
8984 mtspr(SPRN_CTRLT, ctrl);
8985 }
8986 #endif /* CONFIG_PPC64 */
8987-
8988-unsigned long arch_align_stack(unsigned long sp)
8989-{
8990- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8991- sp -= get_random_int() & ~PAGE_MASK;
8992- return sp & ~0xf;
8993-}
8994-
8995-static inline unsigned long brk_rnd(void)
8996-{
8997- unsigned long rnd = 0;
8998-
8999- /* 8MB for 32bit, 1GB for 64bit */
9000- if (is_32bit_task())
9001- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
9002- else
9003- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
9004-
9005- return rnd << PAGE_SHIFT;
9006-}
9007-
9008-unsigned long arch_randomize_brk(struct mm_struct *mm)
9009-{
9010- unsigned long base = mm->brk;
9011- unsigned long ret;
9012-
9013-#ifdef CONFIG_PPC_STD_MMU_64
9014- /*
9015- * If we are using 1TB segments and we are allowed to randomise
9016- * the heap, we can put it above 1TB so it is backed by a 1TB
9017- * segment. Otherwise the heap will be in the bottom 1TB
9018- * which always uses 256MB segments and this may result in a
9019- * performance penalty.
9020- */
9021- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9022- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9023-#endif
9024-
9025- ret = PAGE_ALIGN(base + brk_rnd());
9026-
9027- if (ret < mm->brk)
9028- return mm->brk;
9029-
9030- return ret;
9031-}
9032-
9033diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9034index f21897b..28c0428 100644
9035--- a/arch/powerpc/kernel/ptrace.c
9036+++ b/arch/powerpc/kernel/ptrace.c
9037@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9038 return ret;
9039 }
9040
9041+#ifdef CONFIG_GRKERNSEC_SETXID
9042+extern void gr_delayed_cred_worker(void);
9043+#endif
9044+
9045 /*
9046 * We must return the syscall number to actually look up in the table.
9047 * This can be -1L to skip running any syscall at all.
9048@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9049
9050 secure_computing_strict(regs->gpr[0]);
9051
9052+#ifdef CONFIG_GRKERNSEC_SETXID
9053+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9054+ gr_delayed_cred_worker();
9055+#endif
9056+
9057 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9058 tracehook_report_syscall_entry(regs))
9059 /*
9060@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9061 {
9062 int step;
9063
9064+#ifdef CONFIG_GRKERNSEC_SETXID
9065+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9066+ gr_delayed_cred_worker();
9067+#endif
9068+
9069 audit_syscall_exit(regs);
9070
9071 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9072diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9073index da50e0c..5ff6307 100644
9074--- a/arch/powerpc/kernel/signal_32.c
9075+++ b/arch/powerpc/kernel/signal_32.c
9076@@ -1009,7 +1009,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9077 /* Save user registers on the stack */
9078 frame = &rt_sf->uc.uc_mcontext;
9079 addr = frame;
9080- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9081+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9082 sigret = 0;
9083 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9084 } else {
9085diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9086index c7c24d2..1bf7039 100644
9087--- a/arch/powerpc/kernel/signal_64.c
9088+++ b/arch/powerpc/kernel/signal_64.c
9089@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9090 current->thread.fp_state.fpscr = 0;
9091
9092 /* Set up to return from userspace. */
9093- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9094+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9095 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9096 } else {
9097 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9098diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9099index 19e4744..28a8d7b 100644
9100--- a/arch/powerpc/kernel/traps.c
9101+++ b/arch/powerpc/kernel/traps.c
9102@@ -36,6 +36,7 @@
9103 #include <linux/debugfs.h>
9104 #include <linux/ratelimit.h>
9105 #include <linux/context_tracking.h>
9106+#include <linux/uaccess.h>
9107
9108 #include <asm/emulated_ops.h>
9109 #include <asm/pgtable.h>
9110@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9111 return flags;
9112 }
9113
9114+extern void gr_handle_kernel_exploit(void);
9115+
9116 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9117 int signr)
9118 {
9119@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9120 panic("Fatal exception in interrupt");
9121 if (panic_on_oops)
9122 panic("Fatal exception");
9123+
9124+ gr_handle_kernel_exploit();
9125+
9126 do_exit(signr);
9127 }
9128
9129@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9130 enum ctx_state prev_state = exception_enter();
9131 unsigned int reason = get_reason(regs);
9132
9133+#ifdef CONFIG_PAX_REFCOUNT
9134+ unsigned int bkpt;
9135+ const struct exception_table_entry *entry;
9136+
9137+ if (reason & REASON_ILLEGAL) {
9138+ /* Check if PaX bad instruction */
9139+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9140+ current->thread.trap_nr = 0;
9141+ pax_report_refcount_overflow(regs);
9142+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9143+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9144+ regs->nip = entry->fixup;
9145+ return;
9146+ }
9147+ /* fixup_exception() could not handle */
9148+ goto bail;
9149+ }
9150+ }
9151+#endif
9152+
9153 /* We can now get here via a FP Unavailable exception if the core
9154 * has no FPU, in that case the reason flags will be 0 */
9155
9156diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9157index 305eb0d..accc5b40 100644
9158--- a/arch/powerpc/kernel/vdso.c
9159+++ b/arch/powerpc/kernel/vdso.c
9160@@ -34,6 +34,7 @@
9161 #include <asm/vdso.h>
9162 #include <asm/vdso_datapage.h>
9163 #include <asm/setup.h>
9164+#include <asm/mman.h>
9165
9166 #undef DEBUG
9167
9168@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9169 vdso_base = VDSO32_MBASE;
9170 #endif
9171
9172- current->mm->context.vdso_base = 0;
9173+ current->mm->context.vdso_base = ~0UL;
9174
9175 /* vDSO has a problem and was disabled, just don't "enable" it for the
9176 * process
9177@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9178 vdso_base = get_unmapped_area(NULL, vdso_base,
9179 (vdso_pages << PAGE_SHIFT) +
9180 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9181- 0, 0);
9182+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9183 if (IS_ERR_VALUE(vdso_base)) {
9184 rc = vdso_base;
9185 goto fail_mmapsem;
9186diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9187index ac3ddf1..9a54c76 100644
9188--- a/arch/powerpc/kvm/powerpc.c
9189+++ b/arch/powerpc/kvm/powerpc.c
9190@@ -1403,7 +1403,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9191 }
9192 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9193
9194-int kvm_arch_init(void *opaque)
9195+int kvm_arch_init(const void *opaque)
9196 {
9197 return 0;
9198 }
9199diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9200index 5eea6f3..5d10396 100644
9201--- a/arch/powerpc/lib/usercopy_64.c
9202+++ b/arch/powerpc/lib/usercopy_64.c
9203@@ -9,22 +9,6 @@
9204 #include <linux/module.h>
9205 #include <asm/uaccess.h>
9206
9207-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9208-{
9209- if (likely(access_ok(VERIFY_READ, from, n)))
9210- n = __copy_from_user(to, from, n);
9211- else
9212- memset(to, 0, n);
9213- return n;
9214-}
9215-
9216-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9217-{
9218- if (likely(access_ok(VERIFY_WRITE, to, n)))
9219- n = __copy_to_user(to, from, n);
9220- return n;
9221-}
9222-
9223 unsigned long copy_in_user(void __user *to, const void __user *from,
9224 unsigned long n)
9225 {
9226@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9227 return n;
9228 }
9229
9230-EXPORT_SYMBOL(copy_from_user);
9231-EXPORT_SYMBOL(copy_to_user);
9232 EXPORT_SYMBOL(copy_in_user);
9233
9234diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9235index b396868..3eb6b9f 100644
9236--- a/arch/powerpc/mm/fault.c
9237+++ b/arch/powerpc/mm/fault.c
9238@@ -33,6 +33,10 @@
9239 #include <linux/ratelimit.h>
9240 #include <linux/context_tracking.h>
9241 #include <linux/hugetlb.h>
9242+#include <linux/slab.h>
9243+#include <linux/pagemap.h>
9244+#include <linux/compiler.h>
9245+#include <linux/unistd.h>
9246
9247 #include <asm/firmware.h>
9248 #include <asm/page.h>
9249@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9250 }
9251 #endif
9252
9253+#ifdef CONFIG_PAX_PAGEEXEC
9254+/*
9255+ * PaX: decide what to do with offenders (regs->nip = fault address)
9256+ *
9257+ * returns 1 when task should be killed
9258+ */
9259+static int pax_handle_fetch_fault(struct pt_regs *regs)
9260+{
9261+ return 1;
9262+}
9263+
9264+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9265+{
9266+ unsigned long i;
9267+
9268+ printk(KERN_ERR "PAX: bytes at PC: ");
9269+ for (i = 0; i < 5; i++) {
9270+ unsigned int c;
9271+ if (get_user(c, (unsigned int __user *)pc+i))
9272+ printk(KERN_CONT "???????? ");
9273+ else
9274+ printk(KERN_CONT "%08x ", c);
9275+ }
9276+ printk("\n");
9277+}
9278+#endif
9279+
9280 /*
9281 * Check whether the instruction at regs->nip is a store using
9282 * an update addressing form which will update r1.
9283@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9284 * indicate errors in DSISR but can validly be set in SRR1.
9285 */
9286 if (trap == 0x400)
9287- error_code &= 0x48200000;
9288+ error_code &= 0x58200000;
9289 else
9290 is_write = error_code & DSISR_ISSTORE;
9291 #else
9292@@ -383,12 +414,16 @@ good_area:
9293 * "undefined". Of those that can be set, this is the only
9294 * one which seems bad.
9295 */
9296- if (error_code & 0x10000000)
9297+ if (error_code & DSISR_GUARDED)
9298 /* Guarded storage error. */
9299 goto bad_area;
9300 #endif /* CONFIG_8xx */
9301
9302 if (is_exec) {
9303+#ifdef CONFIG_PPC_STD_MMU
9304+ if (error_code & DSISR_GUARDED)
9305+ goto bad_area;
9306+#endif
9307 /*
9308 * Allow execution from readable areas if the MMU does not
9309 * provide separate controls over reading and executing.
9310@@ -483,6 +518,23 @@ bad_area:
9311 bad_area_nosemaphore:
9312 /* User mode accesses cause a SIGSEGV */
9313 if (user_mode(regs)) {
9314+
9315+#ifdef CONFIG_PAX_PAGEEXEC
9316+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9317+#ifdef CONFIG_PPC_STD_MMU
9318+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9319+#else
9320+ if (is_exec && regs->nip == address) {
9321+#endif
9322+ switch (pax_handle_fetch_fault(regs)) {
9323+ }
9324+
9325+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9326+ do_group_exit(SIGKILL);
9327+ }
9328+ }
9329+#endif
9330+
9331 _exception(SIGSEGV, regs, code, address);
9332 goto bail;
9333 }
9334diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9335index 0f0502e..bc3e7a3 100644
9336--- a/arch/powerpc/mm/mmap.c
9337+++ b/arch/powerpc/mm/mmap.c
9338@@ -86,6 +86,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9339 {
9340 unsigned long random_factor = 0UL;
9341
9342+#ifdef CONFIG_PAX_RANDMMAP
9343+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9344+#endif
9345+
9346 if (current->flags & PF_RANDOMIZE)
9347 random_factor = arch_mmap_rnd();
9348
9349@@ -95,9 +99,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9350 */
9351 if (mmap_is_legacy()) {
9352 mm->mmap_base = TASK_UNMAPPED_BASE;
9353+
9354+#ifdef CONFIG_PAX_RANDMMAP
9355+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9356+ mm->mmap_base += mm->delta_mmap;
9357+#endif
9358+
9359 mm->get_unmapped_area = arch_get_unmapped_area;
9360 } else {
9361 mm->mmap_base = mmap_base(random_factor);
9362+
9363+#ifdef CONFIG_PAX_RANDMMAP
9364+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9365+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9366+#endif
9367+
9368 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9369 }
9370 }
9371diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9372index 0f432a7..abfe841 100644
9373--- a/arch/powerpc/mm/slice.c
9374+++ b/arch/powerpc/mm/slice.c
9375@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9376 if ((mm->task_size - len) < addr)
9377 return 0;
9378 vma = find_vma(mm, addr);
9379- return (!vma || (addr + len) <= vma->vm_start);
9380+ return check_heap_stack_gap(vma, addr, len, 0);
9381 }
9382
9383 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9384@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9385 info.align_offset = 0;
9386
9387 addr = TASK_UNMAPPED_BASE;
9388+
9389+#ifdef CONFIG_PAX_RANDMMAP
9390+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9391+ addr += mm->delta_mmap;
9392+#endif
9393+
9394 while (addr < TASK_SIZE) {
9395 info.low_limit = addr;
9396 if (!slice_scan_available(addr, available, 1, &addr))
9397@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9398 if (fixed && addr > (mm->task_size - len))
9399 return -ENOMEM;
9400
9401+#ifdef CONFIG_PAX_RANDMMAP
9402+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9403+ addr = 0;
9404+#endif
9405+
9406 /* If hint, make sure it matches our alignment restrictions */
9407 if (!fixed && addr) {
9408 addr = _ALIGN_UP(addr, 1ul << pshift);
9409diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9410index d966bbe..372124a 100644
9411--- a/arch/powerpc/platforms/cell/spufs/file.c
9412+++ b/arch/powerpc/platforms/cell/spufs/file.c
9413@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9414 return VM_FAULT_NOPAGE;
9415 }
9416
9417-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9418+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9419 unsigned long address,
9420- void *buf, int len, int write)
9421+ void *buf, size_t len, int write)
9422 {
9423 struct spu_context *ctx = vma->vm_file->private_data;
9424 unsigned long offset = address - vma->vm_start;
9425diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9426index adbe380..adb7516 100644
9427--- a/arch/s390/include/asm/atomic.h
9428+++ b/arch/s390/include/asm/atomic.h
9429@@ -317,4 +317,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9430 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9431 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9432
9433+#define atomic64_read_unchecked(v) atomic64_read(v)
9434+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9435+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9436+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9437+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9438+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9439+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9440+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9441+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9442+
9443 #endif /* __ARCH_S390_ATOMIC__ */
9444diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9445index 8d72471..5322500 100644
9446--- a/arch/s390/include/asm/barrier.h
9447+++ b/arch/s390/include/asm/barrier.h
9448@@ -42,7 +42,7 @@
9449 do { \
9450 compiletime_assert_atomic_type(*p); \
9451 barrier(); \
9452- ACCESS_ONCE(*p) = (v); \
9453+ ACCESS_ONCE_RW(*p) = (v); \
9454 } while (0)
9455
9456 #define smp_load_acquire(p) \
9457diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9458index 4d7ccac..d03d0ad 100644
9459--- a/arch/s390/include/asm/cache.h
9460+++ b/arch/s390/include/asm/cache.h
9461@@ -9,8 +9,10 @@
9462 #ifndef __ARCH_S390_CACHE_H
9463 #define __ARCH_S390_CACHE_H
9464
9465-#define L1_CACHE_BYTES 256
9466+#include <linux/const.h>
9467+
9468 #define L1_CACHE_SHIFT 8
9469+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9470 #define NET_SKB_PAD 32
9471
9472 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9473diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9474index 3ad48f2..64cc6f3 100644
9475--- a/arch/s390/include/asm/elf.h
9476+++ b/arch/s390/include/asm/elf.h
9477@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
9478 (STACK_TOP / 3 * 2) : \
9479 (STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
9480
9481+#ifdef CONFIG_PAX_ASLR
9482+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9483+
9484+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9485+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9486+#endif
9487+
9488 /* This yields a mask that user programs can use to figure out what
9489 instruction set this CPU supports. */
9490
9491diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9492index c4a93d6..4d2a9b4 100644
9493--- a/arch/s390/include/asm/exec.h
9494+++ b/arch/s390/include/asm/exec.h
9495@@ -7,6 +7,6 @@
9496 #ifndef __ASM_EXEC_H
9497 #define __ASM_EXEC_H
9498
9499-extern unsigned long arch_align_stack(unsigned long sp);
9500+#define arch_align_stack(x) ((x) & ~0xfUL)
9501
9502 #endif /* __ASM_EXEC_H */
9503diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9504index d64a7a6..0830329 100644
9505--- a/arch/s390/include/asm/uaccess.h
9506+++ b/arch/s390/include/asm/uaccess.h
9507@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9508 __range_ok((unsigned long)(addr), (size)); \
9509 })
9510
9511+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9512 #define access_ok(type, addr, size) __access_ok(addr, size)
9513
9514 /*
9515@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9516 copy_to_user(void __user *to, const void *from, unsigned long n)
9517 {
9518 might_fault();
9519+
9520+ if ((long)n < 0)
9521+ return n;
9522+
9523 return __copy_to_user(to, from, n);
9524 }
9525
9526@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9527 static inline unsigned long __must_check
9528 copy_from_user(void *to, const void __user *from, unsigned long n)
9529 {
9530- unsigned int sz = __compiletime_object_size(to);
9531+ size_t sz = __compiletime_object_size(to);
9532
9533 might_fault();
9534- if (unlikely(sz != -1 && sz < n)) {
9535+
9536+ if ((long)n < 0)
9537+ return n;
9538+
9539+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9540 copy_from_user_overflow();
9541 return n;
9542 }
9543diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9544index 0c1a679..e1df357 100644
9545--- a/arch/s390/kernel/module.c
9546+++ b/arch/s390/kernel/module.c
9547@@ -159,11 +159,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9548
9549 /* Increase core size by size of got & plt and set start
9550 offsets for got and plt. */
9551- me->core_size = ALIGN(me->core_size, 4);
9552- me->arch.got_offset = me->core_size;
9553- me->core_size += me->arch.got_size;
9554- me->arch.plt_offset = me->core_size;
9555- me->core_size += me->arch.plt_size;
9556+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9557+ me->arch.got_offset = me->core_size_rw;
9558+ me->core_size_rw += me->arch.got_size;
9559+ me->arch.plt_offset = me->core_size_rx;
9560+ me->core_size_rx += me->arch.plt_size;
9561 return 0;
9562 }
9563
9564@@ -279,7 +279,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9565 if (info->got_initialized == 0) {
9566 Elf_Addr *gotent;
9567
9568- gotent = me->module_core + me->arch.got_offset +
9569+ gotent = me->module_core_rw + me->arch.got_offset +
9570 info->got_offset;
9571 *gotent = val;
9572 info->got_initialized = 1;
9573@@ -302,7 +302,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9574 rc = apply_rela_bits(loc, val, 0, 64, 0);
9575 else if (r_type == R_390_GOTENT ||
9576 r_type == R_390_GOTPLTENT) {
9577- val += (Elf_Addr) me->module_core - loc;
9578+ val += (Elf_Addr) me->module_core_rw - loc;
9579 rc = apply_rela_bits(loc, val, 1, 32, 1);
9580 }
9581 break;
9582@@ -315,7 +315,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9583 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9584 if (info->plt_initialized == 0) {
9585 unsigned int *ip;
9586- ip = me->module_core + me->arch.plt_offset +
9587+ ip = me->module_core_rx + me->arch.plt_offset +
9588 info->plt_offset;
9589 ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */
9590 ip[1] = 0x100a0004;
9591@@ -334,7 +334,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9592 val - loc + 0xffffUL < 0x1ffffeUL) ||
9593 (r_type == R_390_PLT32DBL &&
9594 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9595- val = (Elf_Addr) me->module_core +
9596+ val = (Elf_Addr) me->module_core_rx +
9597 me->arch.plt_offset +
9598 info->plt_offset;
9599 val += rela->r_addend - loc;
9600@@ -356,7 +356,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9601 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9602 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9603 val = val + rela->r_addend -
9604- ((Elf_Addr) me->module_core + me->arch.got_offset);
9605+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9606 if (r_type == R_390_GOTOFF16)
9607 rc = apply_rela_bits(loc, val, 0, 16, 0);
9608 else if (r_type == R_390_GOTOFF32)
9609@@ -366,7 +366,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9610 break;
9611 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9612 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9613- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9614+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9615 rela->r_addend - loc;
9616 if (r_type == R_390_GOTPC)
9617 rc = apply_rela_bits(loc, val, 1, 32, 0);
9618diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9619index 8f587d8..0642516b 100644
9620--- a/arch/s390/kernel/process.c
9621+++ b/arch/s390/kernel/process.c
9622@@ -200,27 +200,3 @@ unsigned long get_wchan(struct task_struct *p)
9623 }
9624 return 0;
9625 }
9626-
9627-unsigned long arch_align_stack(unsigned long sp)
9628-{
9629- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9630- sp -= get_random_int() & ~PAGE_MASK;
9631- return sp & ~0xf;
9632-}
9633-
9634-static inline unsigned long brk_rnd(void)
9635-{
9636- /* 8MB for 32bit, 1GB for 64bit */
9637- if (is_32bit_task())
9638- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9639- else
9640- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9641-}
9642-
9643-unsigned long arch_randomize_brk(struct mm_struct *mm)
9644-{
9645- unsigned long ret;
9646-
9647- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9648- return (ret > mm->brk) ? ret : mm->brk;
9649-}
9650diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9651index 6e552af..3e608a1 100644
9652--- a/arch/s390/mm/mmap.c
9653+++ b/arch/s390/mm/mmap.c
9654@@ -239,6 +239,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9655 {
9656 unsigned long random_factor = 0UL;
9657
9658+#ifdef CONFIG_PAX_RANDMMAP
9659+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9660+#endif
9661+
9662 if (current->flags & PF_RANDOMIZE)
9663 random_factor = arch_mmap_rnd();
9664
9665@@ -248,9 +252,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9666 */
9667 if (mmap_is_legacy()) {
9668 mm->mmap_base = mmap_base_legacy(random_factor);
9669+
9670+#ifdef CONFIG_PAX_RANDMMAP
9671+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9672+ mm->mmap_base += mm->delta_mmap;
9673+#endif
9674+
9675 mm->get_unmapped_area = s390_get_unmapped_area;
9676 } else {
9677 mm->mmap_base = mmap_base(random_factor);
9678+
9679+#ifdef CONFIG_PAX_RANDMMAP
9680+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9681+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9682+#endif
9683+
9684 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9685 }
9686 }
9687diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9688index ae3d59f..f65f075 100644
9689--- a/arch/score/include/asm/cache.h
9690+++ b/arch/score/include/asm/cache.h
9691@@ -1,7 +1,9 @@
9692 #ifndef _ASM_SCORE_CACHE_H
9693 #define _ASM_SCORE_CACHE_H
9694
9695+#include <linux/const.h>
9696+
9697 #define L1_CACHE_SHIFT 4
9698-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9699+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9700
9701 #endif /* _ASM_SCORE_CACHE_H */
9702diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9703index f9f3cd5..58ff438 100644
9704--- a/arch/score/include/asm/exec.h
9705+++ b/arch/score/include/asm/exec.h
9706@@ -1,6 +1,6 @@
9707 #ifndef _ASM_SCORE_EXEC_H
9708 #define _ASM_SCORE_EXEC_H
9709
9710-extern unsigned long arch_align_stack(unsigned long sp);
9711+#define arch_align_stack(x) (x)
9712
9713 #endif /* _ASM_SCORE_EXEC_H */
9714diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9715index a1519ad3..e8ac1ff 100644
9716--- a/arch/score/kernel/process.c
9717+++ b/arch/score/kernel/process.c
9718@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9719
9720 return task_pt_regs(task)->cp0_epc;
9721 }
9722-
9723-unsigned long arch_align_stack(unsigned long sp)
9724-{
9725- return sp;
9726-}
9727diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9728index ef9e555..331bd29 100644
9729--- a/arch/sh/include/asm/cache.h
9730+++ b/arch/sh/include/asm/cache.h
9731@@ -9,10 +9,11 @@
9732 #define __ASM_SH_CACHE_H
9733 #ifdef __KERNEL__
9734
9735+#include <linux/const.h>
9736 #include <linux/init.h>
9737 #include <cpu/cache.h>
9738
9739-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9740+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9741
9742 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9743
9744diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9745index 6777177..cb5e44f 100644
9746--- a/arch/sh/mm/mmap.c
9747+++ b/arch/sh/mm/mmap.c
9748@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9749 struct mm_struct *mm = current->mm;
9750 struct vm_area_struct *vma;
9751 int do_colour_align;
9752+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9753 struct vm_unmapped_area_info info;
9754
9755 if (flags & MAP_FIXED) {
9756@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9757 if (filp || (flags & MAP_SHARED))
9758 do_colour_align = 1;
9759
9760+#ifdef CONFIG_PAX_RANDMMAP
9761+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9762+#endif
9763+
9764 if (addr) {
9765 if (do_colour_align)
9766 addr = COLOUR_ALIGN(addr, pgoff);
9767@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9768 addr = PAGE_ALIGN(addr);
9769
9770 vma = find_vma(mm, addr);
9771- if (TASK_SIZE - len >= addr &&
9772- (!vma || addr + len <= vma->vm_start))
9773+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9774 return addr;
9775 }
9776
9777 info.flags = 0;
9778 info.length = len;
9779- info.low_limit = TASK_UNMAPPED_BASE;
9780+ info.low_limit = mm->mmap_base;
9781 info.high_limit = TASK_SIZE;
9782 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9783 info.align_offset = pgoff << PAGE_SHIFT;
9784@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9785 struct mm_struct *mm = current->mm;
9786 unsigned long addr = addr0;
9787 int do_colour_align;
9788+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9789 struct vm_unmapped_area_info info;
9790
9791 if (flags & MAP_FIXED) {
9792@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9793 if (filp || (flags & MAP_SHARED))
9794 do_colour_align = 1;
9795
9796+#ifdef CONFIG_PAX_RANDMMAP
9797+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9798+#endif
9799+
9800 /* requesting a specific address */
9801 if (addr) {
9802 if (do_colour_align)
9803@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9804 addr = PAGE_ALIGN(addr);
9805
9806 vma = find_vma(mm, addr);
9807- if (TASK_SIZE - len >= addr &&
9808- (!vma || addr + len <= vma->vm_start))
9809+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9810 return addr;
9811 }
9812
9813@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9814 VM_BUG_ON(addr != -ENOMEM);
9815 info.flags = 0;
9816 info.low_limit = TASK_UNMAPPED_BASE;
9817+
9818+#ifdef CONFIG_PAX_RANDMMAP
9819+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9820+ info.low_limit += mm->delta_mmap;
9821+#endif
9822+
9823 info.high_limit = TASK_SIZE;
9824 addr = vm_unmapped_area(&info);
9825 }
9826diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9827index 4082749..fd97781 100644
9828--- a/arch/sparc/include/asm/atomic_64.h
9829+++ b/arch/sparc/include/asm/atomic_64.h
9830@@ -15,18 +15,38 @@
9831 #define ATOMIC64_INIT(i) { (i) }
9832
9833 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9834+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9835+{
9836+ return ACCESS_ONCE(v->counter);
9837+}
9838 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9839+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9840+{
9841+ return ACCESS_ONCE(v->counter);
9842+}
9843
9844 #define atomic_set(v, i) (((v)->counter) = i)
9845+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9846+{
9847+ v->counter = i;
9848+}
9849 #define atomic64_set(v, i) (((v)->counter) = i)
9850+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9851+{
9852+ v->counter = i;
9853+}
9854
9855-#define ATOMIC_OP(op) \
9856-void atomic_##op(int, atomic_t *); \
9857-void atomic64_##op(long, atomic64_t *);
9858+#define __ATOMIC_OP(op, suffix) \
9859+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9860+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9861
9862-#define ATOMIC_OP_RETURN(op) \
9863-int atomic_##op##_return(int, atomic_t *); \
9864-long atomic64_##op##_return(long, atomic64_t *);
9865+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9866+
9867+#define __ATOMIC_OP_RETURN(op, suffix) \
9868+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9869+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9870+
9871+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9872
9873 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9874
9875@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9876
9877 #undef ATOMIC_OPS
9878 #undef ATOMIC_OP_RETURN
9879+#undef __ATOMIC_OP_RETURN
9880 #undef ATOMIC_OP
9881+#undef __ATOMIC_OP
9882
9883 #define atomic_dec_return(v) atomic_sub_return(1, v)
9884 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9885
9886 #define atomic_inc_return(v) atomic_add_return(1, v)
9887+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9888+{
9889+ return atomic_add_return_unchecked(1, v);
9890+}
9891 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9892+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9893+{
9894+ return atomic64_add_return_unchecked(1, v);
9895+}
9896
9897 /*
9898 * atomic_inc_and_test - increment and test
9899@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9900 * other cases.
9901 */
9902 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9903+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9904+{
9905+ return atomic_inc_return_unchecked(v) == 0;
9906+}
9907 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9908
9909 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9910@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9911 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9912
9913 #define atomic_inc(v) atomic_add(1, v)
9914+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9915+{
9916+ atomic_add_unchecked(1, v);
9917+}
9918 #define atomic64_inc(v) atomic64_add(1, v)
9919+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9920+{
9921+ atomic64_add_unchecked(1, v);
9922+}
9923
9924 #define atomic_dec(v) atomic_sub(1, v)
9925+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9926+{
9927+ atomic_sub_unchecked(1, v);
9928+}
9929 #define atomic64_dec(v) atomic64_sub(1, v)
9930+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9931+{
9932+ atomic64_sub_unchecked(1, v);
9933+}
9934
9935 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9936 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9937
9938 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9939+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9940+{
9941+ return cmpxchg(&v->counter, old, new);
9942+}
9943 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9944+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9945+{
9946+ return xchg(&v->counter, new);
9947+}
9948
9949 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9950 {
9951- int c, old;
9952+ int c, old, new;
9953 c = atomic_read(v);
9954 for (;;) {
9955- if (unlikely(c == (u)))
9956+ if (unlikely(c == u))
9957 break;
9958- old = atomic_cmpxchg((v), c, c + (a));
9959+
9960+ asm volatile("addcc %2, %0, %0\n"
9961+
9962+#ifdef CONFIG_PAX_REFCOUNT
9963+ "tvs %%icc, 6\n"
9964+#endif
9965+
9966+ : "=r" (new)
9967+ : "0" (c), "ir" (a)
9968+ : "cc");
9969+
9970+ old = atomic_cmpxchg(v, c, new);
9971 if (likely(old == c))
9972 break;
9973 c = old;
9974@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9975 #define atomic64_cmpxchg(v, o, n) \
9976 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9977 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9978+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9979+{
9980+ return xchg(&v->counter, new);
9981+}
9982
9983 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9984 {
9985- long c, old;
9986+ long c, old, new;
9987 c = atomic64_read(v);
9988 for (;;) {
9989- if (unlikely(c == (u)))
9990+ if (unlikely(c == u))
9991 break;
9992- old = atomic64_cmpxchg((v), c, c + (a));
9993+
9994+ asm volatile("addcc %2, %0, %0\n"
9995+
9996+#ifdef CONFIG_PAX_REFCOUNT
9997+ "tvs %%xcc, 6\n"
9998+#endif
9999+
10000+ : "=r" (new)
10001+ : "0" (c), "ir" (a)
10002+ : "cc");
10003+
10004+ old = atomic64_cmpxchg(v, c, new);
10005 if (likely(old == c))
10006 break;
10007 c = old;
10008 }
10009- return c != (u);
10010+ return c != u;
10011 }
10012
10013 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10014diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10015index 7664894..45a974b 100644
10016--- a/arch/sparc/include/asm/barrier_64.h
10017+++ b/arch/sparc/include/asm/barrier_64.h
10018@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10019 do { \
10020 compiletime_assert_atomic_type(*p); \
10021 barrier(); \
10022- ACCESS_ONCE(*p) = (v); \
10023+ ACCESS_ONCE_RW(*p) = (v); \
10024 } while (0)
10025
10026 #define smp_load_acquire(p) \
10027diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10028index 5bb6991..5c2132e 100644
10029--- a/arch/sparc/include/asm/cache.h
10030+++ b/arch/sparc/include/asm/cache.h
10031@@ -7,10 +7,12 @@
10032 #ifndef _SPARC_CACHE_H
10033 #define _SPARC_CACHE_H
10034
10035+#include <linux/const.h>
10036+
10037 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10038
10039 #define L1_CACHE_SHIFT 5
10040-#define L1_CACHE_BYTES 32
10041+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10042
10043 #ifdef CONFIG_SPARC32
10044 #define SMP_CACHE_BYTES_SHIFT 5
10045diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10046index a24e41f..47677ff 100644
10047--- a/arch/sparc/include/asm/elf_32.h
10048+++ b/arch/sparc/include/asm/elf_32.h
10049@@ -114,6 +114,13 @@ typedef struct {
10050
10051 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10052
10053+#ifdef CONFIG_PAX_ASLR
10054+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10055+
10056+#define PAX_DELTA_MMAP_LEN 16
10057+#define PAX_DELTA_STACK_LEN 16
10058+#endif
10059+
10060 /* This yields a mask that user programs can use to figure out what
10061 instruction set this cpu supports. This can NOT be done in userspace
10062 on Sparc. */
10063diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10064index 370ca1e..d4f4a98 100644
10065--- a/arch/sparc/include/asm/elf_64.h
10066+++ b/arch/sparc/include/asm/elf_64.h
10067@@ -189,6 +189,13 @@ typedef struct {
10068 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10069 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10070
10071+#ifdef CONFIG_PAX_ASLR
10072+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10073+
10074+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10075+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10076+#endif
10077+
10078 extern unsigned long sparc64_elf_hwcap;
10079 #define ELF_HWCAP sparc64_elf_hwcap
10080
10081diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10082index a3890da..f6a408e 100644
10083--- a/arch/sparc/include/asm/pgalloc_32.h
10084+++ b/arch/sparc/include/asm/pgalloc_32.h
10085@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10086 }
10087
10088 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10089+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10090
10091 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10092 unsigned long address)
10093diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10094index 5e31871..13469c6 100644
10095--- a/arch/sparc/include/asm/pgalloc_64.h
10096+++ b/arch/sparc/include/asm/pgalloc_64.h
10097@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10098 }
10099
10100 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10101+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10102
10103 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10104 {
10105@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10106 }
10107
10108 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10109+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10110
10111 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10112 {
10113diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10114index 59ba6f6..4518128 100644
10115--- a/arch/sparc/include/asm/pgtable.h
10116+++ b/arch/sparc/include/asm/pgtable.h
10117@@ -5,4 +5,8 @@
10118 #else
10119 #include <asm/pgtable_32.h>
10120 #endif
10121+
10122+#define ktla_ktva(addr) (addr)
10123+#define ktva_ktla(addr) (addr)
10124+
10125 #endif
10126diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10127index f06b36a..bca3189 100644
10128--- a/arch/sparc/include/asm/pgtable_32.h
10129+++ b/arch/sparc/include/asm/pgtable_32.h
10130@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10131 #define PAGE_SHARED SRMMU_PAGE_SHARED
10132 #define PAGE_COPY SRMMU_PAGE_COPY
10133 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10134+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10135+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10136+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10137 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10138
10139 /* Top-level page directory - dummy used by init-mm.
10140@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10141
10142 /* xwr */
10143 #define __P000 PAGE_NONE
10144-#define __P001 PAGE_READONLY
10145-#define __P010 PAGE_COPY
10146-#define __P011 PAGE_COPY
10147+#define __P001 PAGE_READONLY_NOEXEC
10148+#define __P010 PAGE_COPY_NOEXEC
10149+#define __P011 PAGE_COPY_NOEXEC
10150 #define __P100 PAGE_READONLY
10151 #define __P101 PAGE_READONLY
10152 #define __P110 PAGE_COPY
10153 #define __P111 PAGE_COPY
10154
10155 #define __S000 PAGE_NONE
10156-#define __S001 PAGE_READONLY
10157-#define __S010 PAGE_SHARED
10158-#define __S011 PAGE_SHARED
10159+#define __S001 PAGE_READONLY_NOEXEC
10160+#define __S010 PAGE_SHARED_NOEXEC
10161+#define __S011 PAGE_SHARED_NOEXEC
10162 #define __S100 PAGE_READONLY
10163 #define __S101 PAGE_READONLY
10164 #define __S110 PAGE_SHARED
10165diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10166index ae51a11..eadfd03 100644
10167--- a/arch/sparc/include/asm/pgtsrmmu.h
10168+++ b/arch/sparc/include/asm/pgtsrmmu.h
10169@@ -111,6 +111,11 @@
10170 SRMMU_EXEC | SRMMU_REF)
10171 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10172 SRMMU_EXEC | SRMMU_REF)
10173+
10174+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10175+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10176+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10177+
10178 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10179 SRMMU_DIRTY | SRMMU_REF)
10180
10181diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10182index 29d64b1..4272fe8 100644
10183--- a/arch/sparc/include/asm/setup.h
10184+++ b/arch/sparc/include/asm/setup.h
10185@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10186 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10187
10188 /* init_64.c */
10189-extern atomic_t dcpage_flushes;
10190-extern atomic_t dcpage_flushes_xcall;
10191+extern atomic_unchecked_t dcpage_flushes;
10192+extern atomic_unchecked_t dcpage_flushes_xcall;
10193
10194 extern int sysctl_tsb_ratio;
10195 #endif
10196diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10197index 9689176..63c18ea 100644
10198--- a/arch/sparc/include/asm/spinlock_64.h
10199+++ b/arch/sparc/include/asm/spinlock_64.h
10200@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10201
10202 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10203
10204-static void inline arch_read_lock(arch_rwlock_t *lock)
10205+static inline void arch_read_lock(arch_rwlock_t *lock)
10206 {
10207 unsigned long tmp1, tmp2;
10208
10209 __asm__ __volatile__ (
10210 "1: ldsw [%2], %0\n"
10211 " brlz,pn %0, 2f\n"
10212-"4: add %0, 1, %1\n"
10213+"4: addcc %0, 1, %1\n"
10214+
10215+#ifdef CONFIG_PAX_REFCOUNT
10216+" tvs %%icc, 6\n"
10217+#endif
10218+
10219 " cas [%2], %0, %1\n"
10220 " cmp %0, %1\n"
10221 " bne,pn %%icc, 1b\n"
10222@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10223 " .previous"
10224 : "=&r" (tmp1), "=&r" (tmp2)
10225 : "r" (lock)
10226- : "memory");
10227+ : "memory", "cc");
10228 }
10229
10230-static int inline arch_read_trylock(arch_rwlock_t *lock)
10231+static inline int arch_read_trylock(arch_rwlock_t *lock)
10232 {
10233 int tmp1, tmp2;
10234
10235@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10236 "1: ldsw [%2], %0\n"
10237 " brlz,a,pn %0, 2f\n"
10238 " mov 0, %0\n"
10239-" add %0, 1, %1\n"
10240+" addcc %0, 1, %1\n"
10241+
10242+#ifdef CONFIG_PAX_REFCOUNT
10243+" tvs %%icc, 6\n"
10244+#endif
10245+
10246 " cas [%2], %0, %1\n"
10247 " cmp %0, %1\n"
10248 " bne,pn %%icc, 1b\n"
10249@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10250 return tmp1;
10251 }
10252
10253-static void inline arch_read_unlock(arch_rwlock_t *lock)
10254+static inline void arch_read_unlock(arch_rwlock_t *lock)
10255 {
10256 unsigned long tmp1, tmp2;
10257
10258 __asm__ __volatile__(
10259 "1: lduw [%2], %0\n"
10260-" sub %0, 1, %1\n"
10261+" subcc %0, 1, %1\n"
10262+
10263+#ifdef CONFIG_PAX_REFCOUNT
10264+" tvs %%icc, 6\n"
10265+#endif
10266+
10267 " cas [%2], %0, %1\n"
10268 " cmp %0, %1\n"
10269 " bne,pn %%xcc, 1b\n"
10270@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10271 : "memory");
10272 }
10273
10274-static void inline arch_write_lock(arch_rwlock_t *lock)
10275+static inline void arch_write_lock(arch_rwlock_t *lock)
10276 {
10277 unsigned long mask, tmp1, tmp2;
10278
10279@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10280 : "memory");
10281 }
10282
10283-static void inline arch_write_unlock(arch_rwlock_t *lock)
10284+static inline void arch_write_unlock(arch_rwlock_t *lock)
10285 {
10286 __asm__ __volatile__(
10287 " stw %%g0, [%0]"
10288@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10289 : "memory");
10290 }
10291
10292-static int inline arch_write_trylock(arch_rwlock_t *lock)
10293+static inline int arch_write_trylock(arch_rwlock_t *lock)
10294 {
10295 unsigned long mask, tmp1, tmp2, result;
10296
10297diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10298index 229475f..2fca9163 100644
10299--- a/arch/sparc/include/asm/thread_info_32.h
10300+++ b/arch/sparc/include/asm/thread_info_32.h
10301@@ -48,6 +48,7 @@ struct thread_info {
10302 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10303 unsigned long rwbuf_stkptrs[NSWINS];
10304 unsigned long w_saved;
10305+ unsigned long lowest_stack;
10306 };
10307
10308 /*
10309diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10310index bde5982..9cbb56d 100644
10311--- a/arch/sparc/include/asm/thread_info_64.h
10312+++ b/arch/sparc/include/asm/thread_info_64.h
10313@@ -59,6 +59,8 @@ struct thread_info {
10314 struct pt_regs *kern_una_regs;
10315 unsigned int kern_una_insn;
10316
10317+ unsigned long lowest_stack;
10318+
10319 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10320 __attribute__ ((aligned(64)));
10321 };
10322@@ -180,12 +182,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10323 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10324 /* flag bit 4 is available */
10325 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10326-/* flag bit 6 is available */
10327+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10328 #define TIF_32BIT 7 /* 32-bit binary */
10329 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10330 #define TIF_SECCOMP 9 /* secure computing */
10331 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10332 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10333+
10334 /* NOTE: Thread flags >= 12 should be ones we have no interest
10335 * in using in assembly, else we can't use the mask as
10336 * an immediate value in instructions such as andcc.
10337@@ -205,12 +208,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10338 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10339 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10340 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10341+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10342
10343 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10344 _TIF_DO_NOTIFY_RESUME_MASK | \
10345 _TIF_NEED_RESCHED)
10346 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10347
10348+#define _TIF_WORK_SYSCALL \
10349+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10350+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10351+
10352 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10353
10354 /*
10355diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10356index bd56c28..4b63d83 100644
10357--- a/arch/sparc/include/asm/uaccess.h
10358+++ b/arch/sparc/include/asm/uaccess.h
10359@@ -1,5 +1,6 @@
10360 #ifndef ___ASM_SPARC_UACCESS_H
10361 #define ___ASM_SPARC_UACCESS_H
10362+
10363 #if defined(__sparc__) && defined(__arch64__)
10364 #include <asm/uaccess_64.h>
10365 #else
10366diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10367index 64ee103..388aef0 100644
10368--- a/arch/sparc/include/asm/uaccess_32.h
10369+++ b/arch/sparc/include/asm/uaccess_32.h
10370@@ -47,6 +47,7 @@
10371 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10372 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10373 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10374+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10375 #define access_ok(type, addr, size) \
10376 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10377
10378@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10379
10380 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10381 {
10382- if (n && __access_ok((unsigned long) to, n))
10383+ if ((long)n < 0)
10384+ return n;
10385+
10386+ if (n && __access_ok((unsigned long) to, n)) {
10387+ if (!__builtin_constant_p(n))
10388+ check_object_size(from, n, true);
10389 return __copy_user(to, (__force void __user *) from, n);
10390- else
10391+ } else
10392 return n;
10393 }
10394
10395 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10396 {
10397+ if ((long)n < 0)
10398+ return n;
10399+
10400+ if (!__builtin_constant_p(n))
10401+ check_object_size(from, n, true);
10402+
10403 return __copy_user(to, (__force void __user *) from, n);
10404 }
10405
10406 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10407 {
10408- if (n && __access_ok((unsigned long) from, n))
10409+ if ((long)n < 0)
10410+ return n;
10411+
10412+ if (n && __access_ok((unsigned long) from, n)) {
10413+ if (!__builtin_constant_p(n))
10414+ check_object_size(to, n, false);
10415 return __copy_user((__force void __user *) to, from, n);
10416- else
10417+ } else
10418 return n;
10419 }
10420
10421 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10422 {
10423+ if ((long)n < 0)
10424+ return n;
10425+
10426 return __copy_user((__force void __user *) to, from, n);
10427 }
10428
10429diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10430index a35194b..47dabc0d 100644
10431--- a/arch/sparc/include/asm/uaccess_64.h
10432+++ b/arch/sparc/include/asm/uaccess_64.h
10433@@ -10,6 +10,7 @@
10434 #include <linux/compiler.h>
10435 #include <linux/string.h>
10436 #include <linux/thread_info.h>
10437+#include <linux/kernel.h>
10438 #include <asm/asi.h>
10439 #include <asm/spitfire.h>
10440 #include <asm-generic/uaccess-unaligned.h>
10441@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10442 return 1;
10443 }
10444
10445+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10446+{
10447+ return 1;
10448+}
10449+
10450 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10451 {
10452 return 1;
10453@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10454 static inline unsigned long __must_check
10455 copy_from_user(void *to, const void __user *from, unsigned long size)
10456 {
10457- unsigned long ret = ___copy_from_user(to, from, size);
10458+ unsigned long ret;
10459
10460+ if ((long)size < 0 || size > INT_MAX)
10461+ return size;
10462+
10463+ if (!__builtin_constant_p(size))
10464+ check_object_size(to, size, false);
10465+
10466+ ret = ___copy_from_user(to, from, size);
10467 if (unlikely(ret))
10468 ret = copy_from_user_fixup(to, from, size);
10469
10470@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10471 static inline unsigned long __must_check
10472 copy_to_user(void __user *to, const void *from, unsigned long size)
10473 {
10474- unsigned long ret = ___copy_to_user(to, from, size);
10475+ unsigned long ret;
10476
10477+ if ((long)size < 0 || size > INT_MAX)
10478+ return size;
10479+
10480+ if (!__builtin_constant_p(size))
10481+ check_object_size(from, size, true);
10482+
10483+ ret = ___copy_to_user(to, from, size);
10484 if (unlikely(ret))
10485 ret = copy_to_user_fixup(to, from, size);
10486 return ret;
10487diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10488index 7cf9c6e..6206648 100644
10489--- a/arch/sparc/kernel/Makefile
10490+++ b/arch/sparc/kernel/Makefile
10491@@ -4,7 +4,7 @@
10492 #
10493
10494 asflags-y := -ansi
10495-ccflags-y := -Werror
10496+#ccflags-y := -Werror
10497
10498 extra-y := head_$(BITS).o
10499
10500diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10501index 50e7b62..79fae35 100644
10502--- a/arch/sparc/kernel/process_32.c
10503+++ b/arch/sparc/kernel/process_32.c
10504@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10505
10506 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10507 r->psr, r->pc, r->npc, r->y, print_tainted());
10508- printk("PC: <%pS>\n", (void *) r->pc);
10509+ printk("PC: <%pA>\n", (void *) r->pc);
10510 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10511 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10512 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10513 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10514 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10515 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10516- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10517+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10518
10519 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10520 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10521@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10522 rw = (struct reg_window32 *) fp;
10523 pc = rw->ins[7];
10524 printk("[%08lx : ", pc);
10525- printk("%pS ] ", (void *) pc);
10526+ printk("%pA ] ", (void *) pc);
10527 fp = rw->ins[6];
10528 } while (++count < 16);
10529 printk("\n");
10530diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10531index 46a5964..a35c62c 100644
10532--- a/arch/sparc/kernel/process_64.c
10533+++ b/arch/sparc/kernel/process_64.c
10534@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10535 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10536 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10537 if (regs->tstate & TSTATE_PRIV)
10538- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10539+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10540 }
10541
10542 void show_regs(struct pt_regs *regs)
10543@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10544
10545 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10546 regs->tpc, regs->tnpc, regs->y, print_tainted());
10547- printk("TPC: <%pS>\n", (void *) regs->tpc);
10548+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10549 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10550 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10551 regs->u_regs[3]);
10552@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10553 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10554 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10555 regs->u_regs[15]);
10556- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10557+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10558 show_regwindow(regs);
10559 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10560 }
10561@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10562 ((tp && tp->task) ? tp->task->pid : -1));
10563
10564 if (gp->tstate & TSTATE_PRIV) {
10565- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10566+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10567 (void *) gp->tpc,
10568 (void *) gp->o7,
10569 (void *) gp->i7,
10570diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10571index 79cc0d1..ec62734 100644
10572--- a/arch/sparc/kernel/prom_common.c
10573+++ b/arch/sparc/kernel/prom_common.c
10574@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10575
10576 unsigned int prom_early_allocated __initdata;
10577
10578-static struct of_pdt_ops prom_sparc_ops __initdata = {
10579+static struct of_pdt_ops prom_sparc_ops __initconst = {
10580 .nextprop = prom_common_nextprop,
10581 .getproplen = prom_getproplen,
10582 .getproperty = prom_getproperty,
10583diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10584index 9ddc492..27a5619 100644
10585--- a/arch/sparc/kernel/ptrace_64.c
10586+++ b/arch/sparc/kernel/ptrace_64.c
10587@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10588 return ret;
10589 }
10590
10591+#ifdef CONFIG_GRKERNSEC_SETXID
10592+extern void gr_delayed_cred_worker(void);
10593+#endif
10594+
10595 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10596 {
10597 int ret = 0;
10598@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10599 if (test_thread_flag(TIF_NOHZ))
10600 user_exit();
10601
10602+#ifdef CONFIG_GRKERNSEC_SETXID
10603+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10604+ gr_delayed_cred_worker();
10605+#endif
10606+
10607 if (test_thread_flag(TIF_SYSCALL_TRACE))
10608 ret = tracehook_report_syscall_entry(regs);
10609
10610@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10611 if (test_thread_flag(TIF_NOHZ))
10612 user_exit();
10613
10614+#ifdef CONFIG_GRKERNSEC_SETXID
10615+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10616+ gr_delayed_cred_worker();
10617+#endif
10618+
10619 audit_syscall_exit(regs);
10620
10621 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10622diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10623index 19cd08d..ff21e99 100644
10624--- a/arch/sparc/kernel/smp_64.c
10625+++ b/arch/sparc/kernel/smp_64.c
10626@@ -891,7 +891,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10627 return;
10628
10629 #ifdef CONFIG_DEBUG_DCFLUSH
10630- atomic_inc(&dcpage_flushes);
10631+ atomic_inc_unchecked(&dcpage_flushes);
10632 #endif
10633
10634 this_cpu = get_cpu();
10635@@ -915,7 +915,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10636 xcall_deliver(data0, __pa(pg_addr),
10637 (u64) pg_addr, cpumask_of(cpu));
10638 #ifdef CONFIG_DEBUG_DCFLUSH
10639- atomic_inc(&dcpage_flushes_xcall);
10640+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10641 #endif
10642 }
10643 }
10644@@ -934,7 +934,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10645 preempt_disable();
10646
10647 #ifdef CONFIG_DEBUG_DCFLUSH
10648- atomic_inc(&dcpage_flushes);
10649+ atomic_inc_unchecked(&dcpage_flushes);
10650 #endif
10651 data0 = 0;
10652 pg_addr = page_address(page);
10653@@ -951,7 +951,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10654 xcall_deliver(data0, __pa(pg_addr),
10655 (u64) pg_addr, cpu_online_mask);
10656 #ifdef CONFIG_DEBUG_DCFLUSH
10657- atomic_inc(&dcpage_flushes_xcall);
10658+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10659 #endif
10660 }
10661 __local_flush_dcache_page(page);
10662diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10663index 646988d..b88905f 100644
10664--- a/arch/sparc/kernel/sys_sparc_32.c
10665+++ b/arch/sparc/kernel/sys_sparc_32.c
10666@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10667 if (len > TASK_SIZE - PAGE_SIZE)
10668 return -ENOMEM;
10669 if (!addr)
10670- addr = TASK_UNMAPPED_BASE;
10671+ addr = current->mm->mmap_base;
10672
10673 info.flags = 0;
10674 info.length = len;
10675diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10676index 30e7ddb..266a3b0 100644
10677--- a/arch/sparc/kernel/sys_sparc_64.c
10678+++ b/arch/sparc/kernel/sys_sparc_64.c
10679@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10680 struct vm_area_struct * vma;
10681 unsigned long task_size = TASK_SIZE;
10682 int do_color_align;
10683+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10684 struct vm_unmapped_area_info info;
10685
10686 if (flags & MAP_FIXED) {
10687 /* We do not accept a shared mapping if it would violate
10688 * cache aliasing constraints.
10689 */
10690- if ((flags & MAP_SHARED) &&
10691+ if ((filp || (flags & MAP_SHARED)) &&
10692 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10693 return -EINVAL;
10694 return addr;
10695@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10696 if (filp || (flags & MAP_SHARED))
10697 do_color_align = 1;
10698
10699+#ifdef CONFIG_PAX_RANDMMAP
10700+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10701+#endif
10702+
10703 if (addr) {
10704 if (do_color_align)
10705 addr = COLOR_ALIGN(addr, pgoff);
10706@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10707 addr = PAGE_ALIGN(addr);
10708
10709 vma = find_vma(mm, addr);
10710- if (task_size - len >= addr &&
10711- (!vma || addr + len <= vma->vm_start))
10712+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10713 return addr;
10714 }
10715
10716 info.flags = 0;
10717 info.length = len;
10718- info.low_limit = TASK_UNMAPPED_BASE;
10719+ info.low_limit = mm->mmap_base;
10720 info.high_limit = min(task_size, VA_EXCLUDE_START);
10721 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10722 info.align_offset = pgoff << PAGE_SHIFT;
10723+ info.threadstack_offset = offset;
10724 addr = vm_unmapped_area(&info);
10725
10726 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10727 VM_BUG_ON(addr != -ENOMEM);
10728 info.low_limit = VA_EXCLUDE_END;
10729+
10730+#ifdef CONFIG_PAX_RANDMMAP
10731+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10732+ info.low_limit += mm->delta_mmap;
10733+#endif
10734+
10735 info.high_limit = task_size;
10736 addr = vm_unmapped_area(&info);
10737 }
10738@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10739 unsigned long task_size = STACK_TOP32;
10740 unsigned long addr = addr0;
10741 int do_color_align;
10742+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10743 struct vm_unmapped_area_info info;
10744
10745 /* This should only ever run for 32-bit processes. */
10746@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10747 /* We do not accept a shared mapping if it would violate
10748 * cache aliasing constraints.
10749 */
10750- if ((flags & MAP_SHARED) &&
10751+ if ((filp || (flags & MAP_SHARED)) &&
10752 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10753 return -EINVAL;
10754 return addr;
10755@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10756 if (filp || (flags & MAP_SHARED))
10757 do_color_align = 1;
10758
10759+#ifdef CONFIG_PAX_RANDMMAP
10760+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10761+#endif
10762+
10763 /* requesting a specific address */
10764 if (addr) {
10765 if (do_color_align)
10766@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10767 addr = PAGE_ALIGN(addr);
10768
10769 vma = find_vma(mm, addr);
10770- if (task_size - len >= addr &&
10771- (!vma || addr + len <= vma->vm_start))
10772+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10773 return addr;
10774 }
10775
10776@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10777 info.high_limit = mm->mmap_base;
10778 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10779 info.align_offset = pgoff << PAGE_SHIFT;
10780+ info.threadstack_offset = offset;
10781 addr = vm_unmapped_area(&info);
10782
10783 /*
10784@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10785 VM_BUG_ON(addr != -ENOMEM);
10786 info.flags = 0;
10787 info.low_limit = TASK_UNMAPPED_BASE;
10788+
10789+#ifdef CONFIG_PAX_RANDMMAP
10790+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10791+ info.low_limit += mm->delta_mmap;
10792+#endif
10793+
10794 info.high_limit = STACK_TOP32;
10795 addr = vm_unmapped_area(&info);
10796 }
10797@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10798 EXPORT_SYMBOL(get_fb_unmapped_area);
10799
10800 /* Essentially the same as PowerPC. */
10801-static unsigned long mmap_rnd(void)
10802+static unsigned long mmap_rnd(struct mm_struct *mm)
10803 {
10804 unsigned long rnd = 0UL;
10805
10806+#ifdef CONFIG_PAX_RANDMMAP
10807+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10808+#endif
10809+
10810 if (current->flags & PF_RANDOMIZE) {
10811 unsigned long val = get_random_int();
10812 if (test_thread_flag(TIF_32BIT))
10813@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10814
10815 void arch_pick_mmap_layout(struct mm_struct *mm)
10816 {
10817- unsigned long random_factor = mmap_rnd();
10818+ unsigned long random_factor = mmap_rnd(mm);
10819 unsigned long gap;
10820
10821 /*
10822@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10823 gap == RLIM_INFINITY ||
10824 sysctl_legacy_va_layout) {
10825 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10826+
10827+#ifdef CONFIG_PAX_RANDMMAP
10828+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10829+ mm->mmap_base += mm->delta_mmap;
10830+#endif
10831+
10832 mm->get_unmapped_area = arch_get_unmapped_area;
10833 } else {
10834 /* We know it's 32-bit */
10835@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10836 gap = (task_size / 6 * 5);
10837
10838 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10839+
10840+#ifdef CONFIG_PAX_RANDMMAP
10841+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10842+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10843+#endif
10844+
10845 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10846 }
10847 }
10848diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10849index bb00089..e0ea580 100644
10850--- a/arch/sparc/kernel/syscalls.S
10851+++ b/arch/sparc/kernel/syscalls.S
10852@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10853 #endif
10854 .align 32
10855 1: ldx [%g6 + TI_FLAGS], %l5
10856- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10857+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10858 be,pt %icc, rtrap
10859 nop
10860 call syscall_trace_leave
10861@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10862
10863 srl %i3, 0, %o3 ! IEU0
10864 srl %i2, 0, %o2 ! IEU0 Group
10865- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10866+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10867 bne,pn %icc, linux_syscall_trace32 ! CTI
10868 mov %i0, %l5 ! IEU1
10869 5: call %l7 ! CTI Group brk forced
10870@@ -218,7 +218,7 @@ linux_sparc_syscall:
10871
10872 mov %i3, %o3 ! IEU1
10873 mov %i4, %o4 ! IEU0 Group
10874- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10875+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10876 bne,pn %icc, linux_syscall_trace ! CTI Group
10877 mov %i0, %l5 ! IEU0
10878 2: call %l7 ! CTI Group brk forced
10879@@ -233,7 +233,7 @@ ret_sys_call:
10880
10881 cmp %o0, -ERESTART_RESTARTBLOCK
10882 bgeu,pn %xcc, 1f
10883- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10884+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10885 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10886
10887 2:
10888diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10889index 4f21df7..0a374da 100644
10890--- a/arch/sparc/kernel/traps_32.c
10891+++ b/arch/sparc/kernel/traps_32.c
10892@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10893 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10894 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10895
10896+extern void gr_handle_kernel_exploit(void);
10897+
10898 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10899 {
10900 static int die_counter;
10901@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10902 count++ < 30 &&
10903 (((unsigned long) rw) >= PAGE_OFFSET) &&
10904 !(((unsigned long) rw) & 0x7)) {
10905- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10906+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10907 (void *) rw->ins[7]);
10908 rw = (struct reg_window32 *)rw->ins[6];
10909 }
10910 }
10911 printk("Instruction DUMP:");
10912 instruction_dump ((unsigned long *) regs->pc);
10913- if(regs->psr & PSR_PS)
10914+ if(regs->psr & PSR_PS) {
10915+ gr_handle_kernel_exploit();
10916 do_exit(SIGKILL);
10917+ }
10918 do_exit(SIGSEGV);
10919 }
10920
10921diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10922index d21cd62..00a4a17 100644
10923--- a/arch/sparc/kernel/traps_64.c
10924+++ b/arch/sparc/kernel/traps_64.c
10925@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10926 i + 1,
10927 p->trapstack[i].tstate, p->trapstack[i].tpc,
10928 p->trapstack[i].tnpc, p->trapstack[i].tt);
10929- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10930+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10931 }
10932 }
10933
10934@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10935
10936 lvl -= 0x100;
10937 if (regs->tstate & TSTATE_PRIV) {
10938+
10939+#ifdef CONFIG_PAX_REFCOUNT
10940+ if (lvl == 6)
10941+ pax_report_refcount_overflow(regs);
10942+#endif
10943+
10944 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10945 die_if_kernel(buffer, regs);
10946 }
10947@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10948 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10949 {
10950 char buffer[32];
10951-
10952+
10953 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10954 0, lvl, SIGTRAP) == NOTIFY_STOP)
10955 return;
10956
10957+#ifdef CONFIG_PAX_REFCOUNT
10958+ if (lvl == 6)
10959+ pax_report_refcount_overflow(regs);
10960+#endif
10961+
10962 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10963
10964 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10965@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10966 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10967 printk("%s" "ERROR(%d): ",
10968 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10969- printk("TPC<%pS>\n", (void *) regs->tpc);
10970+ printk("TPC<%pA>\n", (void *) regs->tpc);
10971 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10972 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10973 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10974@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10975 smp_processor_id(),
10976 (type & 0x1) ? 'I' : 'D',
10977 regs->tpc);
10978- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10979+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10980 panic("Irrecoverable Cheetah+ parity error.");
10981 }
10982
10983@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10984 smp_processor_id(),
10985 (type & 0x1) ? 'I' : 'D',
10986 regs->tpc);
10987- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10988+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10989 }
10990
10991 struct sun4v_error_entry {
10992@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
10993 /*0x38*/u64 reserved_5;
10994 };
10995
10996-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10997-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10998+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10999+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11000
11001 static const char *sun4v_err_type_to_str(u8 type)
11002 {
11003@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11004 }
11005
11006 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11007- int cpu, const char *pfx, atomic_t *ocnt)
11008+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11009 {
11010 u64 *raw_ptr = (u64 *) ent;
11011 u32 attrs;
11012@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11013
11014 show_regs(regs);
11015
11016- if ((cnt = atomic_read(ocnt)) != 0) {
11017- atomic_set(ocnt, 0);
11018+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11019+ atomic_set_unchecked(ocnt, 0);
11020 wmb();
11021 printk("%s: Queue overflowed %d times.\n",
11022 pfx, cnt);
11023@@ -2048,7 +2059,7 @@ out:
11024 */
11025 void sun4v_resum_overflow(struct pt_regs *regs)
11026 {
11027- atomic_inc(&sun4v_resum_oflow_cnt);
11028+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11029 }
11030
11031 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11032@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11033 /* XXX Actually even this can make not that much sense. Perhaps
11034 * XXX we should just pull the plug and panic directly from here?
11035 */
11036- atomic_inc(&sun4v_nonresum_oflow_cnt);
11037+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11038 }
11039
11040 static void sun4v_tlb_error(struct pt_regs *regs)
11041@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11042
11043 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11044 regs->tpc, tl);
11045- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11046+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11047 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11048- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11049+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11050 (void *) regs->u_regs[UREG_I7]);
11051 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11052 "pte[%lx] error[%lx]\n",
11053@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11054
11055 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11056 regs->tpc, tl);
11057- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11058+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11059 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11060- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11061+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11062 (void *) regs->u_regs[UREG_I7]);
11063 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11064 "pte[%lx] error[%lx]\n",
11065@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11066 fp = (unsigned long)sf->fp + STACK_BIAS;
11067 }
11068
11069- printk(" [%016lx] %pS\n", pc, (void *) pc);
11070+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11071 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11072 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11073 int index = tsk->curr_ret_stack;
11074 if (tsk->ret_stack && index >= graph) {
11075 pc = tsk->ret_stack[index - graph].ret;
11076- printk(" [%016lx] %pS\n", pc, (void *) pc);
11077+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11078 graph++;
11079 }
11080 }
11081@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11082 return (struct reg_window *) (fp + STACK_BIAS);
11083 }
11084
11085+extern void gr_handle_kernel_exploit(void);
11086+
11087 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11088 {
11089 static int die_counter;
11090@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11091 while (rw &&
11092 count++ < 30 &&
11093 kstack_valid(tp, (unsigned long) rw)) {
11094- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11095+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11096 (void *) rw->ins[7]);
11097
11098 rw = kernel_stack_up(rw);
11099@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11100 }
11101 if (panic_on_oops)
11102 panic("Fatal exception");
11103- if (regs->tstate & TSTATE_PRIV)
11104+ if (regs->tstate & TSTATE_PRIV) {
11105+ gr_handle_kernel_exploit();
11106 do_exit(SIGKILL);
11107+ }
11108 do_exit(SIGSEGV);
11109 }
11110 EXPORT_SYMBOL(die_if_kernel);
11111diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11112index 62098a8..547ab2c 100644
11113--- a/arch/sparc/kernel/unaligned_64.c
11114+++ b/arch/sparc/kernel/unaligned_64.c
11115@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11116 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11117
11118 if (__ratelimit(&ratelimit)) {
11119- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11120+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11121 regs->tpc, (void *) regs->tpc);
11122 }
11123 }
11124diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11125index 3269b02..64f5231 100644
11126--- a/arch/sparc/lib/Makefile
11127+++ b/arch/sparc/lib/Makefile
11128@@ -2,7 +2,7 @@
11129 #
11130
11131 asflags-y := -ansi -DST_DIV0=0x02
11132-ccflags-y := -Werror
11133+#ccflags-y := -Werror
11134
11135 lib-$(CONFIG_SPARC32) += ashrdi3.o
11136 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11137diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11138index 05dac43..76f8ed4 100644
11139--- a/arch/sparc/lib/atomic_64.S
11140+++ b/arch/sparc/lib/atomic_64.S
11141@@ -15,11 +15,22 @@
11142 * a value and does the barriers.
11143 */
11144
11145-#define ATOMIC_OP(op) \
11146-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11147+#ifdef CONFIG_PAX_REFCOUNT
11148+#define __REFCOUNT_OP(op) op##cc
11149+#define __OVERFLOW_IOP tvs %icc, 6;
11150+#define __OVERFLOW_XOP tvs %xcc, 6;
11151+#else
11152+#define __REFCOUNT_OP(op) op
11153+#define __OVERFLOW_IOP
11154+#define __OVERFLOW_XOP
11155+#endif
11156+
11157+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11158+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11159 BACKOFF_SETUP(%o2); \
11160 1: lduw [%o1], %g1; \
11161- op %g1, %o0, %g7; \
11162+ asm_op %g1, %o0, %g7; \
11163+ post_op \
11164 cas [%o1], %g1, %g7; \
11165 cmp %g1, %g7; \
11166 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11167@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11168 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11169 ENDPROC(atomic_##op); \
11170
11171-#define ATOMIC_OP_RETURN(op) \
11172-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11173+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11174+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11175+
11176+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11177+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11178 BACKOFF_SETUP(%o2); \
11179 1: lduw [%o1], %g1; \
11180- op %g1, %o0, %g7; \
11181+ asm_op %g1, %o0, %g7; \
11182+ post_op \
11183 cas [%o1], %g1, %g7; \
11184 cmp %g1, %g7; \
11185 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11186@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11187 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11188 ENDPROC(atomic_##op##_return);
11189
11190+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11191+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11192+
11193 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11194
11195 ATOMIC_OPS(add)
11196@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11197
11198 #undef ATOMIC_OPS
11199 #undef ATOMIC_OP_RETURN
11200+#undef __ATOMIC_OP_RETURN
11201 #undef ATOMIC_OP
11202+#undef __ATOMIC_OP
11203
11204-#define ATOMIC64_OP(op) \
11205-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11206+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11207+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11208 BACKOFF_SETUP(%o2); \
11209 1: ldx [%o1], %g1; \
11210- op %g1, %o0, %g7; \
11211+ asm_op %g1, %o0, %g7; \
11212+ post_op \
11213 casx [%o1], %g1, %g7; \
11214 cmp %g1, %g7; \
11215 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11216@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11217 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11218 ENDPROC(atomic64_##op); \
11219
11220-#define ATOMIC64_OP_RETURN(op) \
11221-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11222+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11223+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11224+
11225+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11226+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11227 BACKOFF_SETUP(%o2); \
11228 1: ldx [%o1], %g1; \
11229- op %g1, %o0, %g7; \
11230+ asm_op %g1, %o0, %g7; \
11231+ post_op \
11232 casx [%o1], %g1, %g7; \
11233 cmp %g1, %g7; \
11234 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11235@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11236 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11237 ENDPROC(atomic64_##op##_return);
11238
11239+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11240+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11241+
11242 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11243
11244 ATOMIC64_OPS(add)
11245@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11246
11247 #undef ATOMIC64_OPS
11248 #undef ATOMIC64_OP_RETURN
11249+#undef __ATOMIC64_OP_RETURN
11250 #undef ATOMIC64_OP
11251+#undef __ATOMIC64_OP
11252+#undef __OVERFLOW_XOP
11253+#undef __OVERFLOW_IOP
11254+#undef __REFCOUNT_OP
11255
11256 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11257 BACKOFF_SETUP(%o2)
11258diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11259index 8069ce1..c2e23c4 100644
11260--- a/arch/sparc/lib/ksyms.c
11261+++ b/arch/sparc/lib/ksyms.c
11262@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11263 /* Atomic counter implementation. */
11264 #define ATOMIC_OP(op) \
11265 EXPORT_SYMBOL(atomic_##op); \
11266-EXPORT_SYMBOL(atomic64_##op);
11267+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11268+EXPORT_SYMBOL(atomic64_##op); \
11269+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11270
11271 #define ATOMIC_OP_RETURN(op) \
11272 EXPORT_SYMBOL(atomic_##op##_return); \
11273@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11274 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11275
11276 ATOMIC_OPS(add)
11277+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11278+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11279 ATOMIC_OPS(sub)
11280
11281 #undef ATOMIC_OPS
11282diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11283index 30c3ecc..736f015 100644
11284--- a/arch/sparc/mm/Makefile
11285+++ b/arch/sparc/mm/Makefile
11286@@ -2,7 +2,7 @@
11287 #
11288
11289 asflags-y := -ansi
11290-ccflags-y := -Werror
11291+#ccflags-y := -Werror
11292
11293 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11294 obj-y += fault_$(BITS).o
11295diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11296index 70d8171..274c6c0 100644
11297--- a/arch/sparc/mm/fault_32.c
11298+++ b/arch/sparc/mm/fault_32.c
11299@@ -21,6 +21,9 @@
11300 #include <linux/perf_event.h>
11301 #include <linux/interrupt.h>
11302 #include <linux/kdebug.h>
11303+#include <linux/slab.h>
11304+#include <linux/pagemap.h>
11305+#include <linux/compiler.h>
11306
11307 #include <asm/page.h>
11308 #include <asm/pgtable.h>
11309@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11310 return safe_compute_effective_address(regs, insn);
11311 }
11312
11313+#ifdef CONFIG_PAX_PAGEEXEC
11314+#ifdef CONFIG_PAX_DLRESOLVE
11315+static void pax_emuplt_close(struct vm_area_struct *vma)
11316+{
11317+ vma->vm_mm->call_dl_resolve = 0UL;
11318+}
11319+
11320+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11321+{
11322+ unsigned int *kaddr;
11323+
11324+ vmf->page = alloc_page(GFP_HIGHUSER);
11325+ if (!vmf->page)
11326+ return VM_FAULT_OOM;
11327+
11328+ kaddr = kmap(vmf->page);
11329+ memset(kaddr, 0, PAGE_SIZE);
11330+ kaddr[0] = 0x9DE3BFA8U; /* save */
11331+ flush_dcache_page(vmf->page);
11332+ kunmap(vmf->page);
11333+ return VM_FAULT_MAJOR;
11334+}
11335+
11336+static const struct vm_operations_struct pax_vm_ops = {
11337+ .close = pax_emuplt_close,
11338+ .fault = pax_emuplt_fault
11339+};
11340+
11341+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11342+{
11343+ int ret;
11344+
11345+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11346+ vma->vm_mm = current->mm;
11347+ vma->vm_start = addr;
11348+ vma->vm_end = addr + PAGE_SIZE;
11349+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11350+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11351+ vma->vm_ops = &pax_vm_ops;
11352+
11353+ ret = insert_vm_struct(current->mm, vma);
11354+ if (ret)
11355+ return ret;
11356+
11357+ ++current->mm->total_vm;
11358+ return 0;
11359+}
11360+#endif
11361+
11362+/*
11363+ * PaX: decide what to do with offenders (regs->pc = fault address)
11364+ *
11365+ * returns 1 when task should be killed
11366+ * 2 when patched PLT trampoline was detected
11367+ * 3 when unpatched PLT trampoline was detected
11368+ */
11369+static int pax_handle_fetch_fault(struct pt_regs *regs)
11370+{
11371+
11372+#ifdef CONFIG_PAX_EMUPLT
11373+ int err;
11374+
11375+ do { /* PaX: patched PLT emulation #1 */
11376+ unsigned int sethi1, sethi2, jmpl;
11377+
11378+ err = get_user(sethi1, (unsigned int *)regs->pc);
11379+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11380+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11381+
11382+ if (err)
11383+ break;
11384+
11385+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11386+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11387+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11388+ {
11389+ unsigned int addr;
11390+
11391+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11392+ addr = regs->u_regs[UREG_G1];
11393+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11394+ regs->pc = addr;
11395+ regs->npc = addr+4;
11396+ return 2;
11397+ }
11398+ } while (0);
11399+
11400+ do { /* PaX: patched PLT emulation #2 */
11401+ unsigned int ba;
11402+
11403+ err = get_user(ba, (unsigned int *)regs->pc);
11404+
11405+ if (err)
11406+ break;
11407+
11408+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11409+ unsigned int addr;
11410+
11411+ if ((ba & 0xFFC00000U) == 0x30800000U)
11412+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11413+ else
11414+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11415+ regs->pc = addr;
11416+ regs->npc = addr+4;
11417+ return 2;
11418+ }
11419+ } while (0);
11420+
11421+ do { /* PaX: patched PLT emulation #3 */
11422+ unsigned int sethi, bajmpl, nop;
11423+
11424+ err = get_user(sethi, (unsigned int *)regs->pc);
11425+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11426+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11427+
11428+ if (err)
11429+ break;
11430+
11431+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11432+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11433+ nop == 0x01000000U)
11434+ {
11435+ unsigned int addr;
11436+
11437+ addr = (sethi & 0x003FFFFFU) << 10;
11438+ regs->u_regs[UREG_G1] = addr;
11439+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11440+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11441+ else
11442+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11443+ regs->pc = addr;
11444+ regs->npc = addr+4;
11445+ return 2;
11446+ }
11447+ } while (0);
11448+
11449+ do { /* PaX: unpatched PLT emulation step 1 */
11450+ unsigned int sethi, ba, nop;
11451+
11452+ err = get_user(sethi, (unsigned int *)regs->pc);
11453+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11454+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11455+
11456+ if (err)
11457+ break;
11458+
11459+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11460+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11461+ nop == 0x01000000U)
11462+ {
11463+ unsigned int addr, save, call;
11464+
11465+ if ((ba & 0xFFC00000U) == 0x30800000U)
11466+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11467+ else
11468+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11469+
11470+ err = get_user(save, (unsigned int *)addr);
11471+ err |= get_user(call, (unsigned int *)(addr+4));
11472+ err |= get_user(nop, (unsigned int *)(addr+8));
11473+ if (err)
11474+ break;
11475+
11476+#ifdef CONFIG_PAX_DLRESOLVE
11477+ if (save == 0x9DE3BFA8U &&
11478+ (call & 0xC0000000U) == 0x40000000U &&
11479+ nop == 0x01000000U)
11480+ {
11481+ struct vm_area_struct *vma;
11482+ unsigned long call_dl_resolve;
11483+
11484+ down_read(&current->mm->mmap_sem);
11485+ call_dl_resolve = current->mm->call_dl_resolve;
11486+ up_read(&current->mm->mmap_sem);
11487+ if (likely(call_dl_resolve))
11488+ goto emulate;
11489+
11490+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11491+
11492+ down_write(&current->mm->mmap_sem);
11493+ if (current->mm->call_dl_resolve) {
11494+ call_dl_resolve = current->mm->call_dl_resolve;
11495+ up_write(&current->mm->mmap_sem);
11496+ if (vma)
11497+ kmem_cache_free(vm_area_cachep, vma);
11498+ goto emulate;
11499+ }
11500+
11501+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11502+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11503+ up_write(&current->mm->mmap_sem);
11504+ if (vma)
11505+ kmem_cache_free(vm_area_cachep, vma);
11506+ return 1;
11507+ }
11508+
11509+ if (pax_insert_vma(vma, call_dl_resolve)) {
11510+ up_write(&current->mm->mmap_sem);
11511+ kmem_cache_free(vm_area_cachep, vma);
11512+ return 1;
11513+ }
11514+
11515+ current->mm->call_dl_resolve = call_dl_resolve;
11516+ up_write(&current->mm->mmap_sem);
11517+
11518+emulate:
11519+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11520+ regs->pc = call_dl_resolve;
11521+ regs->npc = addr+4;
11522+ return 3;
11523+ }
11524+#endif
11525+
11526+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11527+ if ((save & 0xFFC00000U) == 0x05000000U &&
11528+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11529+ nop == 0x01000000U)
11530+ {
11531+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11532+ regs->u_regs[UREG_G2] = addr + 4;
11533+ addr = (save & 0x003FFFFFU) << 10;
11534+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11535+ regs->pc = addr;
11536+ regs->npc = addr+4;
11537+ return 3;
11538+ }
11539+ }
11540+ } while (0);
11541+
11542+ do { /* PaX: unpatched PLT emulation step 2 */
11543+ unsigned int save, call, nop;
11544+
11545+ err = get_user(save, (unsigned int *)(regs->pc-4));
11546+ err |= get_user(call, (unsigned int *)regs->pc);
11547+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11548+ if (err)
11549+ break;
11550+
11551+ if (save == 0x9DE3BFA8U &&
11552+ (call & 0xC0000000U) == 0x40000000U &&
11553+ nop == 0x01000000U)
11554+ {
11555+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11556+
11557+ regs->u_regs[UREG_RETPC] = regs->pc;
11558+ regs->pc = dl_resolve;
11559+ regs->npc = dl_resolve+4;
11560+ return 3;
11561+ }
11562+ } while (0);
11563+#endif
11564+
11565+ return 1;
11566+}
11567+
11568+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11569+{
11570+ unsigned long i;
11571+
11572+ printk(KERN_ERR "PAX: bytes at PC: ");
11573+ for (i = 0; i < 8; i++) {
11574+ unsigned int c;
11575+ if (get_user(c, (unsigned int *)pc+i))
11576+ printk(KERN_CONT "???????? ");
11577+ else
11578+ printk(KERN_CONT "%08x ", c);
11579+ }
11580+ printk("\n");
11581+}
11582+#endif
11583+
11584 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11585 int text_fault)
11586 {
11587@@ -226,6 +500,24 @@ good_area:
11588 if (!(vma->vm_flags & VM_WRITE))
11589 goto bad_area;
11590 } else {
11591+
11592+#ifdef CONFIG_PAX_PAGEEXEC
11593+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11594+ up_read(&mm->mmap_sem);
11595+ switch (pax_handle_fetch_fault(regs)) {
11596+
11597+#ifdef CONFIG_PAX_EMUPLT
11598+ case 2:
11599+ case 3:
11600+ return;
11601+#endif
11602+
11603+ }
11604+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11605+ do_group_exit(SIGKILL);
11606+ }
11607+#endif
11608+
11609 /* Allow reads even for write-only mappings */
11610 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11611 goto bad_area;
11612diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11613index 4798232..f76e3aa 100644
11614--- a/arch/sparc/mm/fault_64.c
11615+++ b/arch/sparc/mm/fault_64.c
11616@@ -22,6 +22,9 @@
11617 #include <linux/kdebug.h>
11618 #include <linux/percpu.h>
11619 #include <linux/context_tracking.h>
11620+#include <linux/slab.h>
11621+#include <linux/pagemap.h>
11622+#include <linux/compiler.h>
11623
11624 #include <asm/page.h>
11625 #include <asm/pgtable.h>
11626@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11627 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11628 regs->tpc);
11629 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11630- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11631+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11632 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11633 dump_stack();
11634 unhandled_fault(regs->tpc, current, regs);
11635@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11636 show_regs(regs);
11637 }
11638
11639+#ifdef CONFIG_PAX_PAGEEXEC
11640+#ifdef CONFIG_PAX_DLRESOLVE
11641+static void pax_emuplt_close(struct vm_area_struct *vma)
11642+{
11643+ vma->vm_mm->call_dl_resolve = 0UL;
11644+}
11645+
11646+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11647+{
11648+ unsigned int *kaddr;
11649+
11650+ vmf->page = alloc_page(GFP_HIGHUSER);
11651+ if (!vmf->page)
11652+ return VM_FAULT_OOM;
11653+
11654+ kaddr = kmap(vmf->page);
11655+ memset(kaddr, 0, PAGE_SIZE);
11656+ kaddr[0] = 0x9DE3BFA8U; /* save */
11657+ flush_dcache_page(vmf->page);
11658+ kunmap(vmf->page);
11659+ return VM_FAULT_MAJOR;
11660+}
11661+
11662+static const struct vm_operations_struct pax_vm_ops = {
11663+ .close = pax_emuplt_close,
11664+ .fault = pax_emuplt_fault
11665+};
11666+
11667+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11668+{
11669+ int ret;
11670+
11671+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11672+ vma->vm_mm = current->mm;
11673+ vma->vm_start = addr;
11674+ vma->vm_end = addr + PAGE_SIZE;
11675+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11676+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11677+ vma->vm_ops = &pax_vm_ops;
11678+
11679+ ret = insert_vm_struct(current->mm, vma);
11680+ if (ret)
11681+ return ret;
11682+
11683+ ++current->mm->total_vm;
11684+ return 0;
11685+}
11686+#endif
11687+
11688+/*
11689+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11690+ *
11691+ * returns 1 when task should be killed
11692+ * 2 when patched PLT trampoline was detected
11693+ * 3 when unpatched PLT trampoline was detected
11694+ */
11695+static int pax_handle_fetch_fault(struct pt_regs *regs)
11696+{
11697+
11698+#ifdef CONFIG_PAX_EMUPLT
11699+ int err;
11700+
11701+ do { /* PaX: patched PLT emulation #1 */
11702+ unsigned int sethi1, sethi2, jmpl;
11703+
11704+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11705+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11706+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11707+
11708+ if (err)
11709+ break;
11710+
11711+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11712+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11713+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11714+ {
11715+ unsigned long addr;
11716+
11717+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11718+ addr = regs->u_regs[UREG_G1];
11719+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11720+
11721+ if (test_thread_flag(TIF_32BIT))
11722+ addr &= 0xFFFFFFFFUL;
11723+
11724+ regs->tpc = addr;
11725+ regs->tnpc = addr+4;
11726+ return 2;
11727+ }
11728+ } while (0);
11729+
11730+ do { /* PaX: patched PLT emulation #2 */
11731+ unsigned int ba;
11732+
11733+ err = get_user(ba, (unsigned int *)regs->tpc);
11734+
11735+ if (err)
11736+ break;
11737+
11738+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11739+ unsigned long addr;
11740+
11741+ if ((ba & 0xFFC00000U) == 0x30800000U)
11742+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11743+ else
11744+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11745+
11746+ if (test_thread_flag(TIF_32BIT))
11747+ addr &= 0xFFFFFFFFUL;
11748+
11749+ regs->tpc = addr;
11750+ regs->tnpc = addr+4;
11751+ return 2;
11752+ }
11753+ } while (0);
11754+
11755+ do { /* PaX: patched PLT emulation #3 */
11756+ unsigned int sethi, bajmpl, nop;
11757+
11758+ err = get_user(sethi, (unsigned int *)regs->tpc);
11759+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11760+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11761+
11762+ if (err)
11763+ break;
11764+
11765+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11766+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11767+ nop == 0x01000000U)
11768+ {
11769+ unsigned long addr;
11770+
11771+ addr = (sethi & 0x003FFFFFU) << 10;
11772+ regs->u_regs[UREG_G1] = addr;
11773+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11774+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11775+ else
11776+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11777+
11778+ if (test_thread_flag(TIF_32BIT))
11779+ addr &= 0xFFFFFFFFUL;
11780+
11781+ regs->tpc = addr;
11782+ regs->tnpc = addr+4;
11783+ return 2;
11784+ }
11785+ } while (0);
11786+
11787+ do { /* PaX: patched PLT emulation #4 */
11788+ unsigned int sethi, mov1, call, mov2;
11789+
11790+ err = get_user(sethi, (unsigned int *)regs->tpc);
11791+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11792+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11793+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11794+
11795+ if (err)
11796+ break;
11797+
11798+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11799+ mov1 == 0x8210000FU &&
11800+ (call & 0xC0000000U) == 0x40000000U &&
11801+ mov2 == 0x9E100001U)
11802+ {
11803+ unsigned long addr;
11804+
11805+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11806+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11807+
11808+ if (test_thread_flag(TIF_32BIT))
11809+ addr &= 0xFFFFFFFFUL;
11810+
11811+ regs->tpc = addr;
11812+ regs->tnpc = addr+4;
11813+ return 2;
11814+ }
11815+ } while (0);
11816+
11817+ do { /* PaX: patched PLT emulation #5 */
11818+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11819+
11820+ err = get_user(sethi, (unsigned int *)regs->tpc);
11821+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11822+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11823+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11824+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11825+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11826+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11827+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11828+
11829+ if (err)
11830+ break;
11831+
11832+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11833+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11834+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11835+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11836+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11837+ sllx == 0x83287020U &&
11838+ jmpl == 0x81C04005U &&
11839+ nop == 0x01000000U)
11840+ {
11841+ unsigned long addr;
11842+
11843+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11844+ regs->u_regs[UREG_G1] <<= 32;
11845+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11846+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11847+ regs->tpc = addr;
11848+ regs->tnpc = addr+4;
11849+ return 2;
11850+ }
11851+ } while (0);
11852+
11853+ do { /* PaX: patched PLT emulation #6 */
11854+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11855+
11856+ err = get_user(sethi, (unsigned int *)regs->tpc);
11857+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11858+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11859+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11860+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11861+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11862+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11863+
11864+ if (err)
11865+ break;
11866+
11867+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11868+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11869+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11870+ sllx == 0x83287020U &&
11871+ (or & 0xFFFFE000U) == 0x8A116000U &&
11872+ jmpl == 0x81C04005U &&
11873+ nop == 0x01000000U)
11874+ {
11875+ unsigned long addr;
11876+
11877+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11878+ regs->u_regs[UREG_G1] <<= 32;
11879+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11880+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11881+ regs->tpc = addr;
11882+ regs->tnpc = addr+4;
11883+ return 2;
11884+ }
11885+ } while (0);
11886+
11887+ do { /* PaX: unpatched PLT emulation step 1 */
11888+ unsigned int sethi, ba, nop;
11889+
11890+ err = get_user(sethi, (unsigned int *)regs->tpc);
11891+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11892+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11893+
11894+ if (err)
11895+ break;
11896+
11897+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11898+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11899+ nop == 0x01000000U)
11900+ {
11901+ unsigned long addr;
11902+ unsigned int save, call;
11903+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11904+
11905+ if ((ba & 0xFFC00000U) == 0x30800000U)
11906+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11907+ else
11908+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11909+
11910+ if (test_thread_flag(TIF_32BIT))
11911+ addr &= 0xFFFFFFFFUL;
11912+
11913+ err = get_user(save, (unsigned int *)addr);
11914+ err |= get_user(call, (unsigned int *)(addr+4));
11915+ err |= get_user(nop, (unsigned int *)(addr+8));
11916+ if (err)
11917+ break;
11918+
11919+#ifdef CONFIG_PAX_DLRESOLVE
11920+ if (save == 0x9DE3BFA8U &&
11921+ (call & 0xC0000000U) == 0x40000000U &&
11922+ nop == 0x01000000U)
11923+ {
11924+ struct vm_area_struct *vma;
11925+ unsigned long call_dl_resolve;
11926+
11927+ down_read(&current->mm->mmap_sem);
11928+ call_dl_resolve = current->mm->call_dl_resolve;
11929+ up_read(&current->mm->mmap_sem);
11930+ if (likely(call_dl_resolve))
11931+ goto emulate;
11932+
11933+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11934+
11935+ down_write(&current->mm->mmap_sem);
11936+ if (current->mm->call_dl_resolve) {
11937+ call_dl_resolve = current->mm->call_dl_resolve;
11938+ up_write(&current->mm->mmap_sem);
11939+ if (vma)
11940+ kmem_cache_free(vm_area_cachep, vma);
11941+ goto emulate;
11942+ }
11943+
11944+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11945+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11946+ up_write(&current->mm->mmap_sem);
11947+ if (vma)
11948+ kmem_cache_free(vm_area_cachep, vma);
11949+ return 1;
11950+ }
11951+
11952+ if (pax_insert_vma(vma, call_dl_resolve)) {
11953+ up_write(&current->mm->mmap_sem);
11954+ kmem_cache_free(vm_area_cachep, vma);
11955+ return 1;
11956+ }
11957+
11958+ current->mm->call_dl_resolve = call_dl_resolve;
11959+ up_write(&current->mm->mmap_sem);
11960+
11961+emulate:
11962+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11963+ regs->tpc = call_dl_resolve;
11964+ regs->tnpc = addr+4;
11965+ return 3;
11966+ }
11967+#endif
11968+
11969+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11970+ if ((save & 0xFFC00000U) == 0x05000000U &&
11971+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11972+ nop == 0x01000000U)
11973+ {
11974+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11975+ regs->u_regs[UREG_G2] = addr + 4;
11976+ addr = (save & 0x003FFFFFU) << 10;
11977+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11978+
11979+ if (test_thread_flag(TIF_32BIT))
11980+ addr &= 0xFFFFFFFFUL;
11981+
11982+ regs->tpc = addr;
11983+ regs->tnpc = addr+4;
11984+ return 3;
11985+ }
11986+
11987+ /* PaX: 64-bit PLT stub */
11988+ err = get_user(sethi1, (unsigned int *)addr);
11989+ err |= get_user(sethi2, (unsigned int *)(addr+4));
11990+ err |= get_user(or1, (unsigned int *)(addr+8));
11991+ err |= get_user(or2, (unsigned int *)(addr+12));
11992+ err |= get_user(sllx, (unsigned int *)(addr+16));
11993+ err |= get_user(add, (unsigned int *)(addr+20));
11994+ err |= get_user(jmpl, (unsigned int *)(addr+24));
11995+ err |= get_user(nop, (unsigned int *)(addr+28));
11996+ if (err)
11997+ break;
11998+
11999+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12000+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12001+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12002+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12003+ sllx == 0x89293020U &&
12004+ add == 0x8A010005U &&
12005+ jmpl == 0x89C14000U &&
12006+ nop == 0x01000000U)
12007+ {
12008+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12009+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12010+ regs->u_regs[UREG_G4] <<= 32;
12011+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12012+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12013+ regs->u_regs[UREG_G4] = addr + 24;
12014+ addr = regs->u_regs[UREG_G5];
12015+ regs->tpc = addr;
12016+ regs->tnpc = addr+4;
12017+ return 3;
12018+ }
12019+ }
12020+ } while (0);
12021+
12022+#ifdef CONFIG_PAX_DLRESOLVE
12023+ do { /* PaX: unpatched PLT emulation step 2 */
12024+ unsigned int save, call, nop;
12025+
12026+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12027+ err |= get_user(call, (unsigned int *)regs->tpc);
12028+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12029+ if (err)
12030+ break;
12031+
12032+ if (save == 0x9DE3BFA8U &&
12033+ (call & 0xC0000000U) == 0x40000000U &&
12034+ nop == 0x01000000U)
12035+ {
12036+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12037+
12038+ if (test_thread_flag(TIF_32BIT))
12039+ dl_resolve &= 0xFFFFFFFFUL;
12040+
12041+ regs->u_regs[UREG_RETPC] = regs->tpc;
12042+ regs->tpc = dl_resolve;
12043+ regs->tnpc = dl_resolve+4;
12044+ return 3;
12045+ }
12046+ } while (0);
12047+#endif
12048+
12049+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12050+ unsigned int sethi, ba, nop;
12051+
12052+ err = get_user(sethi, (unsigned int *)regs->tpc);
12053+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12054+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12055+
12056+ if (err)
12057+ break;
12058+
12059+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12060+ (ba & 0xFFF00000U) == 0x30600000U &&
12061+ nop == 0x01000000U)
12062+ {
12063+ unsigned long addr;
12064+
12065+ addr = (sethi & 0x003FFFFFU) << 10;
12066+ regs->u_regs[UREG_G1] = addr;
12067+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12068+
12069+ if (test_thread_flag(TIF_32BIT))
12070+ addr &= 0xFFFFFFFFUL;
12071+
12072+ regs->tpc = addr;
12073+ regs->tnpc = addr+4;
12074+ return 2;
12075+ }
12076+ } while (0);
12077+
12078+#endif
12079+
12080+ return 1;
12081+}
12082+
12083+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12084+{
12085+ unsigned long i;
12086+
12087+ printk(KERN_ERR "PAX: bytes at PC: ");
12088+ for (i = 0; i < 8; i++) {
12089+ unsigned int c;
12090+ if (get_user(c, (unsigned int *)pc+i))
12091+ printk(KERN_CONT "???????? ");
12092+ else
12093+ printk(KERN_CONT "%08x ", c);
12094+ }
12095+ printk("\n");
12096+}
12097+#endif
12098+
12099 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12100 {
12101 enum ctx_state prev_state = exception_enter();
12102@@ -353,6 +816,29 @@ retry:
12103 if (!vma)
12104 goto bad_area;
12105
12106+#ifdef CONFIG_PAX_PAGEEXEC
12107+ /* PaX: detect ITLB misses on non-exec pages */
12108+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12109+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12110+ {
12111+ if (address != regs->tpc)
12112+ goto good_area;
12113+
12114+ up_read(&mm->mmap_sem);
12115+ switch (pax_handle_fetch_fault(regs)) {
12116+
12117+#ifdef CONFIG_PAX_EMUPLT
12118+ case 2:
12119+ case 3:
12120+ return;
12121+#endif
12122+
12123+ }
12124+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12125+ do_group_exit(SIGKILL);
12126+ }
12127+#endif
12128+
12129 /* Pure DTLB misses do not tell us whether the fault causing
12130 * load/store/atomic was a write or not, it only says that there
12131 * was no match. So in such a case we (carefully) read the
12132diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12133index 4242eab..9ae6360 100644
12134--- a/arch/sparc/mm/hugetlbpage.c
12135+++ b/arch/sparc/mm/hugetlbpage.c
12136@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12137 unsigned long addr,
12138 unsigned long len,
12139 unsigned long pgoff,
12140- unsigned long flags)
12141+ unsigned long flags,
12142+ unsigned long offset)
12143 {
12144+ struct mm_struct *mm = current->mm;
12145 unsigned long task_size = TASK_SIZE;
12146 struct vm_unmapped_area_info info;
12147
12148@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12149
12150 info.flags = 0;
12151 info.length = len;
12152- info.low_limit = TASK_UNMAPPED_BASE;
12153+ info.low_limit = mm->mmap_base;
12154 info.high_limit = min(task_size, VA_EXCLUDE_START);
12155 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12156 info.align_offset = 0;
12157+ info.threadstack_offset = offset;
12158 addr = vm_unmapped_area(&info);
12159
12160 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12161 VM_BUG_ON(addr != -ENOMEM);
12162 info.low_limit = VA_EXCLUDE_END;
12163+
12164+#ifdef CONFIG_PAX_RANDMMAP
12165+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12166+ info.low_limit += mm->delta_mmap;
12167+#endif
12168+
12169 info.high_limit = task_size;
12170 addr = vm_unmapped_area(&info);
12171 }
12172@@ -55,7 +64,8 @@ static unsigned long
12173 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12174 const unsigned long len,
12175 const unsigned long pgoff,
12176- const unsigned long flags)
12177+ const unsigned long flags,
12178+ const unsigned long offset)
12179 {
12180 struct mm_struct *mm = current->mm;
12181 unsigned long addr = addr0;
12182@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12183 info.high_limit = mm->mmap_base;
12184 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12185 info.align_offset = 0;
12186+ info.threadstack_offset = offset;
12187 addr = vm_unmapped_area(&info);
12188
12189 /*
12190@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12191 VM_BUG_ON(addr != -ENOMEM);
12192 info.flags = 0;
12193 info.low_limit = TASK_UNMAPPED_BASE;
12194+
12195+#ifdef CONFIG_PAX_RANDMMAP
12196+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12197+ info.low_limit += mm->delta_mmap;
12198+#endif
12199+
12200 info.high_limit = STACK_TOP32;
12201 addr = vm_unmapped_area(&info);
12202 }
12203@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12204 struct mm_struct *mm = current->mm;
12205 struct vm_area_struct *vma;
12206 unsigned long task_size = TASK_SIZE;
12207+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12208
12209 if (test_thread_flag(TIF_32BIT))
12210 task_size = STACK_TOP32;
12211@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12212 return addr;
12213 }
12214
12215+#ifdef CONFIG_PAX_RANDMMAP
12216+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12217+#endif
12218+
12219 if (addr) {
12220 addr = ALIGN(addr, HPAGE_SIZE);
12221 vma = find_vma(mm, addr);
12222- if (task_size - len >= addr &&
12223- (!vma || addr + len <= vma->vm_start))
12224+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12225 return addr;
12226 }
12227 if (mm->get_unmapped_area == arch_get_unmapped_area)
12228 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12229- pgoff, flags);
12230+ pgoff, flags, offset);
12231 else
12232 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12233- pgoff, flags);
12234+ pgoff, flags, offset);
12235 }
12236
12237 pte_t *huge_pte_alloc(struct mm_struct *mm,
12238diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12239index 559cb74..9e5f097 100644
12240--- a/arch/sparc/mm/init_64.c
12241+++ b/arch/sparc/mm/init_64.c
12242@@ -187,9 +187,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12243 int num_kernel_image_mappings;
12244
12245 #ifdef CONFIG_DEBUG_DCFLUSH
12246-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12247+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12248 #ifdef CONFIG_SMP
12249-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12250+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12251 #endif
12252 #endif
12253
12254@@ -197,7 +197,7 @@ inline void flush_dcache_page_impl(struct page *page)
12255 {
12256 BUG_ON(tlb_type == hypervisor);
12257 #ifdef CONFIG_DEBUG_DCFLUSH
12258- atomic_inc(&dcpage_flushes);
12259+ atomic_inc_unchecked(&dcpage_flushes);
12260 #endif
12261
12262 #ifdef DCACHE_ALIASING_POSSIBLE
12263@@ -469,10 +469,10 @@ void mmu_info(struct seq_file *m)
12264
12265 #ifdef CONFIG_DEBUG_DCFLUSH
12266 seq_printf(m, "DCPageFlushes\t: %d\n",
12267- atomic_read(&dcpage_flushes));
12268+ atomic_read_unchecked(&dcpage_flushes));
12269 #ifdef CONFIG_SMP
12270 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12271- atomic_read(&dcpage_flushes_xcall));
12272+ atomic_read_unchecked(&dcpage_flushes_xcall));
12273 #endif /* CONFIG_SMP */
12274 #endif /* CONFIG_DEBUG_DCFLUSH */
12275 }
12276diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12277index a07e31b..85c9003 100644
12278--- a/arch/tile/Kconfig
12279+++ b/arch/tile/Kconfig
12280@@ -198,6 +198,7 @@ source "kernel/Kconfig.hz"
12281
12282 config KEXEC
12283 bool "kexec system call"
12284+ depends on !GRKERNSEC_KMEM
12285 ---help---
12286 kexec is a system call that implements the ability to shutdown your
12287 current kernel, and to start another kernel. It is like a reboot
12288diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12289index 7b11c5f..755a026 100644
12290--- a/arch/tile/include/asm/atomic_64.h
12291+++ b/arch/tile/include/asm/atomic_64.h
12292@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12293
12294 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12295
12296+#define atomic64_read_unchecked(v) atomic64_read(v)
12297+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12298+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12299+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12300+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12301+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12302+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12303+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12304+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12305+
12306 /* Define this to indicate that cmpxchg is an efficient operation. */
12307 #define __HAVE_ARCH_CMPXCHG
12308
12309diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12310index 6160761..00cac88 100644
12311--- a/arch/tile/include/asm/cache.h
12312+++ b/arch/tile/include/asm/cache.h
12313@@ -15,11 +15,12 @@
12314 #ifndef _ASM_TILE_CACHE_H
12315 #define _ASM_TILE_CACHE_H
12316
12317+#include <linux/const.h>
12318 #include <arch/chip.h>
12319
12320 /* bytes per L1 data cache line */
12321 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12322-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12323+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12324
12325 /* bytes per L2 cache line */
12326 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12327diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12328index f41cb53..31d3ab4 100644
12329--- a/arch/tile/include/asm/uaccess.h
12330+++ b/arch/tile/include/asm/uaccess.h
12331@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12332 const void __user *from,
12333 unsigned long n)
12334 {
12335- int sz = __compiletime_object_size(to);
12336+ size_t sz = __compiletime_object_size(to);
12337
12338- if (likely(sz == -1 || sz >= n))
12339+ if (likely(sz == (size_t)-1 || sz >= n))
12340 n = _copy_from_user(to, from, n);
12341 else
12342 copy_from_user_overflow();
12343diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12344index 8416240..a012fb7 100644
12345--- a/arch/tile/mm/hugetlbpage.c
12346+++ b/arch/tile/mm/hugetlbpage.c
12347@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12348 info.high_limit = TASK_SIZE;
12349 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12350 info.align_offset = 0;
12351+ info.threadstack_offset = 0;
12352 return vm_unmapped_area(&info);
12353 }
12354
12355@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12356 info.high_limit = current->mm->mmap_base;
12357 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12358 info.align_offset = 0;
12359+ info.threadstack_offset = 0;
12360 addr = vm_unmapped_area(&info);
12361
12362 /*
12363diff --git a/arch/um/Makefile b/arch/um/Makefile
12364index 17d4460..9d74338e3de4 100644
12365--- a/arch/um/Makefile
12366+++ b/arch/um/Makefile
12367@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12368 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12369 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12370
12371+ifdef CONSTIFY_PLUGIN
12372+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12373+endif
12374+
12375 #This will adjust *FLAGS accordingly to the platform.
12376 include $(ARCH_DIR)/Makefile-os-$(OS)
12377
12378diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12379index 19e1bdd..3665b77 100644
12380--- a/arch/um/include/asm/cache.h
12381+++ b/arch/um/include/asm/cache.h
12382@@ -1,6 +1,7 @@
12383 #ifndef __UM_CACHE_H
12384 #define __UM_CACHE_H
12385
12386+#include <linux/const.h>
12387
12388 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12389 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12390@@ -12,6 +13,6 @@
12391 # define L1_CACHE_SHIFT 5
12392 #endif
12393
12394-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12395+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12396
12397 #endif
12398diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12399index 2e0a6b1..a64d0f5 100644
12400--- a/arch/um/include/asm/kmap_types.h
12401+++ b/arch/um/include/asm/kmap_types.h
12402@@ -8,6 +8,6 @@
12403
12404 /* No more #include "asm/arch/kmap_types.h" ! */
12405
12406-#define KM_TYPE_NR 14
12407+#define KM_TYPE_NR 15
12408
12409 #endif
12410diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12411index 71c5d13..4c7b9f1 100644
12412--- a/arch/um/include/asm/page.h
12413+++ b/arch/um/include/asm/page.h
12414@@ -14,6 +14,9 @@
12415 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12416 #define PAGE_MASK (~(PAGE_SIZE-1))
12417
12418+#define ktla_ktva(addr) (addr)
12419+#define ktva_ktla(addr) (addr)
12420+
12421 #ifndef __ASSEMBLY__
12422
12423 struct page;
12424diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12425index 2b4274e..754fe06 100644
12426--- a/arch/um/include/asm/pgtable-3level.h
12427+++ b/arch/um/include/asm/pgtable-3level.h
12428@@ -58,6 +58,7 @@
12429 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12430 #define pud_populate(mm, pud, pmd) \
12431 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12432+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12433
12434 #ifdef CONFIG_64BIT
12435 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12436diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12437index 68b9119..f72353c 100644
12438--- a/arch/um/kernel/process.c
12439+++ b/arch/um/kernel/process.c
12440@@ -345,22 +345,6 @@ int singlestepping(void * t)
12441 return 2;
12442 }
12443
12444-/*
12445- * Only x86 and x86_64 have an arch_align_stack().
12446- * All other arches have "#define arch_align_stack(x) (x)"
12447- * in their asm/exec.h
12448- * As this is included in UML from asm-um/system-generic.h,
12449- * we can use it to behave as the subarch does.
12450- */
12451-#ifndef arch_align_stack
12452-unsigned long arch_align_stack(unsigned long sp)
12453-{
12454- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12455- sp -= get_random_int() % 8192;
12456- return sp & ~0xf;
12457-}
12458-#endif
12459-
12460 unsigned long get_wchan(struct task_struct *p)
12461 {
12462 unsigned long stack_page, sp, ip;
12463diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12464index ad8f795..2c7eec6 100644
12465--- a/arch/unicore32/include/asm/cache.h
12466+++ b/arch/unicore32/include/asm/cache.h
12467@@ -12,8 +12,10 @@
12468 #ifndef __UNICORE_CACHE_H__
12469 #define __UNICORE_CACHE_H__
12470
12471-#define L1_CACHE_SHIFT (5)
12472-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12473+#include <linux/const.h>
12474+
12475+#define L1_CACHE_SHIFT 5
12476+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12477
12478 /*
12479 * Memory returned by kmalloc() may be used for DMA, so we must make
12480diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12481index 226d569..297bf74 100644
12482--- a/arch/x86/Kconfig
12483+++ b/arch/x86/Kconfig
12484@@ -32,7 +32,7 @@ config X86
12485 select HAVE_AOUT if X86_32
12486 select HAVE_UNSTABLE_SCHED_CLOCK
12487 select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
12488- select ARCH_SUPPORTS_INT128 if X86_64
12489+ select ARCH_SUPPORTS_INT128 if X86_64 && !PAX_SIZE_OVERFLOW
12490 select HAVE_IDE
12491 select HAVE_OPROFILE
12492 select HAVE_PCSPKR_PLATFORM
12493@@ -134,7 +134,7 @@ config X86
12494 select RTC_LIB
12495 select HAVE_DEBUG_STACKOVERFLOW
12496 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12497- select HAVE_CC_STACKPROTECTOR
12498+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12499 select GENERIC_CPU_AUTOPROBE
12500 select HAVE_ARCH_AUDITSYSCALL
12501 select ARCH_SUPPORTS_ATOMIC_RMW
12502@@ -266,7 +266,7 @@ config X86_HT
12503
12504 config X86_32_LAZY_GS
12505 def_bool y
12506- depends on X86_32 && !CC_STACKPROTECTOR
12507+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12508
12509 config ARCH_HWEIGHT_CFLAGS
12510 string
12511@@ -638,6 +638,7 @@ config SCHED_OMIT_FRAME_POINTER
12512
12513 menuconfig HYPERVISOR_GUEST
12514 bool "Linux guest support"
12515+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12516 ---help---
12517 Say Y here to enable options for running Linux under various hyper-
12518 visors. This option enables basic hypervisor detection and platform
12519@@ -1005,6 +1006,7 @@ config VM86
12520
12521 config X86_16BIT
12522 bool "Enable support for 16-bit segments" if EXPERT
12523+ depends on !GRKERNSEC
12524 default y
12525 ---help---
12526 This option is required by programs like Wine to run 16-bit
12527@@ -1178,6 +1180,7 @@ choice
12528
12529 config NOHIGHMEM
12530 bool "off"
12531+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12532 ---help---
12533 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12534 However, the address space of 32-bit x86 processors is only 4
12535@@ -1214,6 +1217,7 @@ config NOHIGHMEM
12536
12537 config HIGHMEM4G
12538 bool "4GB"
12539+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12540 ---help---
12541 Select this if you have a 32-bit processor and between 1 and 4
12542 gigabytes of physical RAM.
12543@@ -1266,7 +1270,7 @@ config PAGE_OFFSET
12544 hex
12545 default 0xB0000000 if VMSPLIT_3G_OPT
12546 default 0x80000000 if VMSPLIT_2G
12547- default 0x78000000 if VMSPLIT_2G_OPT
12548+ default 0x70000000 if VMSPLIT_2G_OPT
12549 default 0x40000000 if VMSPLIT_1G
12550 default 0xC0000000
12551 depends on X86_32
12552@@ -1286,7 +1290,6 @@ config X86_PAE
12553
12554 config ARCH_PHYS_ADDR_T_64BIT
12555 def_bool y
12556- depends on X86_64 || X86_PAE
12557
12558 config ARCH_DMA_ADDR_T_64BIT
12559 def_bool y
12560@@ -1717,6 +1720,7 @@ source kernel/Kconfig.hz
12561
12562 config KEXEC
12563 bool "kexec system call"
12564+ depends on !GRKERNSEC_KMEM
12565 ---help---
12566 kexec is a system call that implements the ability to shutdown your
12567 current kernel, and to start another kernel. It is like a reboot
12568@@ -1899,7 +1903,9 @@ config X86_NEED_RELOCS
12569
12570 config PHYSICAL_ALIGN
12571 hex "Alignment value to which kernel should be aligned"
12572- default "0x200000"
12573+ default "0x1000000"
12574+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12575+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12576 range 0x2000 0x1000000 if X86_32
12577 range 0x200000 0x1000000 if X86_64
12578 ---help---
12579@@ -1982,6 +1988,7 @@ config COMPAT_VDSO
12580 def_bool n
12581 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12582 depends on X86_32 || IA32_EMULATION
12583+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12584 ---help---
12585 Certain buggy versions of glibc will crash if they are
12586 presented with a 32-bit vDSO that is not mapped at the address
12587@@ -2046,6 +2053,22 @@ config CMDLINE_OVERRIDE
12588 This is used to work around broken boot loaders. This should
12589 be set to 'N' under normal conditions.
12590
12591+config DEFAULT_MODIFY_LDT_SYSCALL
12592+ bool "Allow userspace to modify the LDT by default"
12593+ default y
12594+
12595+ ---help---
12596+ Modifying the LDT (Local Descriptor Table) may be needed to run a
12597+ 16-bit or segmented code such as Dosemu or Wine. This is done via
12598+ a system call which is not needed to run portable applications,
12599+ and which can sometimes be abused to exploit some weaknesses of
12600+ the architecture, opening new vulnerabilities.
12601+
12602+ For this reason this option allows one to enable or disable the
12603+ feature at runtime. It is recommended to say 'N' here to leave
12604+ the system protected, and to enable it at runtime only if needed
12605+ by setting the sys.kernel.modify_ldt sysctl.
12606+
12607 source "kernel/livepatch/Kconfig"
12608
12609 endmenu
12610diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12611index 6983314..54ad7e8 100644
12612--- a/arch/x86/Kconfig.cpu
12613+++ b/arch/x86/Kconfig.cpu
12614@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12615
12616 config X86_F00F_BUG
12617 def_bool y
12618- depends on M586MMX || M586TSC || M586 || M486
12619+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12620
12621 config X86_INVD_BUG
12622 def_bool y
12623@@ -327,7 +327,7 @@ config X86_INVD_BUG
12624
12625 config X86_ALIGNMENT_16
12626 def_bool y
12627- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12628+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12629
12630 config X86_INTEL_USERCOPY
12631 def_bool y
12632@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12633 # generates cmov.
12634 config X86_CMOV
12635 def_bool y
12636- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12637+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12638
12639 config X86_MINIMUM_CPU_FAMILY
12640 int
12641diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12642index 72484a6..83a4411 100644
12643--- a/arch/x86/Kconfig.debug
12644+++ b/arch/x86/Kconfig.debug
12645@@ -89,7 +89,7 @@ config EFI_PGT_DUMP
12646 config DEBUG_RODATA
12647 bool "Write protect kernel read-only data structures"
12648 default y
12649- depends on DEBUG_KERNEL
12650+ depends on DEBUG_KERNEL && BROKEN
12651 ---help---
12652 Mark the kernel read-only data as write-protected in the pagetables,
12653 in order to catch accidental (and incorrect) writes to such const
12654@@ -107,7 +107,7 @@ config DEBUG_RODATA_TEST
12655
12656 config DEBUG_SET_MODULE_RONX
12657 bool "Set loadable kernel module data as NX and text as RO"
12658- depends on MODULES
12659+ depends on MODULES && BROKEN
12660 ---help---
12661 This option helps catch unintended modifications to loadable
12662 kernel module's text and read-only data. It also prevents execution
12663diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12664index 2fda005..2c72d40 100644
12665--- a/arch/x86/Makefile
12666+++ b/arch/x86/Makefile
12667@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12668 # CPU-specific tuning. Anything which can be shared with UML should go here.
12669 include arch/x86/Makefile_32.cpu
12670 KBUILD_CFLAGS += $(cflags-y)
12671-
12672- # temporary until string.h is fixed
12673- KBUILD_CFLAGS += -ffreestanding
12674 else
12675 BITS := 64
12676 UTS_MACHINE := x86_64
12677@@ -107,6 +104,9 @@ else
12678 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12679 endif
12680
12681+# temporary until string.h is fixed
12682+KBUILD_CFLAGS += -ffreestanding
12683+
12684 # Make sure compiler does not have buggy stack-protector support.
12685 ifdef CONFIG_CC_STACKPROTECTOR
12686 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12687@@ -181,6 +181,7 @@ archheaders:
12688 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12689
12690 archprepare:
12691+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12692 ifeq ($(CONFIG_KEXEC_FILE),y)
12693 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12694 endif
12695@@ -264,3 +265,9 @@ define archhelp
12696 echo ' FDARGS="..." arguments for the booted kernel'
12697 echo ' FDINITRD=file initrd for the booted kernel'
12698 endef
12699+
12700+define OLD_LD
12701+
12702+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12703+*** Please upgrade your binutils to 2.18 or newer
12704+endef
12705diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12706index 57bbf2f..b100fce 100644
12707--- a/arch/x86/boot/Makefile
12708+++ b/arch/x86/boot/Makefile
12709@@ -58,6 +58,9 @@ clean-files += cpustr.h
12710 # ---------------------------------------------------------------------------
12711
12712 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12713+ifdef CONSTIFY_PLUGIN
12714+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12715+endif
12716 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12717 GCOV_PROFILE := n
12718
12719diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12720index 878e4b9..20537ab 100644
12721--- a/arch/x86/boot/bitops.h
12722+++ b/arch/x86/boot/bitops.h
12723@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12724 u8 v;
12725 const u32 *p = (const u32 *)addr;
12726
12727- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12728+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12729 return v;
12730 }
12731
12732@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12733
12734 static inline void set_bit(int nr, void *addr)
12735 {
12736- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12737+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12738 }
12739
12740 #endif /* BOOT_BITOPS_H */
12741diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12742index bd49ec6..94c7f58 100644
12743--- a/arch/x86/boot/boot.h
12744+++ b/arch/x86/boot/boot.h
12745@@ -84,7 +84,7 @@ static inline void io_delay(void)
12746 static inline u16 ds(void)
12747 {
12748 u16 seg;
12749- asm("movw %%ds,%0" : "=rm" (seg));
12750+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12751 return seg;
12752 }
12753
12754diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12755index 0a291cd..9686efc 100644
12756--- a/arch/x86/boot/compressed/Makefile
12757+++ b/arch/x86/boot/compressed/Makefile
12758@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12759 KBUILD_CFLAGS += -mno-mmx -mno-sse
12760 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12761 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12762+ifdef CONSTIFY_PLUGIN
12763+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12764+endif
12765
12766 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12767 GCOV_PROFILE := n
12768diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12769index a53440e..c3dbf1e 100644
12770--- a/arch/x86/boot/compressed/efi_stub_32.S
12771+++ b/arch/x86/boot/compressed/efi_stub_32.S
12772@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12773 * parameter 2, ..., param n. To make things easy, we save the return
12774 * address of efi_call_phys in a global variable.
12775 */
12776- popl %ecx
12777- movl %ecx, saved_return_addr(%edx)
12778- /* get the function pointer into ECX*/
12779- popl %ecx
12780- movl %ecx, efi_rt_function_ptr(%edx)
12781+ popl saved_return_addr(%edx)
12782+ popl efi_rt_function_ptr(%edx)
12783
12784 /*
12785 * 3. Call the physical function.
12786 */
12787- call *%ecx
12788+ call *efi_rt_function_ptr(%edx)
12789
12790 /*
12791 * 4. Balance the stack. And because EAX contain the return value,
12792@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12793 1: popl %edx
12794 subl $1b, %edx
12795
12796- movl efi_rt_function_ptr(%edx), %ecx
12797- pushl %ecx
12798+ pushl efi_rt_function_ptr(%edx)
12799
12800 /*
12801 * 10. Push the saved return address onto the stack and return.
12802 */
12803- movl saved_return_addr(%edx), %ecx
12804- pushl %ecx
12805- ret
12806+ jmpl *saved_return_addr(%edx)
12807 ENDPROC(efi_call_phys)
12808 .previous
12809
12810diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12811index 630384a..278e788 100644
12812--- a/arch/x86/boot/compressed/efi_thunk_64.S
12813+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12814@@ -189,8 +189,8 @@ efi_gdt64:
12815 .long 0 /* Filled out by user */
12816 .word 0
12817 .quad 0x0000000000000000 /* NULL descriptor */
12818- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12819- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12820+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12821+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12822 .quad 0x0080890000000000 /* TS descriptor */
12823 .quad 0x0000000000000000 /* TS continued */
12824 efi_gdt64_end:
12825diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12826index 8ef964d..fcfb8aa 100644
12827--- a/arch/x86/boot/compressed/head_32.S
12828+++ b/arch/x86/boot/compressed/head_32.S
12829@@ -141,10 +141,10 @@ preferred_addr:
12830 addl %eax, %ebx
12831 notl %eax
12832 andl %eax, %ebx
12833- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12834+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12835 jge 1f
12836 #endif
12837- movl $LOAD_PHYSICAL_ADDR, %ebx
12838+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12839 1:
12840
12841 /* Target address to relocate to for decompression */
12842diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12843index b0c0d16..3b44ff8 100644
12844--- a/arch/x86/boot/compressed/head_64.S
12845+++ b/arch/x86/boot/compressed/head_64.S
12846@@ -95,10 +95,10 @@ ENTRY(startup_32)
12847 addl %eax, %ebx
12848 notl %eax
12849 andl %eax, %ebx
12850- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12851+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12852 jge 1f
12853 #endif
12854- movl $LOAD_PHYSICAL_ADDR, %ebx
12855+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12856 1:
12857
12858 /* Target address to relocate to for decompression */
12859@@ -323,10 +323,10 @@ preferred_addr:
12860 addq %rax, %rbp
12861 notq %rax
12862 andq %rax, %rbp
12863- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12864+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12865 jge 1f
12866 #endif
12867- movq $LOAD_PHYSICAL_ADDR, %rbp
12868+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12869 1:
12870
12871 /* Target address to relocate to for decompression */
12872@@ -435,8 +435,8 @@ gdt:
12873 .long gdt
12874 .word 0
12875 .quad 0x0000000000000000 /* NULL descriptor */
12876- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12877- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12878+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12879+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12880 .quad 0x0080890000000000 /* TS descriptor */
12881 .quad 0x0000000000000000 /* TS continued */
12882 gdt_end:
12883diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12884index a107b93..55602de 100644
12885--- a/arch/x86/boot/compressed/misc.c
12886+++ b/arch/x86/boot/compressed/misc.c
12887@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12888 * Calculate the delta between where vmlinux was linked to load
12889 * and where it was actually loaded.
12890 */
12891- delta = min_addr - LOAD_PHYSICAL_ADDR;
12892+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12893 if (!delta) {
12894 debug_putstr("No relocation needed... ");
12895 return;
12896@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12897 Elf32_Ehdr ehdr;
12898 Elf32_Phdr *phdrs, *phdr;
12899 #endif
12900- void *dest;
12901+ void *dest, *prev;
12902 int i;
12903
12904 memcpy(&ehdr, output, sizeof(ehdr));
12905@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12906 case PT_LOAD:
12907 #ifdef CONFIG_RELOCATABLE
12908 dest = output;
12909- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12910+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12911 #else
12912 dest = (void *)(phdr->p_paddr);
12913 #endif
12914 memcpy(dest,
12915 output + phdr->p_offset,
12916 phdr->p_filesz);
12917+ if (i)
12918+ memset(prev, 0xff, dest - prev);
12919+ prev = dest + phdr->p_filesz;
12920 break;
12921 default: /* Ignore other PT_* */ break;
12922 }
12923@@ -419,7 +422,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12924 error("Destination address too large");
12925 #endif
12926 #ifndef CONFIG_RELOCATABLE
12927- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12928+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12929 error("Wrong destination address");
12930 #endif
12931
12932diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12933index 1fd7d57..0f7d096 100644
12934--- a/arch/x86/boot/cpucheck.c
12935+++ b/arch/x86/boot/cpucheck.c
12936@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12937 u32 ecx = MSR_K7_HWCR;
12938 u32 eax, edx;
12939
12940- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12941+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12942 eax &= ~(1 << 15);
12943- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12944+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12945
12946 get_cpuflags(); /* Make sure it really did something */
12947 err = check_cpuflags();
12948@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12949 u32 ecx = MSR_VIA_FCR;
12950 u32 eax, edx;
12951
12952- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12953+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12954 eax |= (1<<1)|(1<<7);
12955- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12956+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12957
12958 set_bit(X86_FEATURE_CX8, cpu.flags);
12959 err = check_cpuflags();
12960@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12961 u32 eax, edx;
12962 u32 level = 1;
12963
12964- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12965- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12966- asm("cpuid"
12967+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12968+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12969+ asm volatile("cpuid"
12970 : "+a" (level), "=d" (cpu.flags[0])
12971 : : "ecx", "ebx");
12972- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12973+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12974
12975 err = check_cpuflags();
12976 } else if (err == 0x01 &&
12977diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12978index 16ef025..91e033b 100644
12979--- a/arch/x86/boot/header.S
12980+++ b/arch/x86/boot/header.S
12981@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12982 # single linked list of
12983 # struct setup_data
12984
12985-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12986+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12987
12988 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12989+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12990+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12991+#else
12992 #define VO_INIT_SIZE (VO__end - VO__text)
12993+#endif
12994 #if ZO_INIT_SIZE > VO_INIT_SIZE
12995 #define INIT_SIZE ZO_INIT_SIZE
12996 #else
12997diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12998index db75d07..8e6d0af 100644
12999--- a/arch/x86/boot/memory.c
13000+++ b/arch/x86/boot/memory.c
13001@@ -19,7 +19,7 @@
13002
13003 static int detect_memory_e820(void)
13004 {
13005- int count = 0;
13006+ unsigned int count = 0;
13007 struct biosregs ireg, oreg;
13008 struct e820entry *desc = boot_params.e820_map;
13009 static struct e820entry buf; /* static so it is zeroed */
13010diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13011index ba3e100..6501b8f 100644
13012--- a/arch/x86/boot/video-vesa.c
13013+++ b/arch/x86/boot/video-vesa.c
13014@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13015
13016 boot_params.screen_info.vesapm_seg = oreg.es;
13017 boot_params.screen_info.vesapm_off = oreg.di;
13018+ boot_params.screen_info.vesapm_size = oreg.cx;
13019 }
13020
13021 /*
13022diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13023index 05111bb..a1ae1f0 100644
13024--- a/arch/x86/boot/video.c
13025+++ b/arch/x86/boot/video.c
13026@@ -98,7 +98,7 @@ static void store_mode_params(void)
13027 static unsigned int get_entry(void)
13028 {
13029 char entry_buf[4];
13030- int i, len = 0;
13031+ unsigned int i, len = 0;
13032 int key;
13033 unsigned int v;
13034
13035diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13036index 9105655..41779c1 100644
13037--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13038+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13039@@ -8,6 +8,8 @@
13040 * including this sentence is retained in full.
13041 */
13042
13043+#include <asm/alternative-asm.h>
13044+
13045 .extern crypto_ft_tab
13046 .extern crypto_it_tab
13047 .extern crypto_fl_tab
13048@@ -70,6 +72,8 @@
13049 je B192; \
13050 leaq 32(r9),r9;
13051
13052+#define ret pax_force_retaddr; ret
13053+
13054 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13055 movq r1,r2; \
13056 movq r3,r4; \
13057diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13058index 6bd2c6c..368c93e 100644
13059--- a/arch/x86/crypto/aesni-intel_asm.S
13060+++ b/arch/x86/crypto/aesni-intel_asm.S
13061@@ -31,6 +31,7 @@
13062
13063 #include <linux/linkage.h>
13064 #include <asm/inst.h>
13065+#include <asm/alternative-asm.h>
13066
13067 /*
13068 * The following macros are used to move an (un)aligned 16 byte value to/from
13069@@ -217,7 +218,7 @@ enc: .octa 0x2
13070 * num_initial_blocks = b mod 4
13071 * encrypt the initial num_initial_blocks blocks and apply ghash on
13072 * the ciphertext
13073-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13074+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13075 * are clobbered
13076 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13077 */
13078@@ -227,8 +228,8 @@ enc: .octa 0x2
13079 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13080 MOVADQ SHUF_MASK(%rip), %xmm14
13081 mov arg7, %r10 # %r10 = AAD
13082- mov arg8, %r12 # %r12 = aadLen
13083- mov %r12, %r11
13084+ mov arg8, %r15 # %r15 = aadLen
13085+ mov %r15, %r11
13086 pxor %xmm\i, %xmm\i
13087
13088 _get_AAD_loop\num_initial_blocks\operation:
13089@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13090 psrldq $4, %xmm\i
13091 pxor \TMP1, %xmm\i
13092 add $4, %r10
13093- sub $4, %r12
13094+ sub $4, %r15
13095 jne _get_AAD_loop\num_initial_blocks\operation
13096
13097 cmp $16, %r11
13098 je _get_AAD_loop2_done\num_initial_blocks\operation
13099
13100- mov $16, %r12
13101+ mov $16, %r15
13102 _get_AAD_loop2\num_initial_blocks\operation:
13103 psrldq $4, %xmm\i
13104- sub $4, %r12
13105- cmp %r11, %r12
13106+ sub $4, %r15
13107+ cmp %r11, %r15
13108 jne _get_AAD_loop2\num_initial_blocks\operation
13109
13110 _get_AAD_loop2_done\num_initial_blocks\operation:
13111@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13112 * num_initial_blocks = b mod 4
13113 * encrypt the initial num_initial_blocks blocks and apply ghash on
13114 * the ciphertext
13115-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13116+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13117 * are clobbered
13118 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13119 */
13120@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13121 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13122 MOVADQ SHUF_MASK(%rip), %xmm14
13123 mov arg7, %r10 # %r10 = AAD
13124- mov arg8, %r12 # %r12 = aadLen
13125- mov %r12, %r11
13126+ mov arg8, %r15 # %r15 = aadLen
13127+ mov %r15, %r11
13128 pxor %xmm\i, %xmm\i
13129 _get_AAD_loop\num_initial_blocks\operation:
13130 movd (%r10), \TMP1
13131@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13132 psrldq $4, %xmm\i
13133 pxor \TMP1, %xmm\i
13134 add $4, %r10
13135- sub $4, %r12
13136+ sub $4, %r15
13137 jne _get_AAD_loop\num_initial_blocks\operation
13138 cmp $16, %r11
13139 je _get_AAD_loop2_done\num_initial_blocks\operation
13140- mov $16, %r12
13141+ mov $16, %r15
13142 _get_AAD_loop2\num_initial_blocks\operation:
13143 psrldq $4, %xmm\i
13144- sub $4, %r12
13145- cmp %r11, %r12
13146+ sub $4, %r15
13147+ cmp %r11, %r15
13148 jne _get_AAD_loop2\num_initial_blocks\operation
13149 _get_AAD_loop2_done\num_initial_blocks\operation:
13150 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13151@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13152 *
13153 *****************************************************************************/
13154 ENTRY(aesni_gcm_dec)
13155- push %r12
13156+ push %r15
13157 push %r13
13158 push %r14
13159 mov %rsp, %r14
13160@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13161 */
13162 sub $VARIABLE_OFFSET, %rsp
13163 and $~63, %rsp # align rsp to 64 bytes
13164- mov %arg6, %r12
13165- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13166+ mov %arg6, %r15
13167+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13168 movdqa SHUF_MASK(%rip), %xmm2
13169 PSHUFB_XMM %xmm2, %xmm13
13170
13171@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13172 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13173 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13174 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13175- mov %r13, %r12
13176- and $(3<<4), %r12
13177+ mov %r13, %r15
13178+ and $(3<<4), %r15
13179 jz _initial_num_blocks_is_0_decrypt
13180- cmp $(2<<4), %r12
13181+ cmp $(2<<4), %r15
13182 jb _initial_num_blocks_is_1_decrypt
13183 je _initial_num_blocks_is_2_decrypt
13184 _initial_num_blocks_is_3_decrypt:
13185@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13186 sub $16, %r11
13187 add %r13, %r11
13188 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13189- lea SHIFT_MASK+16(%rip), %r12
13190- sub %r13, %r12
13191+ lea SHIFT_MASK+16(%rip), %r15
13192+ sub %r13, %r15
13193 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13194 # (%r13 is the number of bytes in plaintext mod 16)
13195- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13196+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13197 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13198
13199 movdqa %xmm1, %xmm2
13200 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13201- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13202+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13203 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13204 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13205 pand %xmm1, %xmm2
13206@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13207 sub $1, %r13
13208 jne _less_than_8_bytes_left_decrypt
13209 _multiple_of_16_bytes_decrypt:
13210- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13211- shl $3, %r12 # convert into number of bits
13212- movd %r12d, %xmm15 # len(A) in %xmm15
13213+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13214+ shl $3, %r15 # convert into number of bits
13215+ movd %r15d, %xmm15 # len(A) in %xmm15
13216 shl $3, %arg4 # len(C) in bits (*128)
13217 MOVQ_R64_XMM %arg4, %xmm1
13218 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13219@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13220 mov %r14, %rsp
13221 pop %r14
13222 pop %r13
13223- pop %r12
13224+ pop %r15
13225+ pax_force_retaddr
13226 ret
13227 ENDPROC(aesni_gcm_dec)
13228
13229@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13230 * poly = x^128 + x^127 + x^126 + x^121 + 1
13231 ***************************************************************************/
13232 ENTRY(aesni_gcm_enc)
13233- push %r12
13234+ push %r15
13235 push %r13
13236 push %r14
13237 mov %rsp, %r14
13238@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13239 #
13240 sub $VARIABLE_OFFSET, %rsp
13241 and $~63, %rsp
13242- mov %arg6, %r12
13243- movdqu (%r12), %xmm13
13244+ mov %arg6, %r15
13245+ movdqu (%r15), %xmm13
13246 movdqa SHUF_MASK(%rip), %xmm2
13247 PSHUFB_XMM %xmm2, %xmm13
13248
13249@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13250 movdqa %xmm13, HashKey(%rsp)
13251 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13252 and $-16, %r13
13253- mov %r13, %r12
13254+ mov %r13, %r15
13255
13256 # Encrypt first few blocks
13257
13258- and $(3<<4), %r12
13259+ and $(3<<4), %r15
13260 jz _initial_num_blocks_is_0_encrypt
13261- cmp $(2<<4), %r12
13262+ cmp $(2<<4), %r15
13263 jb _initial_num_blocks_is_1_encrypt
13264 je _initial_num_blocks_is_2_encrypt
13265 _initial_num_blocks_is_3_encrypt:
13266@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13267 sub $16, %r11
13268 add %r13, %r11
13269 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13270- lea SHIFT_MASK+16(%rip), %r12
13271- sub %r13, %r12
13272+ lea SHIFT_MASK+16(%rip), %r15
13273+ sub %r13, %r15
13274 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13275 # (%r13 is the number of bytes in plaintext mod 16)
13276- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13277+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13278 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13279 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13280- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13281+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13282 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13283 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13284 movdqa SHUF_MASK(%rip), %xmm10
13285@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13286 sub $1, %r13
13287 jne _less_than_8_bytes_left_encrypt
13288 _multiple_of_16_bytes_encrypt:
13289- mov arg8, %r12 # %r12 = addLen (number of bytes)
13290- shl $3, %r12
13291- movd %r12d, %xmm15 # len(A) in %xmm15
13292+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13293+ shl $3, %r15
13294+ movd %r15d, %xmm15 # len(A) in %xmm15
13295 shl $3, %arg4 # len(C) in bits (*128)
13296 MOVQ_R64_XMM %arg4, %xmm1
13297 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13298@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13299 mov %r14, %rsp
13300 pop %r14
13301 pop %r13
13302- pop %r12
13303+ pop %r15
13304+ pax_force_retaddr
13305 ret
13306 ENDPROC(aesni_gcm_enc)
13307
13308@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13309 pxor %xmm1, %xmm0
13310 movaps %xmm0, (TKEYP)
13311 add $0x10, TKEYP
13312+ pax_force_retaddr
13313 ret
13314 ENDPROC(_key_expansion_128)
13315 ENDPROC(_key_expansion_256a)
13316@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13317 shufps $0b01001110, %xmm2, %xmm1
13318 movaps %xmm1, 0x10(TKEYP)
13319 add $0x20, TKEYP
13320+ pax_force_retaddr
13321 ret
13322 ENDPROC(_key_expansion_192a)
13323
13324@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13325
13326 movaps %xmm0, (TKEYP)
13327 add $0x10, TKEYP
13328+ pax_force_retaddr
13329 ret
13330 ENDPROC(_key_expansion_192b)
13331
13332@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13333 pxor %xmm1, %xmm2
13334 movaps %xmm2, (TKEYP)
13335 add $0x10, TKEYP
13336+ pax_force_retaddr
13337 ret
13338 ENDPROC(_key_expansion_256b)
13339
13340@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13341 #ifndef __x86_64__
13342 popl KEYP
13343 #endif
13344+ pax_force_retaddr
13345 ret
13346 ENDPROC(aesni_set_key)
13347
13348@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13349 popl KLEN
13350 popl KEYP
13351 #endif
13352+ pax_force_retaddr
13353 ret
13354 ENDPROC(aesni_enc)
13355
13356@@ -1985,6 +1994,7 @@ _aesni_enc1:
13357 AESENC KEY STATE
13358 movaps 0x70(TKEYP), KEY
13359 AESENCLAST KEY STATE
13360+ pax_force_retaddr
13361 ret
13362 ENDPROC(_aesni_enc1)
13363
13364@@ -2094,6 +2104,7 @@ _aesni_enc4:
13365 AESENCLAST KEY STATE2
13366 AESENCLAST KEY STATE3
13367 AESENCLAST KEY STATE4
13368+ pax_force_retaddr
13369 ret
13370 ENDPROC(_aesni_enc4)
13371
13372@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13373 popl KLEN
13374 popl KEYP
13375 #endif
13376+ pax_force_retaddr
13377 ret
13378 ENDPROC(aesni_dec)
13379
13380@@ -2175,6 +2187,7 @@ _aesni_dec1:
13381 AESDEC KEY STATE
13382 movaps 0x70(TKEYP), KEY
13383 AESDECLAST KEY STATE
13384+ pax_force_retaddr
13385 ret
13386 ENDPROC(_aesni_dec1)
13387
13388@@ -2284,6 +2297,7 @@ _aesni_dec4:
13389 AESDECLAST KEY STATE2
13390 AESDECLAST KEY STATE3
13391 AESDECLAST KEY STATE4
13392+ pax_force_retaddr
13393 ret
13394 ENDPROC(_aesni_dec4)
13395
13396@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13397 popl KEYP
13398 popl LEN
13399 #endif
13400+ pax_force_retaddr
13401 ret
13402 ENDPROC(aesni_ecb_enc)
13403
13404@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13405 popl KEYP
13406 popl LEN
13407 #endif
13408+ pax_force_retaddr
13409 ret
13410 ENDPROC(aesni_ecb_dec)
13411
13412@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13413 popl LEN
13414 popl IVP
13415 #endif
13416+ pax_force_retaddr
13417 ret
13418 ENDPROC(aesni_cbc_enc)
13419
13420@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13421 popl LEN
13422 popl IVP
13423 #endif
13424+ pax_force_retaddr
13425 ret
13426 ENDPROC(aesni_cbc_dec)
13427
13428@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13429 mov $1, TCTR_LOW
13430 MOVQ_R64_XMM TCTR_LOW INC
13431 MOVQ_R64_XMM CTR TCTR_LOW
13432+ pax_force_retaddr
13433 ret
13434 ENDPROC(_aesni_inc_init)
13435
13436@@ -2590,6 +2609,7 @@ _aesni_inc:
13437 .Linc_low:
13438 movaps CTR, IV
13439 PSHUFB_XMM BSWAP_MASK IV
13440+ pax_force_retaddr
13441 ret
13442 ENDPROC(_aesni_inc)
13443
13444@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13445 .Lctr_enc_ret:
13446 movups IV, (IVP)
13447 .Lctr_enc_just_ret:
13448+ pax_force_retaddr
13449 ret
13450 ENDPROC(aesni_ctr_enc)
13451
13452@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13453 pxor INC, STATE4
13454 movdqu STATE4, 0x70(OUTP)
13455
13456+ pax_force_retaddr
13457 ret
13458 ENDPROC(aesni_xts_crypt8)
13459
13460diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13461index 246c670..466e2d6 100644
13462--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13463+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13464@@ -21,6 +21,7 @@
13465 */
13466
13467 #include <linux/linkage.h>
13468+#include <asm/alternative-asm.h>
13469
13470 .file "blowfish-x86_64-asm.S"
13471 .text
13472@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13473 jnz .L__enc_xor;
13474
13475 write_block();
13476+ pax_force_retaddr
13477 ret;
13478 .L__enc_xor:
13479 xor_block();
13480+ pax_force_retaddr
13481 ret;
13482 ENDPROC(__blowfish_enc_blk)
13483
13484@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13485
13486 movq %r11, %rbp;
13487
13488+ pax_force_retaddr
13489 ret;
13490 ENDPROC(blowfish_dec_blk)
13491
13492@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13493
13494 popq %rbx;
13495 popq %rbp;
13496+ pax_force_retaddr
13497 ret;
13498
13499 .L__enc_xor4:
13500@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13501
13502 popq %rbx;
13503 popq %rbp;
13504+ pax_force_retaddr
13505 ret;
13506 ENDPROC(__blowfish_enc_blk_4way)
13507
13508@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13509 popq %rbx;
13510 popq %rbp;
13511
13512+ pax_force_retaddr
13513 ret;
13514 ENDPROC(blowfish_dec_blk_4way)
13515diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13516index ce71f92..1dce7ec 100644
13517--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13518+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13519@@ -16,6 +16,7 @@
13520 */
13521
13522 #include <linux/linkage.h>
13523+#include <asm/alternative-asm.h>
13524
13525 #define CAMELLIA_TABLE_BYTE_LEN 272
13526
13527@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13528 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13529 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13530 %rcx, (%r9));
13531+ pax_force_retaddr
13532 ret;
13533 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13534
13535@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13536 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13537 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13538 %rax, (%r9));
13539+ pax_force_retaddr
13540 ret;
13541 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13542
13543@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13544 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13545 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13546
13547+ pax_force_retaddr
13548 ret;
13549
13550 .align 8
13551@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13552 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13553 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13554
13555+ pax_force_retaddr
13556 ret;
13557
13558 .align 8
13559@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13560 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13561 %xmm8, %rsi);
13562
13563+ pax_force_retaddr
13564 ret;
13565 ENDPROC(camellia_ecb_enc_16way)
13566
13567@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13568 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13569 %xmm8, %rsi);
13570
13571+ pax_force_retaddr
13572 ret;
13573 ENDPROC(camellia_ecb_dec_16way)
13574
13575@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13576 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13577 %xmm8, %rsi);
13578
13579+ pax_force_retaddr
13580 ret;
13581 ENDPROC(camellia_cbc_dec_16way)
13582
13583@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13584 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13585 %xmm8, %rsi);
13586
13587+ pax_force_retaddr
13588 ret;
13589 ENDPROC(camellia_ctr_16way)
13590
13591@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13592 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13593 %xmm8, %rsi);
13594
13595+ pax_force_retaddr
13596 ret;
13597 ENDPROC(camellia_xts_crypt_16way)
13598
13599diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13600index 0e0b886..5a3123c 100644
13601--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13602+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13603@@ -11,6 +11,7 @@
13604 */
13605
13606 #include <linux/linkage.h>
13607+#include <asm/alternative-asm.h>
13608
13609 #define CAMELLIA_TABLE_BYTE_LEN 272
13610
13611@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13612 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13613 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13614 %rcx, (%r9));
13615+ pax_force_retaddr
13616 ret;
13617 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13618
13619@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13620 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13621 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13622 %rax, (%r9));
13623+ pax_force_retaddr
13624 ret;
13625 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13626
13627@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13628 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13629 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13630
13631+ pax_force_retaddr
13632 ret;
13633
13634 .align 8
13635@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13636 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13637 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13638
13639+ pax_force_retaddr
13640 ret;
13641
13642 .align 8
13643@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13644
13645 vzeroupper;
13646
13647+ pax_force_retaddr
13648 ret;
13649 ENDPROC(camellia_ecb_enc_32way)
13650
13651@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13652
13653 vzeroupper;
13654
13655+ pax_force_retaddr
13656 ret;
13657 ENDPROC(camellia_ecb_dec_32way)
13658
13659@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13660
13661 vzeroupper;
13662
13663+ pax_force_retaddr
13664 ret;
13665 ENDPROC(camellia_cbc_dec_32way)
13666
13667@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13668
13669 vzeroupper;
13670
13671+ pax_force_retaddr
13672 ret;
13673 ENDPROC(camellia_ctr_32way)
13674
13675@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13676
13677 vzeroupper;
13678
13679+ pax_force_retaddr
13680 ret;
13681 ENDPROC(camellia_xts_crypt_32way)
13682
13683diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13684index 310319c..db3d7b5 100644
13685--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13686+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13687@@ -21,6 +21,7 @@
13688 */
13689
13690 #include <linux/linkage.h>
13691+#include <asm/alternative-asm.h>
13692
13693 .file "camellia-x86_64-asm_64.S"
13694 .text
13695@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13696 enc_outunpack(mov, RT1);
13697
13698 movq RRBP, %rbp;
13699+ pax_force_retaddr
13700 ret;
13701
13702 .L__enc_xor:
13703 enc_outunpack(xor, RT1);
13704
13705 movq RRBP, %rbp;
13706+ pax_force_retaddr
13707 ret;
13708 ENDPROC(__camellia_enc_blk)
13709
13710@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13711 dec_outunpack();
13712
13713 movq RRBP, %rbp;
13714+ pax_force_retaddr
13715 ret;
13716 ENDPROC(camellia_dec_blk)
13717
13718@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13719
13720 movq RRBP, %rbp;
13721 popq %rbx;
13722+ pax_force_retaddr
13723 ret;
13724
13725 .L__enc2_xor:
13726@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13727
13728 movq RRBP, %rbp;
13729 popq %rbx;
13730+ pax_force_retaddr
13731 ret;
13732 ENDPROC(__camellia_enc_blk_2way)
13733
13734@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13735
13736 movq RRBP, %rbp;
13737 movq RXOR, %rbx;
13738+ pax_force_retaddr
13739 ret;
13740 ENDPROC(camellia_dec_blk_2way)
13741diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13742index c35fd5d..2d8c7db 100644
13743--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13744+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13745@@ -24,6 +24,7 @@
13746 */
13747
13748 #include <linux/linkage.h>
13749+#include <asm/alternative-asm.h>
13750
13751 .file "cast5-avx-x86_64-asm_64.S"
13752
13753@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13754 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13755 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13756
13757+ pax_force_retaddr
13758 ret;
13759 ENDPROC(__cast5_enc_blk16)
13760
13761@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13762 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13763 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13764
13765+ pax_force_retaddr
13766 ret;
13767
13768 .L__skip_dec:
13769@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13770 vmovdqu RR4, (6*4*4)(%r11);
13771 vmovdqu RL4, (7*4*4)(%r11);
13772
13773+ pax_force_retaddr
13774 ret;
13775 ENDPROC(cast5_ecb_enc_16way)
13776
13777@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13778 vmovdqu RR4, (6*4*4)(%r11);
13779 vmovdqu RL4, (7*4*4)(%r11);
13780
13781+ pax_force_retaddr
13782 ret;
13783 ENDPROC(cast5_ecb_dec_16way)
13784
13785@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13786 * %rdx: src
13787 */
13788
13789- pushq %r12;
13790+ pushq %r14;
13791
13792 movq %rsi, %r11;
13793- movq %rdx, %r12;
13794+ movq %rdx, %r14;
13795
13796 vmovdqu (0*16)(%rdx), RL1;
13797 vmovdqu (1*16)(%rdx), RR1;
13798@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13799 call __cast5_dec_blk16;
13800
13801 /* xor with src */
13802- vmovq (%r12), RX;
13803+ vmovq (%r14), RX;
13804 vpshufd $0x4f, RX, RX;
13805 vpxor RX, RR1, RR1;
13806- vpxor 0*16+8(%r12), RL1, RL1;
13807- vpxor 1*16+8(%r12), RR2, RR2;
13808- vpxor 2*16+8(%r12), RL2, RL2;
13809- vpxor 3*16+8(%r12), RR3, RR3;
13810- vpxor 4*16+8(%r12), RL3, RL3;
13811- vpxor 5*16+8(%r12), RR4, RR4;
13812- vpxor 6*16+8(%r12), RL4, RL4;
13813+ vpxor 0*16+8(%r14), RL1, RL1;
13814+ vpxor 1*16+8(%r14), RR2, RR2;
13815+ vpxor 2*16+8(%r14), RL2, RL2;
13816+ vpxor 3*16+8(%r14), RR3, RR3;
13817+ vpxor 4*16+8(%r14), RL3, RL3;
13818+ vpxor 5*16+8(%r14), RR4, RR4;
13819+ vpxor 6*16+8(%r14), RL4, RL4;
13820
13821 vmovdqu RR1, (0*16)(%r11);
13822 vmovdqu RL1, (1*16)(%r11);
13823@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13824 vmovdqu RR4, (6*16)(%r11);
13825 vmovdqu RL4, (7*16)(%r11);
13826
13827- popq %r12;
13828+ popq %r14;
13829
13830+ pax_force_retaddr
13831 ret;
13832 ENDPROC(cast5_cbc_dec_16way)
13833
13834@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13835 * %rcx: iv (big endian, 64bit)
13836 */
13837
13838- pushq %r12;
13839+ pushq %r14;
13840
13841 movq %rsi, %r11;
13842- movq %rdx, %r12;
13843+ movq %rdx, %r14;
13844
13845 vpcmpeqd RTMP, RTMP, RTMP;
13846 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13847@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13848 call __cast5_enc_blk16;
13849
13850 /* dst = src ^ iv */
13851- vpxor (0*16)(%r12), RR1, RR1;
13852- vpxor (1*16)(%r12), RL1, RL1;
13853- vpxor (2*16)(%r12), RR2, RR2;
13854- vpxor (3*16)(%r12), RL2, RL2;
13855- vpxor (4*16)(%r12), RR3, RR3;
13856- vpxor (5*16)(%r12), RL3, RL3;
13857- vpxor (6*16)(%r12), RR4, RR4;
13858- vpxor (7*16)(%r12), RL4, RL4;
13859+ vpxor (0*16)(%r14), RR1, RR1;
13860+ vpxor (1*16)(%r14), RL1, RL1;
13861+ vpxor (2*16)(%r14), RR2, RR2;
13862+ vpxor (3*16)(%r14), RL2, RL2;
13863+ vpxor (4*16)(%r14), RR3, RR3;
13864+ vpxor (5*16)(%r14), RL3, RL3;
13865+ vpxor (6*16)(%r14), RR4, RR4;
13866+ vpxor (7*16)(%r14), RL4, RL4;
13867 vmovdqu RR1, (0*16)(%r11);
13868 vmovdqu RL1, (1*16)(%r11);
13869 vmovdqu RR2, (2*16)(%r11);
13870@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13871 vmovdqu RR4, (6*16)(%r11);
13872 vmovdqu RL4, (7*16)(%r11);
13873
13874- popq %r12;
13875+ popq %r14;
13876
13877+ pax_force_retaddr
13878 ret;
13879 ENDPROC(cast5_ctr_16way)
13880diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13881index e3531f8..e123f35 100644
13882--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13883+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13884@@ -24,6 +24,7 @@
13885 */
13886
13887 #include <linux/linkage.h>
13888+#include <asm/alternative-asm.h>
13889 #include "glue_helper-asm-avx.S"
13890
13891 .file "cast6-avx-x86_64-asm_64.S"
13892@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13893 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13894 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13895
13896+ pax_force_retaddr
13897 ret;
13898 ENDPROC(__cast6_enc_blk8)
13899
13900@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13901 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13902 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13903
13904+ pax_force_retaddr
13905 ret;
13906 ENDPROC(__cast6_dec_blk8)
13907
13908@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13909
13910 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13911
13912+ pax_force_retaddr
13913 ret;
13914 ENDPROC(cast6_ecb_enc_8way)
13915
13916@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13917
13918 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13919
13920+ pax_force_retaddr
13921 ret;
13922 ENDPROC(cast6_ecb_dec_8way)
13923
13924@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13925 * %rdx: src
13926 */
13927
13928- pushq %r12;
13929+ pushq %r14;
13930
13931 movq %rsi, %r11;
13932- movq %rdx, %r12;
13933+ movq %rdx, %r14;
13934
13935 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13936
13937 call __cast6_dec_blk8;
13938
13939- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13940+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13941
13942- popq %r12;
13943+ popq %r14;
13944
13945+ pax_force_retaddr
13946 ret;
13947 ENDPROC(cast6_cbc_dec_8way)
13948
13949@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13950 * %rcx: iv (little endian, 128bit)
13951 */
13952
13953- pushq %r12;
13954+ pushq %r14;
13955
13956 movq %rsi, %r11;
13957- movq %rdx, %r12;
13958+ movq %rdx, %r14;
13959
13960 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13961 RD2, RX, RKR, RKM);
13962
13963 call __cast6_enc_blk8;
13964
13965- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13966+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13967
13968- popq %r12;
13969+ popq %r14;
13970
13971+ pax_force_retaddr
13972 ret;
13973 ENDPROC(cast6_ctr_8way)
13974
13975@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13976 /* dst <= regs xor IVs(in dst) */
13977 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13978
13979+ pax_force_retaddr
13980 ret;
13981 ENDPROC(cast6_xts_enc_8way)
13982
13983@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13984 /* dst <= regs xor IVs(in dst) */
13985 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13986
13987+ pax_force_retaddr
13988 ret;
13989 ENDPROC(cast6_xts_dec_8way)
13990diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13991index 225be06..2885e731 100644
13992--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13993+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13994@@ -45,6 +45,7 @@
13995
13996 #include <asm/inst.h>
13997 #include <linux/linkage.h>
13998+#include <asm/alternative-asm.h>
13999
14000 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14001
14002@@ -309,6 +310,7 @@ do_return:
14003 popq %rsi
14004 popq %rdi
14005 popq %rbx
14006+ pax_force_retaddr
14007 ret
14008
14009 ################################################################
14010@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14011 ## PCLMULQDQ tables
14012 ## Table is 128 entries x 2 words (8 bytes) each
14013 ################################################################
14014-.section .rotata, "a", %progbits
14015+.section .rodata, "a", %progbits
14016 .align 8
14017 K_table:
14018 .long 0x493c7d27, 0x00000001
14019diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14020index 5d1e007..098cb4f 100644
14021--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14022+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14023@@ -18,6 +18,7 @@
14024
14025 #include <linux/linkage.h>
14026 #include <asm/inst.h>
14027+#include <asm/alternative-asm.h>
14028
14029 .data
14030
14031@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14032 psrlq $1, T2
14033 pxor T2, T1
14034 pxor T1, DATA
14035+ pax_force_retaddr
14036 ret
14037 ENDPROC(__clmul_gf128mul_ble)
14038
14039@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14040 call __clmul_gf128mul_ble
14041 PSHUFB_XMM BSWAP DATA
14042 movups DATA, (%rdi)
14043+ pax_force_retaddr
14044 ret
14045 ENDPROC(clmul_ghash_mul)
14046
14047@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14048 PSHUFB_XMM BSWAP DATA
14049 movups DATA, (%rdi)
14050 .Lupdate_just_ret:
14051+ pax_force_retaddr
14052 ret
14053 ENDPROC(clmul_ghash_update)
14054diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14055index 9279e0b..c4b3d2c 100644
14056--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14057+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14058@@ -1,4 +1,5 @@
14059 #include <linux/linkage.h>
14060+#include <asm/alternative-asm.h>
14061
14062 # enter salsa20_encrypt_bytes
14063 ENTRY(salsa20_encrypt_bytes)
14064@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14065 add %r11,%rsp
14066 mov %rdi,%rax
14067 mov %rsi,%rdx
14068+ pax_force_retaddr
14069 ret
14070 # bytesatleast65:
14071 ._bytesatleast65:
14072@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14073 add %r11,%rsp
14074 mov %rdi,%rax
14075 mov %rsi,%rdx
14076+ pax_force_retaddr
14077 ret
14078 ENDPROC(salsa20_keysetup)
14079
14080@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14081 add %r11,%rsp
14082 mov %rdi,%rax
14083 mov %rsi,%rdx
14084+ pax_force_retaddr
14085 ret
14086 ENDPROC(salsa20_ivsetup)
14087diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14088index 2f202f4..d9164d6 100644
14089--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14090+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14091@@ -24,6 +24,7 @@
14092 */
14093
14094 #include <linux/linkage.h>
14095+#include <asm/alternative-asm.h>
14096 #include "glue_helper-asm-avx.S"
14097
14098 .file "serpent-avx-x86_64-asm_64.S"
14099@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14100 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14101 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14102
14103+ pax_force_retaddr
14104 ret;
14105 ENDPROC(__serpent_enc_blk8_avx)
14106
14107@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14108 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14109 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14110
14111+ pax_force_retaddr
14112 ret;
14113 ENDPROC(__serpent_dec_blk8_avx)
14114
14115@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14116
14117 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14118
14119+ pax_force_retaddr
14120 ret;
14121 ENDPROC(serpent_ecb_enc_8way_avx)
14122
14123@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14124
14125 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14126
14127+ pax_force_retaddr
14128 ret;
14129 ENDPROC(serpent_ecb_dec_8way_avx)
14130
14131@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14132
14133 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14134
14135+ pax_force_retaddr
14136 ret;
14137 ENDPROC(serpent_cbc_dec_8way_avx)
14138
14139@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14140
14141 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14142
14143+ pax_force_retaddr
14144 ret;
14145 ENDPROC(serpent_ctr_8way_avx)
14146
14147@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14148 /* dst <= regs xor IVs(in dst) */
14149 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14150
14151+ pax_force_retaddr
14152 ret;
14153 ENDPROC(serpent_xts_enc_8way_avx)
14154
14155@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14156 /* dst <= regs xor IVs(in dst) */
14157 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14158
14159+ pax_force_retaddr
14160 ret;
14161 ENDPROC(serpent_xts_dec_8way_avx)
14162diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14163index b222085..abd483c 100644
14164--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14165+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14166@@ -15,6 +15,7 @@
14167 */
14168
14169 #include <linux/linkage.h>
14170+#include <asm/alternative-asm.h>
14171 #include "glue_helper-asm-avx2.S"
14172
14173 .file "serpent-avx2-asm_64.S"
14174@@ -610,6 +611,7 @@ __serpent_enc_blk16:
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_blk16)
14181
14182@@ -664,6 +666,7 @@ __serpent_dec_blk16:
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_blk16)
14189
14190@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14191
14192 vzeroupper;
14193
14194+ pax_force_retaddr
14195 ret;
14196 ENDPROC(serpent_ecb_enc_16way)
14197
14198@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14199
14200 vzeroupper;
14201
14202+ pax_force_retaddr
14203 ret;
14204 ENDPROC(serpent_ecb_dec_16way)
14205
14206@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14207
14208 vzeroupper;
14209
14210+ pax_force_retaddr
14211 ret;
14212 ENDPROC(serpent_cbc_dec_16way)
14213
14214@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14215
14216 vzeroupper;
14217
14218+ pax_force_retaddr
14219 ret;
14220 ENDPROC(serpent_ctr_16way)
14221
14222@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14223
14224 vzeroupper;
14225
14226+ pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_xts_enc_16way)
14229
14230@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14231
14232 vzeroupper;
14233
14234+ pax_force_retaddr
14235 ret;
14236 ENDPROC(serpent_xts_dec_16way)
14237diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14238index acc066c..1559cc4 100644
14239--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14240+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14241@@ -25,6 +25,7 @@
14242 */
14243
14244 #include <linux/linkage.h>
14245+#include <asm/alternative-asm.h>
14246
14247 .file "serpent-sse2-x86_64-asm_64.S"
14248 .text
14249@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14250 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14251 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14252
14253+ pax_force_retaddr
14254 ret;
14255
14256 .L__enc_xor8:
14257 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14258 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14259
14260+ pax_force_retaddr
14261 ret;
14262 ENDPROC(__serpent_enc_blk_8way)
14263
14264@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14265 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14266 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14267
14268+ pax_force_retaddr
14269 ret;
14270 ENDPROC(serpent_dec_blk_8way)
14271diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14272index a410950..9dfe7ad 100644
14273--- a/arch/x86/crypto/sha1_ssse3_asm.S
14274+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14275@@ -29,6 +29,7 @@
14276 */
14277
14278 #include <linux/linkage.h>
14279+#include <asm/alternative-asm.h>
14280
14281 #define CTX %rdi // arg1
14282 #define BUF %rsi // arg2
14283@@ -75,9 +76,9 @@
14284
14285 push %rbx
14286 push %rbp
14287- push %r12
14288+ push %r14
14289
14290- mov %rsp, %r12
14291+ mov %rsp, %r14
14292 sub $64, %rsp # allocate workspace
14293 and $~15, %rsp # align stack
14294
14295@@ -99,11 +100,12 @@
14296 xor %rax, %rax
14297 rep stosq
14298
14299- mov %r12, %rsp # deallocate workspace
14300+ mov %r14, %rsp # deallocate workspace
14301
14302- pop %r12
14303+ pop %r14
14304 pop %rbp
14305 pop %rbx
14306+ pax_force_retaddr
14307 ret
14308
14309 ENDPROC(\name)
14310diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14311index 92b3b5d..0dc1dcb 100644
14312--- a/arch/x86/crypto/sha256-avx-asm.S
14313+++ b/arch/x86/crypto/sha256-avx-asm.S
14314@@ -49,6 +49,7 @@
14315
14316 #ifdef CONFIG_AS_AVX
14317 #include <linux/linkage.h>
14318+#include <asm/alternative-asm.h>
14319
14320 ## assume buffers not aligned
14321 #define VMOVDQ vmovdqu
14322@@ -460,6 +461,7 @@ done_hash:
14323 popq %r13
14324 popq %rbp
14325 popq %rbx
14326+ pax_force_retaddr
14327 ret
14328 ENDPROC(sha256_transform_avx)
14329
14330diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14331index 570ec5e..cf2b625 100644
14332--- a/arch/x86/crypto/sha256-avx2-asm.S
14333+++ b/arch/x86/crypto/sha256-avx2-asm.S
14334@@ -50,6 +50,7 @@
14335
14336 #ifdef CONFIG_AS_AVX2
14337 #include <linux/linkage.h>
14338+#include <asm/alternative-asm.h>
14339
14340 ## assume buffers not aligned
14341 #define VMOVDQ vmovdqu
14342@@ -720,6 +721,7 @@ done_hash:
14343 popq %r12
14344 popq %rbp
14345 popq %rbx
14346+ pax_force_retaddr
14347 ret
14348 ENDPROC(sha256_transform_rorx)
14349
14350diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14351index 2cedc44..5144899 100644
14352--- a/arch/x86/crypto/sha256-ssse3-asm.S
14353+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14354@@ -47,6 +47,7 @@
14355 ########################################################################
14356
14357 #include <linux/linkage.h>
14358+#include <asm/alternative-asm.h>
14359
14360 ## assume buffers not aligned
14361 #define MOVDQ movdqu
14362@@ -471,6 +472,7 @@ done_hash:
14363 popq %rbp
14364 popq %rbx
14365
14366+ pax_force_retaddr
14367 ret
14368 ENDPROC(sha256_transform_ssse3)
14369
14370diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14371index 565274d..af6bc08 100644
14372--- a/arch/x86/crypto/sha512-avx-asm.S
14373+++ b/arch/x86/crypto/sha512-avx-asm.S
14374@@ -49,6 +49,7 @@
14375
14376 #ifdef CONFIG_AS_AVX
14377 #include <linux/linkage.h>
14378+#include <asm/alternative-asm.h>
14379
14380 .text
14381
14382@@ -364,6 +365,7 @@ updateblock:
14383 mov frame_RSPSAVE(%rsp), %rsp
14384
14385 nowork:
14386+ pax_force_retaddr
14387 ret
14388 ENDPROC(sha512_transform_avx)
14389
14390diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14391index 1f20b35..f25c8c1 100644
14392--- a/arch/x86/crypto/sha512-avx2-asm.S
14393+++ b/arch/x86/crypto/sha512-avx2-asm.S
14394@@ -51,6 +51,7 @@
14395
14396 #ifdef CONFIG_AS_AVX2
14397 #include <linux/linkage.h>
14398+#include <asm/alternative-asm.h>
14399
14400 .text
14401
14402@@ -678,6 +679,7 @@ done_hash:
14403
14404 # Restore Stack Pointer
14405 mov frame_RSPSAVE(%rsp), %rsp
14406+ pax_force_retaddr
14407 ret
14408 ENDPROC(sha512_transform_rorx)
14409
14410diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14411index e610e29..ffcb5ed 100644
14412--- a/arch/x86/crypto/sha512-ssse3-asm.S
14413+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14414@@ -48,6 +48,7 @@
14415 ########################################################################
14416
14417 #include <linux/linkage.h>
14418+#include <asm/alternative-asm.h>
14419
14420 .text
14421
14422@@ -363,6 +364,7 @@ updateblock:
14423 mov frame_RSPSAVE(%rsp), %rsp
14424
14425 nowork:
14426+ pax_force_retaddr
14427 ret
14428 ENDPROC(sha512_transform_ssse3)
14429
14430diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14431index 0505813..b067311 100644
14432--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14433+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14434@@ -24,6 +24,7 @@
14435 */
14436
14437 #include <linux/linkage.h>
14438+#include <asm/alternative-asm.h>
14439 #include "glue_helper-asm-avx.S"
14440
14441 .file "twofish-avx-x86_64-asm_64.S"
14442@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14443 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14444 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14445
14446+ pax_force_retaddr
14447 ret;
14448 ENDPROC(__twofish_enc_blk8)
14449
14450@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14451 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14452 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14453
14454+ pax_force_retaddr
14455 ret;
14456 ENDPROC(__twofish_dec_blk8)
14457
14458@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14459
14460 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14461
14462+ pax_force_retaddr
14463 ret;
14464 ENDPROC(twofish_ecb_enc_8way)
14465
14466@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14467
14468 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14469
14470+ pax_force_retaddr
14471 ret;
14472 ENDPROC(twofish_ecb_dec_8way)
14473
14474@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14475 * %rdx: src
14476 */
14477
14478- pushq %r12;
14479+ pushq %r14;
14480
14481 movq %rsi, %r11;
14482- movq %rdx, %r12;
14483+ movq %rdx, %r14;
14484
14485 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14486
14487 call __twofish_dec_blk8;
14488
14489- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14490+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14491
14492- popq %r12;
14493+ popq %r14;
14494
14495+ pax_force_retaddr
14496 ret;
14497 ENDPROC(twofish_cbc_dec_8way)
14498
14499@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14500 * %rcx: iv (little endian, 128bit)
14501 */
14502
14503- pushq %r12;
14504+ pushq %r14;
14505
14506 movq %rsi, %r11;
14507- movq %rdx, %r12;
14508+ movq %rdx, %r14;
14509
14510 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14511 RD2, RX0, RX1, RY0);
14512
14513 call __twofish_enc_blk8;
14514
14515- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14516+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14517
14518- popq %r12;
14519+ popq %r14;
14520
14521+ pax_force_retaddr
14522 ret;
14523 ENDPROC(twofish_ctr_8way)
14524
14525@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14526 /* dst <= regs xor IVs(in dst) */
14527 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14528
14529+ pax_force_retaddr
14530 ret;
14531 ENDPROC(twofish_xts_enc_8way)
14532
14533@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14534 /* dst <= regs xor IVs(in dst) */
14535 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14536
14537+ pax_force_retaddr
14538 ret;
14539 ENDPROC(twofish_xts_dec_8way)
14540diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14541index 1c3b7ce..02f578d 100644
14542--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14543+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14544@@ -21,6 +21,7 @@
14545 */
14546
14547 #include <linux/linkage.h>
14548+#include <asm/alternative-asm.h>
14549
14550 .file "twofish-x86_64-asm-3way.S"
14551 .text
14552@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14553 popq %r13;
14554 popq %r14;
14555 popq %r15;
14556+ pax_force_retaddr
14557 ret;
14558
14559 .L__enc_xor3:
14560@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14561 popq %r13;
14562 popq %r14;
14563 popq %r15;
14564+ pax_force_retaddr
14565 ret;
14566 ENDPROC(__twofish_enc_blk_3way)
14567
14568@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14569 popq %r13;
14570 popq %r14;
14571 popq %r15;
14572+ pax_force_retaddr
14573 ret;
14574 ENDPROC(twofish_dec_blk_3way)
14575diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14576index a350c99..c1bac24 100644
14577--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14578+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14579@@ -22,6 +22,7 @@
14580
14581 #include <linux/linkage.h>
14582 #include <asm/asm-offsets.h>
14583+#include <asm/alternative-asm.h>
14584
14585 #define a_offset 0
14586 #define b_offset 4
14587@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14588
14589 popq R1
14590 movl $1,%eax
14591+ pax_force_retaddr
14592 ret
14593 ENDPROC(twofish_enc_blk)
14594
14595@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14596
14597 popq R1
14598 movl $1,%eax
14599+ pax_force_retaddr
14600 ret
14601 ENDPROC(twofish_dec_blk)
14602diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14603index ae6aad1..719d6d9 100644
14604--- a/arch/x86/ia32/ia32_aout.c
14605+++ b/arch/x86/ia32/ia32_aout.c
14606@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14607 unsigned long dump_start, dump_size;
14608 struct user32 dump;
14609
14610+ memset(&dump, 0, sizeof(dump));
14611+
14612 fs = get_fs();
14613 set_fs(KERNEL_DS);
14614 has_dumped = 1;
14615diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14616index c81d35e6..3500144 100644
14617--- a/arch/x86/ia32/ia32_signal.c
14618+++ b/arch/x86/ia32/ia32_signal.c
14619@@ -216,7 +216,7 @@ asmlinkage long sys32_sigreturn(void)
14620 if (__get_user(set.sig[0], &frame->sc.oldmask)
14621 || (_COMPAT_NSIG_WORDS > 1
14622 && __copy_from_user((((char *) &set.sig) + 4),
14623- &frame->extramask,
14624+ frame->extramask,
14625 sizeof(frame->extramask))))
14626 goto badframe;
14627
14628@@ -335,7 +335,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14629 sp -= frame_size;
14630 /* Align the stack pointer according to the i386 ABI,
14631 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14632- sp = ((sp + 4) & -16ul) - 4;
14633+ sp = ((sp - 12) & -16ul) - 4;
14634 return (void __user *) sp;
14635 }
14636
14637@@ -380,10 +380,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14638 } else {
14639 /* Return stub is in 32bit vsyscall page */
14640 if (current->mm->context.vdso)
14641- restorer = current->mm->context.vdso +
14642- selected_vdso32->sym___kernel_sigreturn;
14643+ restorer = (void __force_user *)(current->mm->context.vdso +
14644+ selected_vdso32->sym___kernel_sigreturn);
14645 else
14646- restorer = &frame->retcode;
14647+ restorer = frame->retcode;
14648 }
14649
14650 put_user_try {
14651@@ -393,7 +393,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14652 * These are actually not used anymore, but left because some
14653 * gdb versions depend on them as a marker.
14654 */
14655- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14656+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14657 } put_user_catch(err);
14658
14659 if (err)
14660@@ -435,7 +435,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14661 0xb8,
14662 __NR_ia32_rt_sigreturn,
14663 0x80cd,
14664- 0,
14665+ 0
14666 };
14667
14668 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14669@@ -458,16 +458,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14670
14671 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14672 restorer = ksig->ka.sa.sa_restorer;
14673+ else if (current->mm->context.vdso)
14674+ /* Return stub is in 32bit vsyscall page */
14675+ restorer = (void __force_user *)(current->mm->context.vdso +
14676+ selected_vdso32->sym___kernel_rt_sigreturn);
14677 else
14678- restorer = current->mm->context.vdso +
14679- selected_vdso32->sym___kernel_rt_sigreturn;
14680+ restorer = frame->retcode;
14681 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14682
14683 /*
14684 * Not actually used anymore, but left because some gdb
14685 * versions need it.
14686 */
14687- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14688+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14689 } put_user_catch(err);
14690
14691 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14692diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14693index 72bf268..127572a 100644
14694--- a/arch/x86/ia32/ia32entry.S
14695+++ b/arch/x86/ia32/ia32entry.S
14696@@ -15,8 +15,10 @@
14697 #include <asm/irqflags.h>
14698 #include <asm/asm.h>
14699 #include <asm/smap.h>
14700+#include <asm/pgtable.h>
14701 #include <linux/linkage.h>
14702 #include <linux/err.h>
14703+#include <asm/alternative-asm.h>
14704
14705 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14706 #include <linux/elf-em.h>
14707@@ -85,6 +87,32 @@ ENTRY(native_irq_enable_sysexit)
14708 ENDPROC(native_irq_enable_sysexit)
14709 #endif
14710
14711+ .macro pax_enter_kernel_user
14712+ pax_set_fptr_mask
14713+#ifdef CONFIG_PAX_MEMORY_UDEREF
14714+ call pax_enter_kernel_user
14715+#endif
14716+ .endm
14717+
14718+ .macro pax_exit_kernel_user
14719+#ifdef CONFIG_PAX_MEMORY_UDEREF
14720+ call pax_exit_kernel_user
14721+#endif
14722+#ifdef CONFIG_PAX_RANDKSTACK
14723+ pushq %rax
14724+ pushq %r11
14725+ call pax_randomize_kstack
14726+ popq %r11
14727+ popq %rax
14728+#endif
14729+ .endm
14730+
14731+ .macro pax_erase_kstack
14732+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14733+ call pax_erase_kstack
14734+#endif
14735+ .endm
14736+
14737 /*
14738 * 32bit SYSENTER instruction entry.
14739 *
14740@@ -119,23 +147,24 @@ ENTRY(ia32_sysenter_target)
14741 * it is too small to ever cause noticeable irq latency.
14742 */
14743 SWAPGS_UNSAFE_STACK
14744- movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp
14745- ENABLE_INTERRUPTS(CLBR_NONE)
14746+ movq PER_CPU_VAR(kernel_stack), %rsp
14747
14748 /* Zero-extending 32-bit regs, do not remove */
14749 movl %ebp, %ebp
14750 movl %eax, %eax
14751
14752- movl ASM_THREAD_INFO(TI_sysenter_return, %rsp, 0), %r10d
14753- CFI_REGISTER rip,r10
14754+ GET_THREAD_INFO(%r11)
14755+ movl TI_sysenter_return(%r11), %r11d
14756+ CFI_REGISTER rip,r11
14757
14758 /* Construct struct pt_regs on stack */
14759 pushq_cfi $__USER32_DS /* pt_regs->ss */
14760 pushq_cfi %rbp /* pt_regs->sp */
14761 CFI_REL_OFFSET rsp,0
14762 pushfq_cfi /* pt_regs->flags */
14763+ orl $X86_EFLAGS_IF,(%rsp)
14764 pushq_cfi $__USER32_CS /* pt_regs->cs */
14765- pushq_cfi %r10 /* pt_regs->ip = thread_info->sysenter_return */
14766+ pushq_cfi %r11 /* pt_regs->ip = thread_info->sysenter_return */
14767 CFI_REL_OFFSET rip,0
14768 pushq_cfi_reg rax /* pt_regs->orig_ax */
14769 pushq_cfi_reg rdi /* pt_regs->di */
14770@@ -147,15 +176,37 @@ ENTRY(ia32_sysenter_target)
14771 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14772 CFI_ADJUST_CFA_OFFSET 10*8
14773
14774+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14775+ movq_cfi r12, R12
14776+#endif
14777+
14778+ pax_enter_kernel_user
14779+
14780+#ifdef CONFIG_PAX_RANDKSTACK
14781+ pax_erase_kstack
14782+#endif
14783+
14784+ ENABLE_INTERRUPTS(CLBR_NONE)
14785+
14786 /*
14787 * no need to do an access_ok check here because rbp has been
14788 * 32bit zero extended
14789 */
14790+
14791+#ifdef CONFIG_PAX_MEMORY_UDEREF
14792+ addq pax_user_shadow_base,%rbp
14793+ ASM_PAX_OPEN_USERLAND
14794+#endif
14795+
14796 ASM_STAC
14797 1: movl (%rbp),%ebp
14798 _ASM_EXTABLE(1b,ia32_badarg)
14799 ASM_CLAC
14800
14801+#ifdef CONFIG_PAX_MEMORY_UDEREF
14802+ ASM_PAX_CLOSE_USERLAND
14803+#endif
14804+
14805 /*
14806 * Sysenter doesn't filter flags, so we need to clear NT
14807 * ourselves. To save a few cycles, we can check whether
14808@@ -165,8 +216,9 @@ ENTRY(ia32_sysenter_target)
14809 jnz sysenter_fix_flags
14810 sysenter_flags_fixed:
14811
14812- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14813- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14814+ GET_THREAD_INFO(%r11)
14815+ orl $TS_COMPAT,TI_status(%r11)
14816+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14817 CFI_REMEMBER_STATE
14818 jnz sysenter_tracesys
14819 cmpq $(IA32_NR_syscalls-1),%rax
14820@@ -181,9 +233,10 @@ sysenter_do_call:
14821 sysenter_dispatch:
14822 call *ia32_sys_call_table(,%rax,8)
14823 movq %rax,RAX(%rsp)
14824+ GET_THREAD_INFO(%r11)
14825 DISABLE_INTERRUPTS(CLBR_NONE)
14826 TRACE_IRQS_OFF
14827- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14828+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14829 jnz sysexit_audit
14830 sysexit_from_sys_call:
14831 /*
14832@@ -196,7 +249,9 @@ sysexit_from_sys_call:
14833 * This code path is still called 'sysexit' because it pairs
14834 * with 'sysenter' and it uses the SYSENTER calling convention.
14835 */
14836- andl $~TS_COMPAT,ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14837+ pax_exit_kernel_user
14838+ pax_erase_kstack
14839+ andl $~TS_COMPAT,TI_status(%r11)
14840 movl RIP(%rsp),%ecx /* User %eip */
14841 CFI_REGISTER rip,rcx
14842 RESTORE_RSI_RDI
14843@@ -247,6 +302,9 @@ sysexit_from_sys_call:
14844 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14845 movl %eax,%edi /* 1st arg: syscall number */
14846 call __audit_syscall_entry
14847+
14848+ pax_erase_kstack
14849+
14850 movl RAX(%rsp),%eax /* reload syscall number */
14851 cmpq $(IA32_NR_syscalls-1),%rax
14852 ja ia32_badsys
14853@@ -258,7 +316,7 @@ sysexit_from_sys_call:
14854 .endm
14855
14856 .macro auditsys_exit exit
14857- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14858+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14859 jnz ia32_ret_from_sys_call
14860 TRACE_IRQS_ON
14861 ENABLE_INTERRUPTS(CLBR_NONE)
14862@@ -269,11 +327,12 @@ sysexit_from_sys_call:
14863 1: setbe %al /* 1 if error, 0 if not */
14864 movzbl %al,%edi /* zero-extend that into %edi */
14865 call __audit_syscall_exit
14866+ GET_THREAD_INFO(%r11)
14867 movq RAX(%rsp),%rax /* reload syscall return value */
14868 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14869 DISABLE_INTERRUPTS(CLBR_NONE)
14870 TRACE_IRQS_OFF
14871- testl %edi, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14872+ testl %edi,TI_flags(%r11)
14873 jz \exit
14874 CLEAR_RREGS
14875 jmp int_with_check
14876@@ -295,7 +354,7 @@ sysenter_fix_flags:
14877
14878 sysenter_tracesys:
14879 #ifdef CONFIG_AUDITSYSCALL
14880- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14881+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14882 jz sysenter_auditsys
14883 #endif
14884 SAVE_EXTRA_REGS
14885@@ -307,6 +366,9 @@ sysenter_tracesys:
14886 RESTORE_EXTRA_REGS
14887 cmpq $(IA32_NR_syscalls-1),%rax
14888 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14889+
14890+ pax_erase_kstack
14891+
14892 jmp sysenter_do_call
14893 CFI_ENDPROC
14894 ENDPROC(ia32_sysenter_target)
14895@@ -357,7 +419,6 @@ ENTRY(ia32_cstar_target)
14896 movl %esp,%r8d
14897 CFI_REGISTER rsp,r8
14898 movq PER_CPU_VAR(kernel_stack),%rsp
14899- ENABLE_INTERRUPTS(CLBR_NONE)
14900
14901 /* Zero-extending 32-bit regs, do not remove */
14902 movl %eax,%eax
14903@@ -380,16 +441,41 @@ ENTRY(ia32_cstar_target)
14904 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14905 CFI_ADJUST_CFA_OFFSET 10*8
14906
14907+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14908+ movq_cfi r12, R12
14909+#endif
14910+
14911+ pax_enter_kernel_user
14912+
14913+#ifdef CONFIG_PAX_RANDKSTACK
14914+ pax_erase_kstack
14915+#endif
14916+
14917+ ENABLE_INTERRUPTS(CLBR_NONE)
14918+
14919 /*
14920 * no need to do an access_ok check here because r8 has been
14921 * 32bit zero extended
14922 */
14923+
14924+#ifdef CONFIG_PAX_MEMORY_UDEREF
14925+ ASM_PAX_OPEN_USERLAND
14926+ movq pax_user_shadow_base,%r8
14927+ addq RSP(%rsp),%r8
14928+#endif
14929+
14930 ASM_STAC
14931 1: movl (%r8),%r9d
14932 _ASM_EXTABLE(1b,ia32_badarg)
14933 ASM_CLAC
14934- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14935- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14936+
14937+#ifdef CONFIG_PAX_MEMORY_UDEREF
14938+ ASM_PAX_CLOSE_USERLAND
14939+#endif
14940+
14941+ GET_THREAD_INFO(%r11)
14942+ orl $TS_COMPAT,TI_status(%r11)
14943+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14944 CFI_REMEMBER_STATE
14945 jnz cstar_tracesys
14946 cmpq $IA32_NR_syscalls-1,%rax
14947@@ -404,12 +490,15 @@ cstar_do_call:
14948 cstar_dispatch:
14949 call *ia32_sys_call_table(,%rax,8)
14950 movq %rax,RAX(%rsp)
14951+ GET_THREAD_INFO(%r11)
14952 DISABLE_INTERRUPTS(CLBR_NONE)
14953 TRACE_IRQS_OFF
14954- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14955+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14956 jnz sysretl_audit
14957 sysretl_from_sys_call:
14958- andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14959+ pax_exit_kernel_user
14960+ pax_erase_kstack
14961+ andl $~TS_COMPAT,TI_status(%r11)
14962 RESTORE_RSI_RDI_RDX
14963 movl RIP(%rsp),%ecx
14964 CFI_REGISTER rip,rcx
14965@@ -451,7 +540,7 @@ sysretl_audit:
14966
14967 cstar_tracesys:
14968 #ifdef CONFIG_AUDITSYSCALL
14969- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14970+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14971 jz cstar_auditsys
14972 #endif
14973 xchgl %r9d,%ebp
14974@@ -465,11 +554,19 @@ cstar_tracesys:
14975 xchgl %ebp,%r9d
14976 cmpq $(IA32_NR_syscalls-1),%rax
14977 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14978+
14979+ pax_erase_kstack
14980+
14981 jmp cstar_do_call
14982 END(ia32_cstar_target)
14983
14984 ia32_badarg:
14985 ASM_CLAC
14986+
14987+#ifdef CONFIG_PAX_MEMORY_UDEREF
14988+ ASM_PAX_CLOSE_USERLAND
14989+#endif
14990+
14991 movq $-EFAULT,%rax
14992 jmp ia32_sysret
14993 CFI_ENDPROC
14994@@ -505,14 +602,8 @@ ENTRY(ia32_syscall)
14995 /*CFI_REL_OFFSET cs,1*8 */
14996 CFI_REL_OFFSET rip,0*8
14997
14998- /*
14999- * Interrupts are off on entry.
15000- * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15001- * it is too small to ever cause noticeable irq latency.
15002- */
15003 PARAVIRT_ADJUST_EXCEPTION_FRAME
15004 SWAPGS
15005- ENABLE_INTERRUPTS(CLBR_NONE)
15006
15007 /* Zero-extending 32-bit regs, do not remove */
15008 movl %eax,%eax
15009@@ -528,8 +619,26 @@ ENTRY(ia32_syscall)
15010 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
15011 CFI_ADJUST_CFA_OFFSET 10*8
15012
15013- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15014- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15015+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15016+ movq_cfi r12, R12
15017+#endif
15018+
15019+ pax_enter_kernel_user
15020+
15021+#ifdef CONFIG_PAX_RANDKSTACK
15022+ pax_erase_kstack
15023+#endif
15024+
15025+ /*
15026+ * Interrupts are off on entry.
15027+ * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15028+ * it is too small to ever cause noticeable irq latency.
15029+ */
15030+ ENABLE_INTERRUPTS(CLBR_NONE)
15031+
15032+ GET_THREAD_INFO(%r11)
15033+ orl $TS_COMPAT,TI_status(%r11)
15034+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15035 jnz ia32_tracesys
15036 cmpq $(IA32_NR_syscalls-1),%rax
15037 ja ia32_badsys
15038@@ -557,6 +666,9 @@ ia32_tracesys:
15039 RESTORE_EXTRA_REGS
15040 cmpq $(IA32_NR_syscalls-1),%rax
15041 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15042+
15043+ pax_erase_kstack
15044+
15045 jmp ia32_do_call
15046 END(ia32_syscall)
15047
15048diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15049index 719cd70..69d576b 100644
15050--- a/arch/x86/ia32/sys_ia32.c
15051+++ b/arch/x86/ia32/sys_ia32.c
15052@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15053 */
15054 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15055 {
15056- typeof(ubuf->st_uid) uid = 0;
15057- typeof(ubuf->st_gid) gid = 0;
15058+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15059+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15060 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15061 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15062 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15063diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15064index bdf02ee..51a4656 100644
15065--- a/arch/x86/include/asm/alternative-asm.h
15066+++ b/arch/x86/include/asm/alternative-asm.h
15067@@ -18,6 +18,45 @@
15068 .endm
15069 #endif
15070
15071+#ifdef KERNEXEC_PLUGIN
15072+ .macro pax_force_retaddr_bts rip=0
15073+ btsq $63,\rip(%rsp)
15074+ .endm
15075+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15076+ .macro pax_force_retaddr rip=0, reload=0
15077+ btsq $63,\rip(%rsp)
15078+ .endm
15079+ .macro pax_force_fptr ptr
15080+ btsq $63,\ptr
15081+ .endm
15082+ .macro pax_set_fptr_mask
15083+ .endm
15084+#endif
15085+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15086+ .macro pax_force_retaddr rip=0, reload=0
15087+ .if \reload
15088+ pax_set_fptr_mask
15089+ .endif
15090+ orq %r12,\rip(%rsp)
15091+ .endm
15092+ .macro pax_force_fptr ptr
15093+ orq %r12,\ptr
15094+ .endm
15095+ .macro pax_set_fptr_mask
15096+ movabs $0x8000000000000000,%r12
15097+ .endm
15098+#endif
15099+#else
15100+ .macro pax_force_retaddr rip=0, reload=0
15101+ .endm
15102+ .macro pax_force_fptr ptr
15103+ .endm
15104+ .macro pax_force_retaddr_bts rip=0
15105+ .endm
15106+ .macro pax_set_fptr_mask
15107+ .endm
15108+#endif
15109+
15110 .macro altinstruction_entry orig alt feature orig_len alt_len pad_len
15111 .long \orig - .
15112 .long \alt - .
15113@@ -38,7 +77,7 @@
15114 altinstruction_entry 140b,143f,\feature,142b-140b,144f-143f,142b-141b
15115 .popsection
15116
15117- .pushsection .altinstr_replacement,"ax"
15118+ .pushsection .altinstr_replacement,"a"
15119 143:
15120 \newinstr
15121 144:
15122@@ -68,7 +107,7 @@
15123 altinstruction_entry 140b,144f,\feature2,142b-140b,145f-144f,142b-141b
15124 .popsection
15125
15126- .pushsection .altinstr_replacement,"ax"
15127+ .pushsection .altinstr_replacement,"a"
15128 143:
15129 \newinstr1
15130 144:
15131diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15132index ba32af0..ff42fc0 100644
15133--- a/arch/x86/include/asm/alternative.h
15134+++ b/arch/x86/include/asm/alternative.h
15135@@ -130,7 +130,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15136 ".pushsection .altinstructions,\"a\"\n" \
15137 ALTINSTR_ENTRY(feature, 1) \
15138 ".popsection\n" \
15139- ".pushsection .altinstr_replacement, \"ax\"\n" \
15140+ ".pushsection .altinstr_replacement, \"a\"\n" \
15141 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15142 ".popsection"
15143
15144@@ -140,7 +140,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15145 ALTINSTR_ENTRY(feature1, 1) \
15146 ALTINSTR_ENTRY(feature2, 2) \
15147 ".popsection\n" \
15148- ".pushsection .altinstr_replacement, \"ax\"\n" \
15149+ ".pushsection .altinstr_replacement, \"a\"\n" \
15150 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15151 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15152 ".popsection"
15153diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15154index 976b86a..f3bc83a 100644
15155--- a/arch/x86/include/asm/apic.h
15156+++ b/arch/x86/include/asm/apic.h
15157@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15158
15159 #ifdef CONFIG_X86_LOCAL_APIC
15160
15161-extern unsigned int apic_verbosity;
15162+extern int apic_verbosity;
15163 extern int local_apic_timer_c2_ok;
15164
15165 extern int disable_apic;
15166diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15167index 20370c6..a2eb9b0 100644
15168--- a/arch/x86/include/asm/apm.h
15169+++ b/arch/x86/include/asm/apm.h
15170@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15171 __asm__ __volatile__(APM_DO_ZERO_SEGS
15172 "pushl %%edi\n\t"
15173 "pushl %%ebp\n\t"
15174- "lcall *%%cs:apm_bios_entry\n\t"
15175+ "lcall *%%ss:apm_bios_entry\n\t"
15176 "setc %%al\n\t"
15177 "popl %%ebp\n\t"
15178 "popl %%edi\n\t"
15179@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15180 __asm__ __volatile__(APM_DO_ZERO_SEGS
15181 "pushl %%edi\n\t"
15182 "pushl %%ebp\n\t"
15183- "lcall *%%cs:apm_bios_entry\n\t"
15184+ "lcall *%%ss:apm_bios_entry\n\t"
15185 "setc %%bl\n\t"
15186 "popl %%ebp\n\t"
15187 "popl %%edi\n\t"
15188diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15189index 5e5cd12..51cdc93 100644
15190--- a/arch/x86/include/asm/atomic.h
15191+++ b/arch/x86/include/asm/atomic.h
15192@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15193 }
15194
15195 /**
15196+ * atomic_read_unchecked - read atomic variable
15197+ * @v: pointer of type atomic_unchecked_t
15198+ *
15199+ * Atomically reads the value of @v.
15200+ */
15201+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15202+{
15203+ return ACCESS_ONCE((v)->counter);
15204+}
15205+
15206+/**
15207 * atomic_set - set atomic variable
15208 * @v: pointer of type atomic_t
15209 * @i: required value
15210@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15211 }
15212
15213 /**
15214+ * atomic_set_unchecked - set atomic variable
15215+ * @v: pointer of type atomic_unchecked_t
15216+ * @i: required value
15217+ *
15218+ * Atomically sets the value of @v to @i.
15219+ */
15220+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15221+{
15222+ v->counter = i;
15223+}
15224+
15225+/**
15226 * atomic_add - add integer to atomic variable
15227 * @i: integer value to add
15228 * @v: pointer of type atomic_t
15229@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15230 */
15231 static inline void atomic_add(int i, atomic_t *v)
15232 {
15233- asm volatile(LOCK_PREFIX "addl %1,%0"
15234+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15235+
15236+#ifdef CONFIG_PAX_REFCOUNT
15237+ "jno 0f\n"
15238+ LOCK_PREFIX "subl %1,%0\n"
15239+ "int $4\n0:\n"
15240+ _ASM_EXTABLE(0b, 0b)
15241+#endif
15242+
15243+ : "+m" (v->counter)
15244+ : "ir" (i));
15245+}
15246+
15247+/**
15248+ * atomic_add_unchecked - add integer to atomic variable
15249+ * @i: integer value to add
15250+ * @v: pointer of type atomic_unchecked_t
15251+ *
15252+ * Atomically adds @i to @v.
15253+ */
15254+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15255+{
15256+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15257 : "+m" (v->counter)
15258 : "ir" (i));
15259 }
15260@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15261 */
15262 static inline void atomic_sub(int i, atomic_t *v)
15263 {
15264- asm volatile(LOCK_PREFIX "subl %1,%0"
15265+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15266+
15267+#ifdef CONFIG_PAX_REFCOUNT
15268+ "jno 0f\n"
15269+ LOCK_PREFIX "addl %1,%0\n"
15270+ "int $4\n0:\n"
15271+ _ASM_EXTABLE(0b, 0b)
15272+#endif
15273+
15274+ : "+m" (v->counter)
15275+ : "ir" (i));
15276+}
15277+
15278+/**
15279+ * atomic_sub_unchecked - subtract integer from atomic variable
15280+ * @i: integer value to subtract
15281+ * @v: pointer of type atomic_unchecked_t
15282+ *
15283+ * Atomically subtracts @i from @v.
15284+ */
15285+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15286+{
15287+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15288 : "+m" (v->counter)
15289 : "ir" (i));
15290 }
15291@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15292 */
15293 static inline int atomic_sub_and_test(int i, atomic_t *v)
15294 {
15295- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15296+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15297 }
15298
15299 /**
15300@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15301 */
15302 static inline void atomic_inc(atomic_t *v)
15303 {
15304- asm volatile(LOCK_PREFIX "incl %0"
15305+ asm volatile(LOCK_PREFIX "incl %0\n"
15306+
15307+#ifdef CONFIG_PAX_REFCOUNT
15308+ "jno 0f\n"
15309+ LOCK_PREFIX "decl %0\n"
15310+ "int $4\n0:\n"
15311+ _ASM_EXTABLE(0b, 0b)
15312+#endif
15313+
15314+ : "+m" (v->counter));
15315+}
15316+
15317+/**
15318+ * atomic_inc_unchecked - increment atomic variable
15319+ * @v: pointer of type atomic_unchecked_t
15320+ *
15321+ * Atomically increments @v by 1.
15322+ */
15323+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15324+{
15325+ asm volatile(LOCK_PREFIX "incl %0\n"
15326 : "+m" (v->counter));
15327 }
15328
15329@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15330 */
15331 static inline void atomic_dec(atomic_t *v)
15332 {
15333- asm volatile(LOCK_PREFIX "decl %0"
15334+ asm volatile(LOCK_PREFIX "decl %0\n"
15335+
15336+#ifdef CONFIG_PAX_REFCOUNT
15337+ "jno 0f\n"
15338+ LOCK_PREFIX "incl %0\n"
15339+ "int $4\n0:\n"
15340+ _ASM_EXTABLE(0b, 0b)
15341+#endif
15342+
15343+ : "+m" (v->counter));
15344+}
15345+
15346+/**
15347+ * atomic_dec_unchecked - decrement atomic variable
15348+ * @v: pointer of type atomic_unchecked_t
15349+ *
15350+ * Atomically decrements @v by 1.
15351+ */
15352+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15353+{
15354+ asm volatile(LOCK_PREFIX "decl %0\n"
15355 : "+m" (v->counter));
15356 }
15357
15358@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15359 */
15360 static inline int atomic_dec_and_test(atomic_t *v)
15361 {
15362- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15363+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15364 }
15365
15366 /**
15367@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15368 */
15369 static inline int atomic_inc_and_test(atomic_t *v)
15370 {
15371- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15372+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15373+}
15374+
15375+/**
15376+ * atomic_inc_and_test_unchecked - increment and test
15377+ * @v: pointer of type atomic_unchecked_t
15378+ *
15379+ * Atomically increments @v by 1
15380+ * and returns true if the result is zero, or false for all
15381+ * other cases.
15382+ */
15383+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15384+{
15385+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15386 }
15387
15388 /**
15389@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15390 */
15391 static inline int atomic_add_negative(int i, atomic_t *v)
15392 {
15393- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15394+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15395 }
15396
15397 /**
15398@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15399 *
15400 * Atomically adds @i to @v and returns @i + @v
15401 */
15402-static inline int atomic_add_return(int i, atomic_t *v)
15403+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15404+{
15405+ return i + xadd_check_overflow(&v->counter, i);
15406+}
15407+
15408+/**
15409+ * atomic_add_return_unchecked - add integer and return
15410+ * @i: integer value to add
15411+ * @v: pointer of type atomic_unchecked_t
15412+ *
15413+ * Atomically adds @i to @v and returns @i + @v
15414+ */
15415+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15416 {
15417 return i + xadd(&v->counter, i);
15418 }
15419@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15420 *
15421 * Atomically subtracts @i from @v and returns @v - @i
15422 */
15423-static inline int atomic_sub_return(int i, atomic_t *v)
15424+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15425 {
15426 return atomic_add_return(-i, v);
15427 }
15428
15429 #define atomic_inc_return(v) (atomic_add_return(1, v))
15430+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15431+{
15432+ return atomic_add_return_unchecked(1, v);
15433+}
15434 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15435
15436-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15437+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15438+{
15439+ return cmpxchg(&v->counter, old, new);
15440+}
15441+
15442+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15443 {
15444 return cmpxchg(&v->counter, old, new);
15445 }
15446@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15447 return xchg(&v->counter, new);
15448 }
15449
15450+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15451+{
15452+ return xchg(&v->counter, new);
15453+}
15454+
15455 /**
15456 * __atomic_add_unless - add unless the number is already a given value
15457 * @v: pointer of type atomic_t
15458@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15459 */
15460 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15461 {
15462- int c, old;
15463+ int c, old, new;
15464 c = atomic_read(v);
15465 for (;;) {
15466- if (unlikely(c == (u)))
15467+ if (unlikely(c == u))
15468 break;
15469- old = atomic_cmpxchg((v), c, c + (a));
15470+
15471+ asm volatile("addl %2,%0\n"
15472+
15473+#ifdef CONFIG_PAX_REFCOUNT
15474+ "jno 0f\n"
15475+ "subl %2,%0\n"
15476+ "int $4\n0:\n"
15477+ _ASM_EXTABLE(0b, 0b)
15478+#endif
15479+
15480+ : "=r" (new)
15481+ : "0" (c), "ir" (a));
15482+
15483+ old = atomic_cmpxchg(v, c, new);
15484 if (likely(old == c))
15485 break;
15486 c = old;
15487@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15488 }
15489
15490 /**
15491+ * atomic_inc_not_zero_hint - increment if not null
15492+ * @v: pointer of type atomic_t
15493+ * @hint: probable value of the atomic before the increment
15494+ *
15495+ * This version of atomic_inc_not_zero() gives a hint of probable
15496+ * value of the atomic. This helps processor to not read the memory
15497+ * before doing the atomic read/modify/write cycle, lowering
15498+ * number of bus transactions on some arches.
15499+ *
15500+ * Returns: 0 if increment was not done, 1 otherwise.
15501+ */
15502+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15503+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15504+{
15505+ int val, c = hint, new;
15506+
15507+ /* sanity test, should be removed by compiler if hint is a constant */
15508+ if (!hint)
15509+ return __atomic_add_unless(v, 1, 0);
15510+
15511+ do {
15512+ asm volatile("incl %0\n"
15513+
15514+#ifdef CONFIG_PAX_REFCOUNT
15515+ "jno 0f\n"
15516+ "decl %0\n"
15517+ "int $4\n0:\n"
15518+ _ASM_EXTABLE(0b, 0b)
15519+#endif
15520+
15521+ : "=r" (new)
15522+ : "0" (c));
15523+
15524+ val = atomic_cmpxchg(v, c, new);
15525+ if (val == c)
15526+ return 1;
15527+ c = val;
15528+ } while (c);
15529+
15530+ return 0;
15531+}
15532+
15533+/**
15534 * atomic_inc_short - increment of a short integer
15535 * @v: pointer to type int
15536 *
15537@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15538 }
15539
15540 /* These are x86-specific, used by some header files */
15541-#define atomic_clear_mask(mask, addr) \
15542- asm volatile(LOCK_PREFIX "andl %0,%1" \
15543- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15544+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15545+{
15546+ asm volatile(LOCK_PREFIX "andl %1,%0"
15547+ : "+m" (v->counter)
15548+ : "r" (~(mask))
15549+ : "memory");
15550+}
15551
15552-#define atomic_set_mask(mask, addr) \
15553- asm volatile(LOCK_PREFIX "orl %0,%1" \
15554- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15555- : "memory")
15556+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15557+{
15558+ asm volatile(LOCK_PREFIX "andl %1,%0"
15559+ : "+m" (v->counter)
15560+ : "r" (~(mask))
15561+ : "memory");
15562+}
15563+
15564+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15565+{
15566+ asm volatile(LOCK_PREFIX "orl %1,%0"
15567+ : "+m" (v->counter)
15568+ : "r" (mask)
15569+ : "memory");
15570+}
15571+
15572+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15573+{
15574+ asm volatile(LOCK_PREFIX "orl %1,%0"
15575+ : "+m" (v->counter)
15576+ : "r" (mask)
15577+ : "memory");
15578+}
15579
15580 #ifdef CONFIG_X86_32
15581 # include <asm/atomic64_32.h>
15582diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15583index b154de7..bf18a5a 100644
15584--- a/arch/x86/include/asm/atomic64_32.h
15585+++ b/arch/x86/include/asm/atomic64_32.h
15586@@ -12,6 +12,14 @@ typedef struct {
15587 u64 __aligned(8) counter;
15588 } atomic64_t;
15589
15590+#ifdef CONFIG_PAX_REFCOUNT
15591+typedef struct {
15592+ u64 __aligned(8) counter;
15593+} atomic64_unchecked_t;
15594+#else
15595+typedef atomic64_t atomic64_unchecked_t;
15596+#endif
15597+
15598 #define ATOMIC64_INIT(val) { (val) }
15599
15600 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15601@@ -37,21 +45,31 @@ typedef struct {
15602 ATOMIC64_DECL_ONE(sym##_386)
15603
15604 ATOMIC64_DECL_ONE(add_386);
15605+ATOMIC64_DECL_ONE(add_unchecked_386);
15606 ATOMIC64_DECL_ONE(sub_386);
15607+ATOMIC64_DECL_ONE(sub_unchecked_386);
15608 ATOMIC64_DECL_ONE(inc_386);
15609+ATOMIC64_DECL_ONE(inc_unchecked_386);
15610 ATOMIC64_DECL_ONE(dec_386);
15611+ATOMIC64_DECL_ONE(dec_unchecked_386);
15612 #endif
15613
15614 #define alternative_atomic64(f, out, in...) \
15615 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15616
15617 ATOMIC64_DECL(read);
15618+ATOMIC64_DECL(read_unchecked);
15619 ATOMIC64_DECL(set);
15620+ATOMIC64_DECL(set_unchecked);
15621 ATOMIC64_DECL(xchg);
15622 ATOMIC64_DECL(add_return);
15623+ATOMIC64_DECL(add_return_unchecked);
15624 ATOMIC64_DECL(sub_return);
15625+ATOMIC64_DECL(sub_return_unchecked);
15626 ATOMIC64_DECL(inc_return);
15627+ATOMIC64_DECL(inc_return_unchecked);
15628 ATOMIC64_DECL(dec_return);
15629+ATOMIC64_DECL(dec_return_unchecked);
15630 ATOMIC64_DECL(dec_if_positive);
15631 ATOMIC64_DECL(inc_not_zero);
15632 ATOMIC64_DECL(add_unless);
15633@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15634 }
15635
15636 /**
15637+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15638+ * @p: pointer to type atomic64_unchecked_t
15639+ * @o: expected value
15640+ * @n: new value
15641+ *
15642+ * Atomically sets @v to @n if it was equal to @o and returns
15643+ * the old value.
15644+ */
15645+
15646+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15647+{
15648+ return cmpxchg64(&v->counter, o, n);
15649+}
15650+
15651+/**
15652 * atomic64_xchg - xchg atomic64 variable
15653 * @v: pointer to type atomic64_t
15654 * @n: value to assign
15655@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15656 }
15657
15658 /**
15659+ * atomic64_set_unchecked - set atomic64 variable
15660+ * @v: pointer to type atomic64_unchecked_t
15661+ * @n: value to assign
15662+ *
15663+ * Atomically sets the value of @v to @n.
15664+ */
15665+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15666+{
15667+ unsigned high = (unsigned)(i >> 32);
15668+ unsigned low = (unsigned)i;
15669+ alternative_atomic64(set, /* no output */,
15670+ "S" (v), "b" (low), "c" (high)
15671+ : "eax", "edx", "memory");
15672+}
15673+
15674+/**
15675 * atomic64_read - read atomic64 variable
15676 * @v: pointer to type atomic64_t
15677 *
15678@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15679 }
15680
15681 /**
15682+ * atomic64_read_unchecked - read atomic64 variable
15683+ * @v: pointer to type atomic64_unchecked_t
15684+ *
15685+ * Atomically reads the value of @v and returns it.
15686+ */
15687+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15688+{
15689+ long long r;
15690+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15691+ return r;
15692+ }
15693+
15694+/**
15695 * atomic64_add_return - add and return
15696 * @i: integer value to add
15697 * @v: pointer to type atomic64_t
15698@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15699 return i;
15700 }
15701
15702+/**
15703+ * atomic64_add_return_unchecked - add and return
15704+ * @i: integer value to add
15705+ * @v: pointer to type atomic64_unchecked_t
15706+ *
15707+ * Atomically adds @i to @v and returns @i + *@v
15708+ */
15709+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15710+{
15711+ alternative_atomic64(add_return_unchecked,
15712+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15713+ ASM_NO_INPUT_CLOBBER("memory"));
15714+ return i;
15715+}
15716+
15717 /*
15718 * Other variants with different arithmetic operators:
15719 */
15720@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15721 return a;
15722 }
15723
15724+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15725+{
15726+ long long a;
15727+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15728+ "S" (v) : "memory", "ecx");
15729+ return a;
15730+}
15731+
15732 static inline long long atomic64_dec_return(atomic64_t *v)
15733 {
15734 long long a;
15735@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15736 }
15737
15738 /**
15739+ * atomic64_add_unchecked - add integer to atomic64 variable
15740+ * @i: integer value to add
15741+ * @v: pointer to type atomic64_unchecked_t
15742+ *
15743+ * Atomically adds @i to @v.
15744+ */
15745+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15746+{
15747+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15748+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15749+ ASM_NO_INPUT_CLOBBER("memory"));
15750+ return i;
15751+}
15752+
15753+/**
15754 * atomic64_sub - subtract the atomic64 variable
15755 * @i: integer value to subtract
15756 * @v: pointer to type atomic64_t
15757diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15758index f8d273e..02f39f3 100644
15759--- a/arch/x86/include/asm/atomic64_64.h
15760+++ b/arch/x86/include/asm/atomic64_64.h
15761@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15762 }
15763
15764 /**
15765+ * atomic64_read_unchecked - read atomic64 variable
15766+ * @v: pointer of type atomic64_unchecked_t
15767+ *
15768+ * Atomically reads the value of @v.
15769+ * Doesn't imply a read memory barrier.
15770+ */
15771+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15772+{
15773+ return ACCESS_ONCE((v)->counter);
15774+}
15775+
15776+/**
15777 * atomic64_set - set atomic64 variable
15778 * @v: pointer to type atomic64_t
15779 * @i: required value
15780@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15781 }
15782
15783 /**
15784+ * atomic64_set_unchecked - set atomic64 variable
15785+ * @v: pointer to type atomic64_unchecked_t
15786+ * @i: required value
15787+ *
15788+ * Atomically sets the value of @v to @i.
15789+ */
15790+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15791+{
15792+ v->counter = i;
15793+}
15794+
15795+/**
15796 * atomic64_add - add integer to atomic64 variable
15797 * @i: integer value to add
15798 * @v: pointer to type atomic64_t
15799@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15800 */
15801 static inline void atomic64_add(long i, atomic64_t *v)
15802 {
15803+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15804+
15805+#ifdef CONFIG_PAX_REFCOUNT
15806+ "jno 0f\n"
15807+ LOCK_PREFIX "subq %1,%0\n"
15808+ "int $4\n0:\n"
15809+ _ASM_EXTABLE(0b, 0b)
15810+#endif
15811+
15812+ : "=m" (v->counter)
15813+ : "er" (i), "m" (v->counter));
15814+}
15815+
15816+/**
15817+ * atomic64_add_unchecked - add integer to atomic64 variable
15818+ * @i: integer value to add
15819+ * @v: pointer to type atomic64_unchecked_t
15820+ *
15821+ * Atomically adds @i to @v.
15822+ */
15823+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15824+{
15825 asm volatile(LOCK_PREFIX "addq %1,%0"
15826 : "=m" (v->counter)
15827 : "er" (i), "m" (v->counter));
15828@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15829 */
15830 static inline void atomic64_sub(long i, atomic64_t *v)
15831 {
15832- asm volatile(LOCK_PREFIX "subq %1,%0"
15833+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15834+
15835+#ifdef CONFIG_PAX_REFCOUNT
15836+ "jno 0f\n"
15837+ LOCK_PREFIX "addq %1,%0\n"
15838+ "int $4\n0:\n"
15839+ _ASM_EXTABLE(0b, 0b)
15840+#endif
15841+
15842+ : "=m" (v->counter)
15843+ : "er" (i), "m" (v->counter));
15844+}
15845+
15846+/**
15847+ * atomic64_sub_unchecked - subtract the atomic64 variable
15848+ * @i: integer value to subtract
15849+ * @v: pointer to type atomic64_unchecked_t
15850+ *
15851+ * Atomically subtracts @i from @v.
15852+ */
15853+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15854+{
15855+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15856 : "=m" (v->counter)
15857 : "er" (i), "m" (v->counter));
15858 }
15859@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15860 */
15861 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15862 {
15863- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15864+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15865 }
15866
15867 /**
15868@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15869 */
15870 static inline void atomic64_inc(atomic64_t *v)
15871 {
15872+ asm volatile(LOCK_PREFIX "incq %0\n"
15873+
15874+#ifdef CONFIG_PAX_REFCOUNT
15875+ "jno 0f\n"
15876+ LOCK_PREFIX "decq %0\n"
15877+ "int $4\n0:\n"
15878+ _ASM_EXTABLE(0b, 0b)
15879+#endif
15880+
15881+ : "=m" (v->counter)
15882+ : "m" (v->counter));
15883+}
15884+
15885+/**
15886+ * atomic64_inc_unchecked - increment atomic64 variable
15887+ * @v: pointer to type atomic64_unchecked_t
15888+ *
15889+ * Atomically increments @v by 1.
15890+ */
15891+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15892+{
15893 asm volatile(LOCK_PREFIX "incq %0"
15894 : "=m" (v->counter)
15895 : "m" (v->counter));
15896@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15897 */
15898 static inline void atomic64_dec(atomic64_t *v)
15899 {
15900- asm volatile(LOCK_PREFIX "decq %0"
15901+ asm volatile(LOCK_PREFIX "decq %0\n"
15902+
15903+#ifdef CONFIG_PAX_REFCOUNT
15904+ "jno 0f\n"
15905+ LOCK_PREFIX "incq %0\n"
15906+ "int $4\n0:\n"
15907+ _ASM_EXTABLE(0b, 0b)
15908+#endif
15909+
15910+ : "=m" (v->counter)
15911+ : "m" (v->counter));
15912+}
15913+
15914+/**
15915+ * atomic64_dec_unchecked - decrement atomic64 variable
15916+ * @v: pointer to type atomic64_t
15917+ *
15918+ * Atomically decrements @v by 1.
15919+ */
15920+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15921+{
15922+ asm volatile(LOCK_PREFIX "decq %0\n"
15923 : "=m" (v->counter)
15924 : "m" (v->counter));
15925 }
15926@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15927 */
15928 static inline int atomic64_dec_and_test(atomic64_t *v)
15929 {
15930- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15931+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15932 }
15933
15934 /**
15935@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15936 */
15937 static inline int atomic64_inc_and_test(atomic64_t *v)
15938 {
15939- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15940+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15941 }
15942
15943 /**
15944@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15945 */
15946 static inline int atomic64_add_negative(long i, atomic64_t *v)
15947 {
15948- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15949+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15950 }
15951
15952 /**
15953@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15954 */
15955 static inline long atomic64_add_return(long i, atomic64_t *v)
15956 {
15957+ return i + xadd_check_overflow(&v->counter, i);
15958+}
15959+
15960+/**
15961+ * atomic64_add_return_unchecked - add and return
15962+ * @i: integer value to add
15963+ * @v: pointer to type atomic64_unchecked_t
15964+ *
15965+ * Atomically adds @i to @v and returns @i + @v
15966+ */
15967+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15968+{
15969 return i + xadd(&v->counter, i);
15970 }
15971
15972@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15973 }
15974
15975 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15976+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15977+{
15978+ return atomic64_add_return_unchecked(1, v);
15979+}
15980 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15981
15982 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15983@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15984 return cmpxchg(&v->counter, old, new);
15985 }
15986
15987+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15988+{
15989+ return cmpxchg(&v->counter, old, new);
15990+}
15991+
15992 static inline long atomic64_xchg(atomic64_t *v, long new)
15993 {
15994 return xchg(&v->counter, new);
15995@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15996 */
15997 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15998 {
15999- long c, old;
16000+ long c, old, new;
16001 c = atomic64_read(v);
16002 for (;;) {
16003- if (unlikely(c == (u)))
16004+ if (unlikely(c == u))
16005 break;
16006- old = atomic64_cmpxchg((v), c, c + (a));
16007+
16008+ asm volatile("add %2,%0\n"
16009+
16010+#ifdef CONFIG_PAX_REFCOUNT
16011+ "jno 0f\n"
16012+ "sub %2,%0\n"
16013+ "int $4\n0:\n"
16014+ _ASM_EXTABLE(0b, 0b)
16015+#endif
16016+
16017+ : "=r" (new)
16018+ : "0" (c), "ir" (a));
16019+
16020+ old = atomic64_cmpxchg(v, c, new);
16021 if (likely(old == c))
16022 break;
16023 c = old;
16024 }
16025- return c != (u);
16026+ return c != u;
16027 }
16028
16029 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16030diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16031index 959e45b..6ea9bf6 100644
16032--- a/arch/x86/include/asm/barrier.h
16033+++ b/arch/x86/include/asm/barrier.h
16034@@ -57,7 +57,7 @@
16035 do { \
16036 compiletime_assert_atomic_type(*p); \
16037 smp_mb(); \
16038- ACCESS_ONCE(*p) = (v); \
16039+ ACCESS_ONCE_RW(*p) = (v); \
16040 } while (0)
16041
16042 #define smp_load_acquire(p) \
16043@@ -74,7 +74,7 @@ do { \
16044 do { \
16045 compiletime_assert_atomic_type(*p); \
16046 barrier(); \
16047- ACCESS_ONCE(*p) = (v); \
16048+ ACCESS_ONCE_RW(*p) = (v); \
16049 } while (0)
16050
16051 #define smp_load_acquire(p) \
16052diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16053index cfe3b95..d01b118 100644
16054--- a/arch/x86/include/asm/bitops.h
16055+++ b/arch/x86/include/asm/bitops.h
16056@@ -50,7 +50,7 @@
16057 * a mask operation on a byte.
16058 */
16059 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16060-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16061+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16062 #define CONST_MASK(nr) (1 << ((nr) & 7))
16063
16064 /**
16065@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16066 */
16067 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16068 {
16069- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16070+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16071 }
16072
16073 /**
16074@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16075 */
16076 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16077 {
16078- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16079+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16080 }
16081
16082 /**
16083@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16084 */
16085 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16086 {
16087- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16088+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16089 }
16090
16091 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16092@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16093 *
16094 * Undefined if no bit exists, so code should check against 0 first.
16095 */
16096-static inline unsigned long __ffs(unsigned long word)
16097+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16098 {
16099 asm("rep; bsf %1,%0"
16100 : "=r" (word)
16101@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16102 *
16103 * Undefined if no zero exists, so code should check against ~0UL first.
16104 */
16105-static inline unsigned long ffz(unsigned long word)
16106+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16107 {
16108 asm("rep; bsf %1,%0"
16109 : "=r" (word)
16110@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16111 *
16112 * Undefined if no set bit exists, so code should check against 0 first.
16113 */
16114-static inline unsigned long __fls(unsigned long word)
16115+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16116 {
16117 asm("bsr %1,%0"
16118 : "=r" (word)
16119@@ -434,7 +434,7 @@ static inline int ffs(int x)
16120 * set bit if value is nonzero. The last (most significant) bit is
16121 * at position 32.
16122 */
16123-static inline int fls(int x)
16124+static inline int __intentional_overflow(-1) fls(int x)
16125 {
16126 int r;
16127
16128@@ -476,7 +476,7 @@ static inline int fls(int x)
16129 * at position 64.
16130 */
16131 #ifdef CONFIG_X86_64
16132-static __always_inline int fls64(__u64 x)
16133+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16134 {
16135 int bitpos = -1;
16136 /*
16137diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16138index 4fa687a..60f2d39 100644
16139--- a/arch/x86/include/asm/boot.h
16140+++ b/arch/x86/include/asm/boot.h
16141@@ -6,10 +6,15 @@
16142 #include <uapi/asm/boot.h>
16143
16144 /* Physical address where kernel should be loaded. */
16145-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16146+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16147 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16148 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16149
16150+#ifndef __ASSEMBLY__
16151+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16152+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16153+#endif
16154+
16155 /* Minimum kernel alignment, as a power of two */
16156 #ifdef CONFIG_X86_64
16157 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16158diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16159index 48f99f1..d78ebf9 100644
16160--- a/arch/x86/include/asm/cache.h
16161+++ b/arch/x86/include/asm/cache.h
16162@@ -5,12 +5,13 @@
16163
16164 /* L1 cache line size */
16165 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16166-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16167+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16168
16169 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16170+#define __read_only __attribute__((__section__(".data..read_only")))
16171
16172 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16173-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16174+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16175
16176 #ifdef CONFIG_X86_VSMP
16177 #ifdef CONFIG_SMP
16178diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16179index 1c8b50e..166bcaa 100644
16180--- a/arch/x86/include/asm/calling.h
16181+++ b/arch/x86/include/asm/calling.h
16182@@ -96,23 +96,26 @@ For 32-bit we have the following conventions - kernel is built with
16183 .endm
16184
16185 .macro SAVE_C_REGS_HELPER offset=0 rax=1 rcx=1 r8910=1 r11=1
16186+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16187+ movq_cfi r12, R12+\offset
16188+#endif
16189 .if \r11
16190- movq_cfi r11, 6*8+\offset
16191+ movq_cfi r11, R11+\offset
16192 .endif
16193 .if \r8910
16194- movq_cfi r10, 7*8+\offset
16195- movq_cfi r9, 8*8+\offset
16196- movq_cfi r8, 9*8+\offset
16197+ movq_cfi r10, R10+\offset
16198+ movq_cfi r9, R9+\offset
16199+ movq_cfi r8, R8+\offset
16200 .endif
16201 .if \rax
16202- movq_cfi rax, 10*8+\offset
16203+ movq_cfi rax, RAX+\offset
16204 .endif
16205 .if \rcx
16206- movq_cfi rcx, 11*8+\offset
16207+ movq_cfi rcx, RCX+\offset
16208 .endif
16209- movq_cfi rdx, 12*8+\offset
16210- movq_cfi rsi, 13*8+\offset
16211- movq_cfi rdi, 14*8+\offset
16212+ movq_cfi rdx, RDX+\offset
16213+ movq_cfi rsi, RSI+\offset
16214+ movq_cfi rdi, RDI+\offset
16215 .endm
16216 .macro SAVE_C_REGS offset=0
16217 SAVE_C_REGS_HELPER \offset, 1, 1, 1, 1
16218@@ -131,76 +134,87 @@ For 32-bit we have the following conventions - kernel is built with
16219 .endm
16220
16221 .macro SAVE_EXTRA_REGS offset=0
16222- movq_cfi r15, 0*8+\offset
16223- movq_cfi r14, 1*8+\offset
16224- movq_cfi r13, 2*8+\offset
16225- movq_cfi r12, 3*8+\offset
16226- movq_cfi rbp, 4*8+\offset
16227- movq_cfi rbx, 5*8+\offset
16228+ movq_cfi r15, R15+\offset
16229+ movq_cfi r14, R14+\offset
16230+ movq_cfi r13, R13+\offset
16231+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16232+ movq_cfi r12, R12+\offset
16233+#endif
16234+ movq_cfi rbp, RBP+\offset
16235+ movq_cfi rbx, RBX+\offset
16236 .endm
16237 .macro SAVE_EXTRA_REGS_RBP offset=0
16238- movq_cfi rbp, 4*8+\offset
16239+ movq_cfi rbp, RBP+\offset
16240 .endm
16241
16242 .macro RESTORE_EXTRA_REGS offset=0
16243- movq_cfi_restore 0*8+\offset, r15
16244- movq_cfi_restore 1*8+\offset, r14
16245- movq_cfi_restore 2*8+\offset, r13
16246- movq_cfi_restore 3*8+\offset, r12
16247- movq_cfi_restore 4*8+\offset, rbp
16248- movq_cfi_restore 5*8+\offset, rbx
16249+ movq_cfi_restore R15+\offset, r15
16250+ movq_cfi_restore R14+\offset, r14
16251+ movq_cfi_restore R13+\offset, r13
16252+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16253+ movq_cfi_restore R12+\offset, r12
16254+#endif
16255+ movq_cfi_restore RBP+\offset, rbp
16256+ movq_cfi_restore RBX+\offset, rbx
16257 .endm
16258
16259 .macro ZERO_EXTRA_REGS
16260 xorl %r15d, %r15d
16261 xorl %r14d, %r14d
16262 xorl %r13d, %r13d
16263+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16264 xorl %r12d, %r12d
16265+#endif
16266 xorl %ebp, %ebp
16267 xorl %ebx, %ebx
16268 .endm
16269
16270- .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1
16271+ .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1, rstor_r12=1
16272+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16273+ .if \rstor_r12
16274+ movq_cfi_restore R12, r12
16275+ .endif
16276+#endif
16277 .if \rstor_r11
16278- movq_cfi_restore 6*8, r11
16279+ movq_cfi_restore R11, r11
16280 .endif
16281 .if \rstor_r8910
16282- movq_cfi_restore 7*8, r10
16283- movq_cfi_restore 8*8, r9
16284- movq_cfi_restore 9*8, r8
16285+ movq_cfi_restore R10, r10
16286+ movq_cfi_restore R9, r9
16287+ movq_cfi_restore R8, r8
16288 .endif
16289 .if \rstor_rax
16290- movq_cfi_restore 10*8, rax
16291+ movq_cfi_restore RAX, rax
16292 .endif
16293 .if \rstor_rcx
16294- movq_cfi_restore 11*8, rcx
16295+ movq_cfi_restore RCX, rcx
16296 .endif
16297 .if \rstor_rdx
16298- movq_cfi_restore 12*8, rdx
16299+ movq_cfi_restore RDX, rdx
16300 .endif
16301- movq_cfi_restore 13*8, rsi
16302- movq_cfi_restore 14*8, rdi
16303+ movq_cfi_restore RSI, rsi
16304+ movq_cfi_restore RDI, rdi
16305 .endm
16306 .macro RESTORE_C_REGS
16307- RESTORE_C_REGS_HELPER 1,1,1,1,1
16308+ RESTORE_C_REGS_HELPER 1,1,1,1,1,1
16309 .endm
16310 .macro RESTORE_C_REGS_EXCEPT_RAX
16311- RESTORE_C_REGS_HELPER 0,1,1,1,1
16312+ RESTORE_C_REGS_HELPER 0,1,1,1,1,0
16313 .endm
16314 .macro RESTORE_C_REGS_EXCEPT_RCX
16315- RESTORE_C_REGS_HELPER 1,0,1,1,1
16316+ RESTORE_C_REGS_HELPER 1,0,1,1,1,0
16317 .endm
16318 .macro RESTORE_C_REGS_EXCEPT_R11
16319- RESTORE_C_REGS_HELPER 1,1,0,1,1
16320+ RESTORE_C_REGS_HELPER 1,1,0,1,1,1
16321 .endm
16322 .macro RESTORE_C_REGS_EXCEPT_RCX_R11
16323- RESTORE_C_REGS_HELPER 1,0,0,1,1
16324+ RESTORE_C_REGS_HELPER 1,0,0,1,1,1
16325 .endm
16326 .macro RESTORE_RSI_RDI
16327- RESTORE_C_REGS_HELPER 0,0,0,0,0
16328+ RESTORE_C_REGS_HELPER 0,0,0,0,0,1
16329 .endm
16330 .macro RESTORE_RSI_RDI_RDX
16331- RESTORE_C_REGS_HELPER 0,0,0,0,1
16332+ RESTORE_C_REGS_HELPER 0,0,0,0,1,1
16333 .endm
16334
16335 .macro REMOVE_PT_GPREGS_FROM_STACK addskip=0
16336diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16337index f50de69..2b0a458 100644
16338--- a/arch/x86/include/asm/checksum_32.h
16339+++ b/arch/x86/include/asm/checksum_32.h
16340@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16341 int len, __wsum sum,
16342 int *src_err_ptr, int *dst_err_ptr);
16343
16344+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16345+ int len, __wsum sum,
16346+ int *src_err_ptr, int *dst_err_ptr);
16347+
16348+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16349+ int len, __wsum sum,
16350+ int *src_err_ptr, int *dst_err_ptr);
16351+
16352 /*
16353 * Note: when you get a NULL pointer exception here this means someone
16354 * passed in an incorrect kernel address to one of these functions.
16355@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16356
16357 might_sleep();
16358 stac();
16359- ret = csum_partial_copy_generic((__force void *)src, dst,
16360+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16361 len, sum, err_ptr, NULL);
16362 clac();
16363
16364@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16365 might_sleep();
16366 if (access_ok(VERIFY_WRITE, dst, len)) {
16367 stac();
16368- ret = csum_partial_copy_generic(src, (__force void *)dst,
16369+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16370 len, sum, NULL, err_ptr);
16371 clac();
16372 return ret;
16373diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16374index 99c105d7..2f667ac 100644
16375--- a/arch/x86/include/asm/cmpxchg.h
16376+++ b/arch/x86/include/asm/cmpxchg.h
16377@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16378 __compiletime_error("Bad argument size for cmpxchg");
16379 extern void __xadd_wrong_size(void)
16380 __compiletime_error("Bad argument size for xadd");
16381+extern void __xadd_check_overflow_wrong_size(void)
16382+ __compiletime_error("Bad argument size for xadd_check_overflow");
16383 extern void __add_wrong_size(void)
16384 __compiletime_error("Bad argument size for add");
16385+extern void __add_check_overflow_wrong_size(void)
16386+ __compiletime_error("Bad argument size for add_check_overflow");
16387
16388 /*
16389 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16390@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16391 __ret; \
16392 })
16393
16394+#ifdef CONFIG_PAX_REFCOUNT
16395+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16396+ ({ \
16397+ __typeof__ (*(ptr)) __ret = (arg); \
16398+ switch (sizeof(*(ptr))) { \
16399+ case __X86_CASE_L: \
16400+ asm volatile (lock #op "l %0, %1\n" \
16401+ "jno 0f\n" \
16402+ "mov %0,%1\n" \
16403+ "int $4\n0:\n" \
16404+ _ASM_EXTABLE(0b, 0b) \
16405+ : "+r" (__ret), "+m" (*(ptr)) \
16406+ : : "memory", "cc"); \
16407+ break; \
16408+ case __X86_CASE_Q: \
16409+ asm volatile (lock #op "q %q0, %1\n" \
16410+ "jno 0f\n" \
16411+ "mov %0,%1\n" \
16412+ "int $4\n0:\n" \
16413+ _ASM_EXTABLE(0b, 0b) \
16414+ : "+r" (__ret), "+m" (*(ptr)) \
16415+ : : "memory", "cc"); \
16416+ break; \
16417+ default: \
16418+ __ ## op ## _check_overflow_wrong_size(); \
16419+ } \
16420+ __ret; \
16421+ })
16422+#else
16423+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16424+#endif
16425+
16426 /*
16427 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16428 * Since this is generally used to protect other memory information, we
16429@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16430 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16431 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16432
16433+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16434+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16435+
16436 #define __add(ptr, inc, lock) \
16437 ({ \
16438 __typeof__ (*(ptr)) __ret = (inc); \
16439diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16440index acdee09..a553db3 100644
16441--- a/arch/x86/include/asm/compat.h
16442+++ b/arch/x86/include/asm/compat.h
16443@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16444 typedef u32 compat_uint_t;
16445 typedef u32 compat_ulong_t;
16446 typedef u64 __attribute__((aligned(4))) compat_u64;
16447-typedef u32 compat_uptr_t;
16448+typedef u32 __user compat_uptr_t;
16449
16450 struct compat_timespec {
16451 compat_time_t tv_sec;
16452diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16453index 3d6606f..300641d 100644
16454--- a/arch/x86/include/asm/cpufeature.h
16455+++ b/arch/x86/include/asm/cpufeature.h
16456@@ -214,7 +214,8 @@
16457 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16458 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16459 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16460-
16461+#define X86_FEATURE_PCIDUDEREF ( 8*32+30) /* PaX PCID based UDEREF */
16462+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16463
16464 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16465 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16466@@ -222,7 +223,7 @@
16467 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16468 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16469 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16470-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16471+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16472 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16473 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16474 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16475@@ -401,6 +402,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16476 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16477 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16478 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16479+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16480
16481 #if __GNUC__ >= 4
16482 extern void warn_pre_alternatives(void);
16483@@ -454,7 +456,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16484
16485 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16486 t_warn:
16487- warn_pre_alternatives();
16488+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID && bit != X86_FEATURE_PCIDUDEREF)
16489+ warn_pre_alternatives();
16490 return false;
16491 #endif
16492
16493@@ -475,7 +478,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16494 ".section .discard,\"aw\",@progbits\n"
16495 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16496 ".previous\n"
16497- ".section .altinstr_replacement,\"ax\"\n"
16498+ ".section .altinstr_replacement,\"a\"\n"
16499 "3: movb $1,%0\n"
16500 "4:\n"
16501 ".previous\n"
16502@@ -510,7 +513,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16503 " .byte 5f - 4f\n" /* repl len */
16504 " .byte 3b - 2b\n" /* pad len */
16505 ".previous\n"
16506- ".section .altinstr_replacement,\"ax\"\n"
16507+ ".section .altinstr_replacement,\"a\"\n"
16508 "4: jmp %l[t_no]\n"
16509 "5:\n"
16510 ".previous\n"
16511@@ -545,7 +548,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16512 ".section .discard,\"aw\",@progbits\n"
16513 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16514 ".previous\n"
16515- ".section .altinstr_replacement,\"ax\"\n"
16516+ ".section .altinstr_replacement,\"a\"\n"
16517 "3: movb $0,%0\n"
16518 "4:\n"
16519 ".previous\n"
16520@@ -560,7 +563,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16521 ".section .discard,\"aw\",@progbits\n"
16522 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16523 ".previous\n"
16524- ".section .altinstr_replacement,\"ax\"\n"
16525+ ".section .altinstr_replacement,\"a\"\n"
16526 "5: movb $1,%0\n"
16527 "6:\n"
16528 ".previous\n"
16529diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16530index a0bf89f..56f0b2a 100644
16531--- a/arch/x86/include/asm/desc.h
16532+++ b/arch/x86/include/asm/desc.h
16533@@ -4,6 +4,7 @@
16534 #include <asm/desc_defs.h>
16535 #include <asm/ldt.h>
16536 #include <asm/mmu.h>
16537+#include <asm/pgtable.h>
16538
16539 #include <linux/smp.h>
16540 #include <linux/percpu.h>
16541@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16542
16543 desc->type = (info->read_exec_only ^ 1) << 1;
16544 desc->type |= info->contents << 2;
16545+ desc->type |= info->seg_not_present ^ 1;
16546
16547 desc->s = 1;
16548 desc->dpl = 0x3;
16549@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16550 }
16551
16552 extern struct desc_ptr idt_descr;
16553-extern gate_desc idt_table[];
16554-extern struct desc_ptr debug_idt_descr;
16555-extern gate_desc debug_idt_table[];
16556-
16557-struct gdt_page {
16558- struct desc_struct gdt[GDT_ENTRIES];
16559-} __attribute__((aligned(PAGE_SIZE)));
16560-
16561-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16562+extern gate_desc idt_table[IDT_ENTRIES];
16563+extern const struct desc_ptr debug_idt_descr;
16564+extern gate_desc debug_idt_table[IDT_ENTRIES];
16565
16566+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16567 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16568 {
16569- return per_cpu(gdt_page, cpu).gdt;
16570+ return cpu_gdt_table[cpu];
16571 }
16572
16573 #ifdef CONFIG_X86_64
16574@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16575 unsigned long base, unsigned dpl, unsigned flags,
16576 unsigned short seg)
16577 {
16578- gate->a = (seg << 16) | (base & 0xffff);
16579- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16580+ gate->gate.offset_low = base;
16581+ gate->gate.seg = seg;
16582+ gate->gate.reserved = 0;
16583+ gate->gate.type = type;
16584+ gate->gate.s = 0;
16585+ gate->gate.dpl = dpl;
16586+ gate->gate.p = 1;
16587+ gate->gate.offset_high = base >> 16;
16588 }
16589
16590 #endif
16591@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16592
16593 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16594 {
16595+ pax_open_kernel();
16596 memcpy(&idt[entry], gate, sizeof(*gate));
16597+ pax_close_kernel();
16598 }
16599
16600 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16601 {
16602+ pax_open_kernel();
16603 memcpy(&ldt[entry], desc, 8);
16604+ pax_close_kernel();
16605 }
16606
16607 static inline void
16608@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16609 default: size = sizeof(*gdt); break;
16610 }
16611
16612+ pax_open_kernel();
16613 memcpy(&gdt[entry], desc, size);
16614+ pax_close_kernel();
16615 }
16616
16617 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16618@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16619
16620 static inline void native_load_tr_desc(void)
16621 {
16622+ pax_open_kernel();
16623 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16624+ pax_close_kernel();
16625 }
16626
16627 static inline void native_load_gdt(const struct desc_ptr *dtr)
16628@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16629 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16630 unsigned int i;
16631
16632+ pax_open_kernel();
16633 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16634 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16635+ pax_close_kernel();
16636 }
16637
16638 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16639@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16640 preempt_enable();
16641 }
16642
16643-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16644+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16645 {
16646 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16647 }
16648@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16649 }
16650
16651 #ifdef CONFIG_X86_64
16652-static inline void set_nmi_gate(int gate, void *addr)
16653+static inline void set_nmi_gate(int gate, const void *addr)
16654 {
16655 gate_desc s;
16656
16657@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16658 #endif
16659
16660 #ifdef CONFIG_TRACING
16661-extern struct desc_ptr trace_idt_descr;
16662-extern gate_desc trace_idt_table[];
16663+extern const struct desc_ptr trace_idt_descr;
16664+extern gate_desc trace_idt_table[IDT_ENTRIES];
16665 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16666 {
16667 write_idt_entry(trace_idt_table, entry, gate);
16668 }
16669
16670-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16671+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16672 unsigned dpl, unsigned ist, unsigned seg)
16673 {
16674 gate_desc s;
16675@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16676 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16677 #endif
16678
16679-static inline void _set_gate(int gate, unsigned type, void *addr,
16680+static inline void _set_gate(int gate, unsigned type, const void *addr,
16681 unsigned dpl, unsigned ist, unsigned seg)
16682 {
16683 gate_desc s;
16684@@ -379,14 +392,14 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16685 #define set_intr_gate_notrace(n, addr) \
16686 do { \
16687 BUG_ON((unsigned)n > 0xFF); \
16688- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16689+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16690 __KERNEL_CS); \
16691 } while (0)
16692
16693 #define set_intr_gate(n, addr) \
16694 do { \
16695 set_intr_gate_notrace(n, addr); \
16696- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16697+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16698 0, 0, __KERNEL_CS); \
16699 } while (0)
16700
16701@@ -414,19 +427,19 @@ static inline void alloc_system_vector(int vector)
16702 /*
16703 * This routine sets up an interrupt gate at directory privilege level 3.
16704 */
16705-static inline void set_system_intr_gate(unsigned int n, void *addr)
16706+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16707 {
16708 BUG_ON((unsigned)n > 0xFF);
16709 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16710 }
16711
16712-static inline void set_system_trap_gate(unsigned int n, void *addr)
16713+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16714 {
16715 BUG_ON((unsigned)n > 0xFF);
16716 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16717 }
16718
16719-static inline void set_trap_gate(unsigned int n, void *addr)
16720+static inline void set_trap_gate(unsigned int n, const void *addr)
16721 {
16722 BUG_ON((unsigned)n > 0xFF);
16723 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16724@@ -435,16 +448,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16725 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16726 {
16727 BUG_ON((unsigned)n > 0xFF);
16728- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16729+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16730 }
16731
16732-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16733+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16734 {
16735 BUG_ON((unsigned)n > 0xFF);
16736 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16737 }
16738
16739-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16740+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16741 {
16742 BUG_ON((unsigned)n > 0xFF);
16743 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16744@@ -516,4 +529,17 @@ static inline void load_current_idt(void)
16745 else
16746 load_idt((const struct desc_ptr *)&idt_descr);
16747 }
16748+
16749+#ifdef CONFIG_X86_32
16750+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16751+{
16752+ struct desc_struct d;
16753+
16754+ if (likely(limit))
16755+ limit = (limit - 1UL) >> PAGE_SHIFT;
16756+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16757+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16758+}
16759+#endif
16760+
16761 #endif /* _ASM_X86_DESC_H */
16762diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16763index 278441f..b95a174 100644
16764--- a/arch/x86/include/asm/desc_defs.h
16765+++ b/arch/x86/include/asm/desc_defs.h
16766@@ -31,6 +31,12 @@ struct desc_struct {
16767 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16768 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16769 };
16770+ struct {
16771+ u16 offset_low;
16772+ u16 seg;
16773+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16774+ unsigned offset_high: 16;
16775+ } gate;
16776 };
16777 } __attribute__((packed));
16778
16779diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16780index ced283a..ffe04cc 100644
16781--- a/arch/x86/include/asm/div64.h
16782+++ b/arch/x86/include/asm/div64.h
16783@@ -39,7 +39,7 @@
16784 __mod; \
16785 })
16786
16787-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16788+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16789 {
16790 union {
16791 u64 v64;
16792diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16793index f161c18..97d43e8 100644
16794--- a/arch/x86/include/asm/elf.h
16795+++ b/arch/x86/include/asm/elf.h
16796@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16797
16798 #include <asm/vdso.h>
16799
16800-#ifdef CONFIG_X86_64
16801-extern unsigned int vdso64_enabled;
16802-#endif
16803 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16804 extern unsigned int vdso32_enabled;
16805 #endif
16806@@ -250,7 +247,25 @@ extern int force_personality32;
16807 the loader. We need to make sure that it is out of the way of the program
16808 that it will "exec", and that there is sufficient room for the brk. */
16809
16810+#ifdef CONFIG_PAX_SEGMEXEC
16811+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16812+#else
16813 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16814+#endif
16815+
16816+#ifdef CONFIG_PAX_ASLR
16817+#ifdef CONFIG_X86_32
16818+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16819+
16820+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16821+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16822+#else
16823+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16824+
16825+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16826+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16827+#endif
16828+#endif
16829
16830 /* This yields a mask that user programs can use to figure out what
16831 instruction set this CPU supports. This could be done in user space,
16832@@ -299,17 +314,13 @@ do { \
16833
16834 #define ARCH_DLINFO \
16835 do { \
16836- if (vdso64_enabled) \
16837- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16838- (unsigned long __force)current->mm->context.vdso); \
16839+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16840 } while (0)
16841
16842 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16843 #define ARCH_DLINFO_X32 \
16844 do { \
16845- if (vdso64_enabled) \
16846- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16847- (unsigned long __force)current->mm->context.vdso); \
16848+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16849 } while (0)
16850
16851 #define AT_SYSINFO 32
16852@@ -324,10 +335,10 @@ else \
16853
16854 #endif /* !CONFIG_X86_32 */
16855
16856-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16857+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16858
16859 #define VDSO_ENTRY \
16860- ((unsigned long)current->mm->context.vdso + \
16861+ (current->mm->context.vdso + \
16862 selected_vdso32->sym___kernel_vsyscall)
16863
16864 struct linux_binprm;
16865diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16866index 77a99ac..39ff7f5 100644
16867--- a/arch/x86/include/asm/emergency-restart.h
16868+++ b/arch/x86/include/asm/emergency-restart.h
16869@@ -1,6 +1,6 @@
16870 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16871 #define _ASM_X86_EMERGENCY_RESTART_H
16872
16873-extern void machine_emergency_restart(void);
16874+extern void machine_emergency_restart(void) __noreturn;
16875
16876 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16877diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16878index 1c7eefe..d0e4702 100644
16879--- a/arch/x86/include/asm/floppy.h
16880+++ b/arch/x86/include/asm/floppy.h
16881@@ -229,18 +229,18 @@ static struct fd_routine_l {
16882 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16883 } fd_routine[] = {
16884 {
16885- request_dma,
16886- free_dma,
16887- get_dma_residue,
16888- dma_mem_alloc,
16889- hard_dma_setup
16890+ ._request_dma = request_dma,
16891+ ._free_dma = free_dma,
16892+ ._get_dma_residue = get_dma_residue,
16893+ ._dma_mem_alloc = dma_mem_alloc,
16894+ ._dma_setup = hard_dma_setup
16895 },
16896 {
16897- vdma_request_dma,
16898- vdma_nop,
16899- vdma_get_dma_residue,
16900- vdma_mem_alloc,
16901- vdma_dma_setup
16902+ ._request_dma = vdma_request_dma,
16903+ ._free_dma = vdma_nop,
16904+ ._get_dma_residue = vdma_get_dma_residue,
16905+ ._dma_mem_alloc = vdma_mem_alloc,
16906+ ._dma_setup = vdma_dma_setup
16907 }
16908 };
16909
16910diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16911index da5e967..ab07eec 100644
16912--- a/arch/x86/include/asm/fpu-internal.h
16913+++ b/arch/x86/include/asm/fpu-internal.h
16914@@ -151,8 +151,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16915 #define user_insn(insn, output, input...) \
16916 ({ \
16917 int err; \
16918+ pax_open_userland(); \
16919 asm volatile(ASM_STAC "\n" \
16920- "1:" #insn "\n\t" \
16921+ "1:" \
16922+ __copyuser_seg \
16923+ #insn "\n\t" \
16924 "2: " ASM_CLAC "\n" \
16925 ".section .fixup,\"ax\"\n" \
16926 "3: movl $-1,%[err]\n" \
16927@@ -161,6 +164,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16928 _ASM_EXTABLE(1b, 3b) \
16929 : [err] "=r" (err), output \
16930 : "0"(0), input); \
16931+ pax_close_userland(); \
16932 err; \
16933 })
16934
16935@@ -327,7 +331,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16936 "fnclex\n\t"
16937 "emms\n\t"
16938 "fildl %P[addr]" /* set F?P to defined value */
16939- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16940+ : : [addr] "m" (cpu_tss[raw_smp_processor_id()].x86_tss.sp0));
16941 }
16942
16943 return fpu_restore_checking(&tsk->thread.fpu);
16944diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16945index b4c1f54..e290c08 100644
16946--- a/arch/x86/include/asm/futex.h
16947+++ b/arch/x86/include/asm/futex.h
16948@@ -12,6 +12,7 @@
16949 #include <asm/smap.h>
16950
16951 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16952+ typecheck(u32 __user *, uaddr); \
16953 asm volatile("\t" ASM_STAC "\n" \
16954 "1:\t" insn "\n" \
16955 "2:\t" ASM_CLAC "\n" \
16956@@ -20,15 +21,16 @@
16957 "\tjmp\t2b\n" \
16958 "\t.previous\n" \
16959 _ASM_EXTABLE(1b, 3b) \
16960- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16961+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16962 : "i" (-EFAULT), "0" (oparg), "1" (0))
16963
16964 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16965+ typecheck(u32 __user *, uaddr); \
16966 asm volatile("\t" ASM_STAC "\n" \
16967 "1:\tmovl %2, %0\n" \
16968 "\tmovl\t%0, %3\n" \
16969 "\t" insn "\n" \
16970- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16971+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16972 "\tjnz\t1b\n" \
16973 "3:\t" ASM_CLAC "\n" \
16974 "\t.section .fixup,\"ax\"\n" \
16975@@ -38,7 +40,7 @@
16976 _ASM_EXTABLE(1b, 4b) \
16977 _ASM_EXTABLE(2b, 4b) \
16978 : "=&a" (oldval), "=&r" (ret), \
16979- "+m" (*uaddr), "=&r" (tem) \
16980+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16981 : "r" (oparg), "i" (-EFAULT), "1" (0))
16982
16983 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16984@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16985
16986 pagefault_disable();
16987
16988+ pax_open_userland();
16989 switch (op) {
16990 case FUTEX_OP_SET:
16991- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16992+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16993 break;
16994 case FUTEX_OP_ADD:
16995- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16996+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16997 uaddr, oparg);
16998 break;
16999 case FUTEX_OP_OR:
17000@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17001 default:
17002 ret = -ENOSYS;
17003 }
17004+ pax_close_userland();
17005
17006 pagefault_enable();
17007
17008diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17009index e9571dd..df5f542 100644
17010--- a/arch/x86/include/asm/hw_irq.h
17011+++ b/arch/x86/include/asm/hw_irq.h
17012@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17013 #endif /* CONFIG_X86_LOCAL_APIC */
17014
17015 /* Statistics */
17016-extern atomic_t irq_err_count;
17017-extern atomic_t irq_mis_count;
17018+extern atomic_unchecked_t irq_err_count;
17019+extern atomic_unchecked_t irq_mis_count;
17020
17021 /* EISA */
17022 extern void eisa_set_level_irq(unsigned int irq);
17023diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17024index ccffa53..3c90c87 100644
17025--- a/arch/x86/include/asm/i8259.h
17026+++ b/arch/x86/include/asm/i8259.h
17027@@ -62,7 +62,7 @@ struct legacy_pic {
17028 void (*init)(int auto_eoi);
17029 int (*irq_pending)(unsigned int irq);
17030 void (*make_irq)(unsigned int irq);
17031-};
17032+} __do_const;
17033
17034 extern struct legacy_pic *legacy_pic;
17035 extern struct legacy_pic null_legacy_pic;
17036diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17037index 34a5b93..27e40a6 100644
17038--- a/arch/x86/include/asm/io.h
17039+++ b/arch/x86/include/asm/io.h
17040@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17041 "m" (*(volatile type __force *)addr) barrier); }
17042
17043 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17044-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17045-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17046+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17047+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17048
17049 build_mmio_read(__readb, "b", unsigned char, "=q", )
17050-build_mmio_read(__readw, "w", unsigned short, "=r", )
17051-build_mmio_read(__readl, "l", unsigned int, "=r", )
17052+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17053+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17054
17055 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17056 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17057@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17058 * this function
17059 */
17060
17061-static inline phys_addr_t virt_to_phys(volatile void *address)
17062+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17063 {
17064 return __pa(address);
17065 }
17066@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17067 return ioremap_nocache(offset, size);
17068 }
17069
17070-extern void iounmap(volatile void __iomem *addr);
17071+extern void iounmap(const volatile void __iomem *addr);
17072
17073 extern void set_iounmap_nonlazy(void);
17074
17075@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17076
17077 #include <linux/vmalloc.h>
17078
17079+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17080+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17081+{
17082+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17083+}
17084+
17085+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17086+{
17087+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17088+}
17089+
17090 /*
17091 * Convert a virtual cached pointer to an uncached pointer
17092 */
17093diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17094index b77f5ed..a2f791e 100644
17095--- a/arch/x86/include/asm/irqflags.h
17096+++ b/arch/x86/include/asm/irqflags.h
17097@@ -137,6 +137,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17098 swapgs; \
17099 sysretl
17100
17101+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17102+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17103+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17104+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17105+
17106 #else
17107 #define INTERRUPT_RETURN iret
17108 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17109diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17110index 4421b5d..8543006 100644
17111--- a/arch/x86/include/asm/kprobes.h
17112+++ b/arch/x86/include/asm/kprobes.h
17113@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17114 #define RELATIVEJUMP_SIZE 5
17115 #define RELATIVECALL_OPCODE 0xe8
17116 #define RELATIVE_ADDR_SIZE 4
17117-#define MAX_STACK_SIZE 64
17118-#define MIN_STACK_SIZE(ADDR) \
17119- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17120- THREAD_SIZE - (unsigned long)(ADDR))) \
17121- ? (MAX_STACK_SIZE) \
17122- : (((unsigned long)current_thread_info()) + \
17123- THREAD_SIZE - (unsigned long)(ADDR)))
17124+#define MAX_STACK_SIZE 64UL
17125+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17126
17127 #define flush_insn_slot(p) do { } while (0)
17128
17129diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17130index 4ad6560..75c7bdd 100644
17131--- a/arch/x86/include/asm/local.h
17132+++ b/arch/x86/include/asm/local.h
17133@@ -10,33 +10,97 @@ typedef struct {
17134 atomic_long_t a;
17135 } local_t;
17136
17137+typedef struct {
17138+ atomic_long_unchecked_t a;
17139+} local_unchecked_t;
17140+
17141 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17142
17143 #define local_read(l) atomic_long_read(&(l)->a)
17144+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17145 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17146+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17147
17148 static inline void local_inc(local_t *l)
17149 {
17150- asm volatile(_ASM_INC "%0"
17151+ asm volatile(_ASM_INC "%0\n"
17152+
17153+#ifdef CONFIG_PAX_REFCOUNT
17154+ "jno 0f\n"
17155+ _ASM_DEC "%0\n"
17156+ "int $4\n0:\n"
17157+ _ASM_EXTABLE(0b, 0b)
17158+#endif
17159+
17160+ : "+m" (l->a.counter));
17161+}
17162+
17163+static inline void local_inc_unchecked(local_unchecked_t *l)
17164+{
17165+ asm volatile(_ASM_INC "%0\n"
17166 : "+m" (l->a.counter));
17167 }
17168
17169 static inline void local_dec(local_t *l)
17170 {
17171- asm volatile(_ASM_DEC "%0"
17172+ asm volatile(_ASM_DEC "%0\n"
17173+
17174+#ifdef CONFIG_PAX_REFCOUNT
17175+ "jno 0f\n"
17176+ _ASM_INC "%0\n"
17177+ "int $4\n0:\n"
17178+ _ASM_EXTABLE(0b, 0b)
17179+#endif
17180+
17181+ : "+m" (l->a.counter));
17182+}
17183+
17184+static inline void local_dec_unchecked(local_unchecked_t *l)
17185+{
17186+ asm volatile(_ASM_DEC "%0\n"
17187 : "+m" (l->a.counter));
17188 }
17189
17190 static inline void local_add(long i, local_t *l)
17191 {
17192- asm volatile(_ASM_ADD "%1,%0"
17193+ asm volatile(_ASM_ADD "%1,%0\n"
17194+
17195+#ifdef CONFIG_PAX_REFCOUNT
17196+ "jno 0f\n"
17197+ _ASM_SUB "%1,%0\n"
17198+ "int $4\n0:\n"
17199+ _ASM_EXTABLE(0b, 0b)
17200+#endif
17201+
17202+ : "+m" (l->a.counter)
17203+ : "ir" (i));
17204+}
17205+
17206+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17207+{
17208+ asm volatile(_ASM_ADD "%1,%0\n"
17209 : "+m" (l->a.counter)
17210 : "ir" (i));
17211 }
17212
17213 static inline void local_sub(long i, local_t *l)
17214 {
17215- asm volatile(_ASM_SUB "%1,%0"
17216+ asm volatile(_ASM_SUB "%1,%0\n"
17217+
17218+#ifdef CONFIG_PAX_REFCOUNT
17219+ "jno 0f\n"
17220+ _ASM_ADD "%1,%0\n"
17221+ "int $4\n0:\n"
17222+ _ASM_EXTABLE(0b, 0b)
17223+#endif
17224+
17225+ : "+m" (l->a.counter)
17226+ : "ir" (i));
17227+}
17228+
17229+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17230+{
17231+ asm volatile(_ASM_SUB "%1,%0\n"
17232 : "+m" (l->a.counter)
17233 : "ir" (i));
17234 }
17235@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17236 */
17237 static inline int local_sub_and_test(long i, local_t *l)
17238 {
17239- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17240+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17241 }
17242
17243 /**
17244@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17245 */
17246 static inline int local_dec_and_test(local_t *l)
17247 {
17248- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17249+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17250 }
17251
17252 /**
17253@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17254 */
17255 static inline int local_inc_and_test(local_t *l)
17256 {
17257- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17258+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17259 }
17260
17261 /**
17262@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17263 */
17264 static inline int local_add_negative(long i, local_t *l)
17265 {
17266- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17267+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17268 }
17269
17270 /**
17271@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17272 static inline long local_add_return(long i, local_t *l)
17273 {
17274 long __i = i;
17275+ asm volatile(_ASM_XADD "%0, %1\n"
17276+
17277+#ifdef CONFIG_PAX_REFCOUNT
17278+ "jno 0f\n"
17279+ _ASM_MOV "%0,%1\n"
17280+ "int $4\n0:\n"
17281+ _ASM_EXTABLE(0b, 0b)
17282+#endif
17283+
17284+ : "+r" (i), "+m" (l->a.counter)
17285+ : : "memory");
17286+ return i + __i;
17287+}
17288+
17289+/**
17290+ * local_add_return_unchecked - add and return
17291+ * @i: integer value to add
17292+ * @l: pointer to type local_unchecked_t
17293+ *
17294+ * Atomically adds @i to @l and returns @i + @l
17295+ */
17296+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17297+{
17298+ long __i = i;
17299 asm volatile(_ASM_XADD "%0, %1;"
17300 : "+r" (i), "+m" (l->a.counter)
17301 : : "memory");
17302@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17303
17304 #define local_cmpxchg(l, o, n) \
17305 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17306+#define local_cmpxchg_unchecked(l, o, n) \
17307+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17308 /* Always has a lock prefix */
17309 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17310
17311diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17312new file mode 100644
17313index 0000000..2bfd3ba
17314--- /dev/null
17315+++ b/arch/x86/include/asm/mman.h
17316@@ -0,0 +1,15 @@
17317+#ifndef _X86_MMAN_H
17318+#define _X86_MMAN_H
17319+
17320+#include <uapi/asm/mman.h>
17321+
17322+#ifdef __KERNEL__
17323+#ifndef __ASSEMBLY__
17324+#ifdef CONFIG_X86_32
17325+#define arch_mmap_check i386_mmap_check
17326+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17327+#endif
17328+#endif
17329+#endif
17330+
17331+#endif /* X86_MMAN_H */
17332diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17333index 09b9620..923aecd 100644
17334--- a/arch/x86/include/asm/mmu.h
17335+++ b/arch/x86/include/asm/mmu.h
17336@@ -9,7 +9,7 @@
17337 * we put the segment information here.
17338 */
17339 typedef struct {
17340- void *ldt;
17341+ struct desc_struct *ldt;
17342 int size;
17343
17344 #ifdef CONFIG_X86_64
17345@@ -18,7 +18,19 @@ typedef struct {
17346 #endif
17347
17348 struct mutex lock;
17349- void __user *vdso;
17350+ unsigned long vdso;
17351+
17352+#ifdef CONFIG_X86_32
17353+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17354+ unsigned long user_cs_base;
17355+ unsigned long user_cs_limit;
17356+
17357+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17358+ cpumask_t cpu_user_cs_mask;
17359+#endif
17360+
17361+#endif
17362+#endif
17363
17364 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17365 } mm_context_t;
17366diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17367index e997f70..5d819f7 100644
17368--- a/arch/x86/include/asm/mmu_context.h
17369+++ b/arch/x86/include/asm/mmu_context.h
17370@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17371
17372 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17373 {
17374+
17375+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17376+ if (!(static_cpu_has(X86_FEATURE_PCIDUDEREF))) {
17377+ unsigned int i;
17378+ pgd_t *pgd;
17379+
17380+ pax_open_kernel();
17381+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17382+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17383+ set_pgd_batched(pgd+i, native_make_pgd(0));
17384+ pax_close_kernel();
17385+ }
17386+#endif
17387+
17388 #ifdef CONFIG_SMP
17389 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17390 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17391@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17392 struct task_struct *tsk)
17393 {
17394 unsigned cpu = smp_processor_id();
17395+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17396+ int tlbstate = TLBSTATE_OK;
17397+#endif
17398
17399 if (likely(prev != next)) {
17400 #ifdef CONFIG_SMP
17401+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17402+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17403+#endif
17404 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17405 this_cpu_write(cpu_tlbstate.active_mm, next);
17406 #endif
17407 cpumask_set_cpu(cpu, mm_cpumask(next));
17408
17409 /* Re-load page tables */
17410+#ifdef CONFIG_PAX_PER_CPU_PGD
17411+ pax_open_kernel();
17412+
17413+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17414+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17415+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17416+ else
17417+#endif
17418+
17419+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17420+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17421+ pax_close_kernel();
17422+ 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));
17423+
17424+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17425+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17426+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17427+ u64 descriptor[2];
17428+ descriptor[0] = PCID_USER;
17429+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17430+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17431+ descriptor[0] = PCID_KERNEL;
17432+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17433+ }
17434+ } else {
17435+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17436+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17437+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17438+ else
17439+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17440+ }
17441+ } else
17442+#endif
17443+
17444+ load_cr3(get_cpu_pgd(cpu, kernel));
17445+#else
17446 load_cr3(next->pgd);
17447+#endif
17448 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17449
17450 /* Stop flush ipis for the previous mm */
17451@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17452 */
17453 if (unlikely(prev->context.ldt != next->context.ldt))
17454 load_LDT_nolock(&next->context);
17455+
17456+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17457+ if (!(__supported_pte_mask & _PAGE_NX)) {
17458+ smp_mb__before_atomic();
17459+ cpumask_clear_cpu(cpu, &prev->context.cpu_user_cs_mask);
17460+ smp_mb__after_atomic();
17461+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17462+ }
17463+#endif
17464+
17465+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17466+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17467+ prev->context.user_cs_limit != next->context.user_cs_limit))
17468+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17469+#ifdef CONFIG_SMP
17470+ else if (unlikely(tlbstate != TLBSTATE_OK))
17471+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17472+#endif
17473+#endif
17474+
17475 }
17476+ else {
17477+
17478+#ifdef CONFIG_PAX_PER_CPU_PGD
17479+ pax_open_kernel();
17480+
17481+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17482+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17483+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17484+ else
17485+#endif
17486+
17487+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17488+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17489+ pax_close_kernel();
17490+ 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));
17491+
17492+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17493+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17494+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17495+ u64 descriptor[2];
17496+ descriptor[0] = PCID_USER;
17497+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17498+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17499+ descriptor[0] = PCID_KERNEL;
17500+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17501+ }
17502+ } else {
17503+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17504+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17505+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17506+ else
17507+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17508+ }
17509+ } else
17510+#endif
17511+
17512+ load_cr3(get_cpu_pgd(cpu, kernel));
17513+#endif
17514+
17515 #ifdef CONFIG_SMP
17516- else {
17517 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17518 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17519
17520@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17521 * tlb flush IPI delivery. We must reload CR3
17522 * to make sure to use no freed page tables.
17523 */
17524+
17525+#ifndef CONFIG_PAX_PER_CPU_PGD
17526 load_cr3(next->pgd);
17527 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17528+#endif
17529+
17530 load_mm_cr4(next);
17531 load_LDT_nolock(&next->context);
17532+
17533+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17534+ if (!(__supported_pte_mask & _PAGE_NX))
17535+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17536+#endif
17537+
17538+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17539+#ifdef CONFIG_PAX_PAGEEXEC
17540+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17541+#endif
17542+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17543+#endif
17544+
17545 }
17546+#endif
17547 }
17548-#endif
17549 }
17550
17551 #define activate_mm(prev, next) \
17552diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17553index e3b7819..b257c64 100644
17554--- a/arch/x86/include/asm/module.h
17555+++ b/arch/x86/include/asm/module.h
17556@@ -5,6 +5,7 @@
17557
17558 #ifdef CONFIG_X86_64
17559 /* X86_64 does not define MODULE_PROC_FAMILY */
17560+#define MODULE_PROC_FAMILY ""
17561 #elif defined CONFIG_M486
17562 #define MODULE_PROC_FAMILY "486 "
17563 #elif defined CONFIG_M586
17564@@ -57,8 +58,20 @@
17565 #error unknown processor family
17566 #endif
17567
17568-#ifdef CONFIG_X86_32
17569-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17570+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17571+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17572+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17573+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17574+#else
17575+#define MODULE_PAX_KERNEXEC ""
17576 #endif
17577
17578+#ifdef CONFIG_PAX_MEMORY_UDEREF
17579+#define MODULE_PAX_UDEREF "UDEREF "
17580+#else
17581+#define MODULE_PAX_UDEREF ""
17582+#endif
17583+
17584+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17585+
17586 #endif /* _ASM_X86_MODULE_H */
17587diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17588index 5f2fc44..106caa6 100644
17589--- a/arch/x86/include/asm/nmi.h
17590+++ b/arch/x86/include/asm/nmi.h
17591@@ -36,26 +36,35 @@ enum {
17592
17593 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17594
17595+struct nmiaction;
17596+
17597+struct nmiwork {
17598+ const struct nmiaction *action;
17599+ u64 max_duration;
17600+ struct irq_work irq_work;
17601+};
17602+
17603 struct nmiaction {
17604 struct list_head list;
17605 nmi_handler_t handler;
17606- u64 max_duration;
17607- struct irq_work irq_work;
17608 unsigned long flags;
17609 const char *name;
17610-};
17611+ struct nmiwork *work;
17612+} __do_const;
17613
17614 #define register_nmi_handler(t, fn, fg, n, init...) \
17615 ({ \
17616- static struct nmiaction init fn##_na = { \
17617+ static struct nmiwork fn##_nw; \
17618+ static const struct nmiaction init fn##_na = { \
17619 .handler = (fn), \
17620 .name = (n), \
17621 .flags = (fg), \
17622+ .work = &fn##_nw, \
17623 }; \
17624 __register_nmi_handler((t), &fn##_na); \
17625 })
17626
17627-int __register_nmi_handler(unsigned int, struct nmiaction *);
17628+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17629
17630 void unregister_nmi_handler(unsigned int, const char *);
17631
17632diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17633index 802dde3..9183e68 100644
17634--- a/arch/x86/include/asm/page.h
17635+++ b/arch/x86/include/asm/page.h
17636@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17637 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17638
17639 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17640+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17641
17642 #define __boot_va(x) __va(x)
17643 #define __boot_pa(x) __pa(x)
17644@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17645 * virt_to_page(kaddr) returns a valid pointer if and only if
17646 * virt_addr_valid(kaddr) returns true.
17647 */
17648-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17649 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17650 extern bool __virt_addr_valid(unsigned long kaddr);
17651 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17652
17653+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17654+#define virt_to_page(kaddr) \
17655+ ({ \
17656+ const void *__kaddr = (const void *)(kaddr); \
17657+ BUG_ON(!virt_addr_valid(__kaddr)); \
17658+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17659+ })
17660+#else
17661+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17662+#endif
17663+
17664 #endif /* __ASSEMBLY__ */
17665
17666 #include <asm-generic/memory_model.h>
17667diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h
17668index 904f528..b4d0d24 100644
17669--- a/arch/x86/include/asm/page_32.h
17670+++ b/arch/x86/include/asm/page_32.h
17671@@ -7,11 +7,17 @@
17672
17673 #define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET)
17674 #ifdef CONFIG_DEBUG_VIRTUAL
17675-extern unsigned long __phys_addr(unsigned long);
17676+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17677 #else
17678-#define __phys_addr(x) __phys_addr_nodebug(x)
17679+static inline unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
17680+{
17681+ return __phys_addr_nodebug(x);
17682+}
17683 #endif
17684-#define __phys_addr_symbol(x) __phys_addr(x)
17685+static inline unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long x)
17686+{
17687+ return __phys_addr(x);
17688+}
17689 #define __phys_reloc_hide(x) RELOC_HIDE((x), 0)
17690
17691 #ifdef CONFIG_FLATMEM
17692diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17693index b3bebf9..cb419e7 100644
17694--- a/arch/x86/include/asm/page_64.h
17695+++ b/arch/x86/include/asm/page_64.h
17696@@ -7,9 +7,9 @@
17697
17698 /* duplicated to the one in bootmem.h */
17699 extern unsigned long max_pfn;
17700-extern unsigned long phys_base;
17701+extern const unsigned long phys_base;
17702
17703-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17704+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17705 {
17706 unsigned long y = x - __START_KERNEL_map;
17707
17708@@ -20,12 +20,14 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17709 }
17710
17711 #ifdef CONFIG_DEBUG_VIRTUAL
17712-extern unsigned long __phys_addr(unsigned long);
17713-extern unsigned long __phys_addr_symbol(unsigned long);
17714+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17715+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17716 #else
17717 #define __phys_addr(x) __phys_addr_nodebug(x)
17718-#define __phys_addr_symbol(x) \
17719- ((unsigned long)(x) - __START_KERNEL_map + phys_base)
17720+static inline unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long x)
17721+{
17722+ return x - __START_KERNEL_map + phys_base;
17723+}
17724 #endif
17725
17726 #define __phys_reloc_hide(x) (x)
17727diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17728index 8957810..f34efb4 100644
17729--- a/arch/x86/include/asm/paravirt.h
17730+++ b/arch/x86/include/asm/paravirt.h
17731@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17732 return (pmd_t) { ret };
17733 }
17734
17735-static inline pmdval_t pmd_val(pmd_t pmd)
17736+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17737 {
17738 pmdval_t ret;
17739
17740@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17741 val);
17742 }
17743
17744+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17745+{
17746+ pgdval_t val = native_pgd_val(pgd);
17747+
17748+ if (sizeof(pgdval_t) > sizeof(long))
17749+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17750+ val, (u64)val >> 32);
17751+ else
17752+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17753+ val);
17754+}
17755+
17756 static inline void pgd_clear(pgd_t *pgdp)
17757 {
17758 set_pgd(pgdp, __pgd(0));
17759@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17760 pv_mmu_ops.set_fixmap(idx, phys, flags);
17761 }
17762
17763+#ifdef CONFIG_PAX_KERNEXEC
17764+static inline unsigned long pax_open_kernel(void)
17765+{
17766+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17767+}
17768+
17769+static inline unsigned long pax_close_kernel(void)
17770+{
17771+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17772+}
17773+#else
17774+static inline unsigned long pax_open_kernel(void) { return 0; }
17775+static inline unsigned long pax_close_kernel(void) { return 0; }
17776+#endif
17777+
17778 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17779
17780 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17781@@ -906,7 +933,7 @@ extern void default_banner(void);
17782
17783 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17784 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17785-#define PARA_INDIRECT(addr) *%cs:addr
17786+#define PARA_INDIRECT(addr) *%ss:addr
17787 #endif
17788
17789 #define INTERRUPT_RETURN \
17790@@ -976,6 +1003,21 @@ extern void default_banner(void);
17791 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret64), \
17792 CLBR_NONE, \
17793 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret64))
17794+
17795+#define GET_CR0_INTO_RDI \
17796+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17797+ mov %rax,%rdi
17798+
17799+#define SET_RDI_INTO_CR0 \
17800+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17801+
17802+#define GET_CR3_INTO_RDI \
17803+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17804+ mov %rax,%rdi
17805+
17806+#define SET_RDI_INTO_CR3 \
17807+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17808+
17809 #endif /* CONFIG_X86_32 */
17810
17811 #endif /* __ASSEMBLY__ */
17812diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17813index f7b0b5c..cdd33f9 100644
17814--- a/arch/x86/include/asm/paravirt_types.h
17815+++ b/arch/x86/include/asm/paravirt_types.h
17816@@ -84,7 +84,7 @@ struct pv_init_ops {
17817 */
17818 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17819 unsigned long addr, unsigned len);
17820-};
17821+} __no_const __no_randomize_layout;
17822
17823
17824 struct pv_lazy_ops {
17825@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17826 void (*enter)(void);
17827 void (*leave)(void);
17828 void (*flush)(void);
17829-};
17830+} __no_randomize_layout;
17831
17832 struct pv_time_ops {
17833 unsigned long long (*sched_clock)(void);
17834 unsigned long long (*steal_clock)(int cpu);
17835 unsigned long (*get_tsc_khz)(void);
17836-};
17837+} __no_const __no_randomize_layout;
17838
17839 struct pv_cpu_ops {
17840 /* hooks for various privileged instructions */
17841@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17842
17843 void (*start_context_switch)(struct task_struct *prev);
17844 void (*end_context_switch)(struct task_struct *next);
17845-};
17846+} __no_const __no_randomize_layout;
17847
17848 struct pv_irq_ops {
17849 /*
17850@@ -215,7 +215,7 @@ struct pv_irq_ops {
17851 #ifdef CONFIG_X86_64
17852 void (*adjust_exception_frame)(void);
17853 #endif
17854-};
17855+} __no_randomize_layout;
17856
17857 struct pv_apic_ops {
17858 #ifdef CONFIG_X86_LOCAL_APIC
17859@@ -223,7 +223,7 @@ struct pv_apic_ops {
17860 unsigned long start_eip,
17861 unsigned long start_esp);
17862 #endif
17863-};
17864+} __no_const __no_randomize_layout;
17865
17866 struct pv_mmu_ops {
17867 unsigned long (*read_cr2)(void);
17868@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17869 struct paravirt_callee_save make_pud;
17870
17871 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17872+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17873 #endif /* CONFIG_PGTABLE_LEVELS == 4 */
17874 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
17875
17876@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17877 an mfn. We can tell which is which from the index. */
17878 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17879 phys_addr_t phys, pgprot_t flags);
17880-};
17881+
17882+#ifdef CONFIG_PAX_KERNEXEC
17883+ unsigned long (*pax_open_kernel)(void);
17884+ unsigned long (*pax_close_kernel)(void);
17885+#endif
17886+
17887+} __no_randomize_layout;
17888
17889 struct arch_spinlock;
17890 #ifdef CONFIG_SMP
17891@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17892 struct pv_lock_ops {
17893 struct paravirt_callee_save lock_spinning;
17894 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17895-};
17896+} __no_randomize_layout;
17897
17898 /* This contains all the paravirt structures: we get a convenient
17899 * number for each function using the offset which we use to indicate
17900- * what to patch. */
17901+ * what to patch.
17902+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17903+ */
17904+
17905 struct paravirt_patch_template {
17906 struct pv_init_ops pv_init_ops;
17907 struct pv_time_ops pv_time_ops;
17908@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17909 struct pv_apic_ops pv_apic_ops;
17910 struct pv_mmu_ops pv_mmu_ops;
17911 struct pv_lock_ops pv_lock_ops;
17912-};
17913+} __no_randomize_layout;
17914
17915 extern struct pv_info pv_info;
17916 extern struct pv_init_ops pv_init_ops;
17917diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17918index bf7f8b5..ca5799d 100644
17919--- a/arch/x86/include/asm/pgalloc.h
17920+++ b/arch/x86/include/asm/pgalloc.h
17921@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17922 pmd_t *pmd, pte_t *pte)
17923 {
17924 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17925+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17926+}
17927+
17928+static inline void pmd_populate_user(struct mm_struct *mm,
17929+ pmd_t *pmd, pte_t *pte)
17930+{
17931+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17932 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17933 }
17934
17935@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17936
17937 #ifdef CONFIG_X86_PAE
17938 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17939+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17940+{
17941+ pud_populate(mm, pudp, pmd);
17942+}
17943 #else /* !CONFIG_X86_PAE */
17944 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17945 {
17946 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17947 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17948 }
17949+
17950+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17951+{
17952+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17953+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17954+}
17955 #endif /* CONFIG_X86_PAE */
17956
17957 #if CONFIG_PGTABLE_LEVELS > 3
17958@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17959 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17960 }
17961
17962+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17963+{
17964+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17965+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17966+}
17967+
17968 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17969 {
17970 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17971diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17972index fd74a11..35fd5af 100644
17973--- a/arch/x86/include/asm/pgtable-2level.h
17974+++ b/arch/x86/include/asm/pgtable-2level.h
17975@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17976
17977 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17978 {
17979+ pax_open_kernel();
17980 *pmdp = pmd;
17981+ pax_close_kernel();
17982 }
17983
17984 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17985diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17986index cdaa58c..e61122b 100644
17987--- a/arch/x86/include/asm/pgtable-3level.h
17988+++ b/arch/x86/include/asm/pgtable-3level.h
17989@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17990
17991 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17992 {
17993+ pax_open_kernel();
17994 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17995+ pax_close_kernel();
17996 }
17997
17998 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17999 {
18000+ pax_open_kernel();
18001 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
18002+ pax_close_kernel();
18003 }
18004
18005 /*
18006diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
18007index fe57e7a..0573d42 100644
18008--- a/arch/x86/include/asm/pgtable.h
18009+++ b/arch/x86/include/asm/pgtable.h
18010@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18011
18012 #ifndef __PAGETABLE_PUD_FOLDED
18013 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18014+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18015 #define pgd_clear(pgd) native_pgd_clear(pgd)
18016 #endif
18017
18018@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18019
18020 #define arch_end_context_switch(prev) do {} while(0)
18021
18022+#define pax_open_kernel() native_pax_open_kernel()
18023+#define pax_close_kernel() native_pax_close_kernel()
18024 #endif /* CONFIG_PARAVIRT */
18025
18026+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18027+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18028+
18029+#ifdef CONFIG_PAX_KERNEXEC
18030+static inline unsigned long native_pax_open_kernel(void)
18031+{
18032+ unsigned long cr0;
18033+
18034+ preempt_disable();
18035+ barrier();
18036+ cr0 = read_cr0() ^ X86_CR0_WP;
18037+ BUG_ON(cr0 & X86_CR0_WP);
18038+ write_cr0(cr0);
18039+ barrier();
18040+ return cr0 ^ X86_CR0_WP;
18041+}
18042+
18043+static inline unsigned long native_pax_close_kernel(void)
18044+{
18045+ unsigned long cr0;
18046+
18047+ barrier();
18048+ cr0 = read_cr0() ^ X86_CR0_WP;
18049+ BUG_ON(!(cr0 & X86_CR0_WP));
18050+ write_cr0(cr0);
18051+ barrier();
18052+ preempt_enable_no_resched();
18053+ return cr0 ^ X86_CR0_WP;
18054+}
18055+#else
18056+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18057+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18058+#endif
18059+
18060 /*
18061 * The following only work if pte_present() is true.
18062 * Undefined behaviour if not..
18063 */
18064+static inline int pte_user(pte_t pte)
18065+{
18066+ return pte_val(pte) & _PAGE_USER;
18067+}
18068+
18069 static inline int pte_dirty(pte_t pte)
18070 {
18071 return pte_flags(pte) & _PAGE_DIRTY;
18072@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18073 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18074 }
18075
18076+static inline unsigned long pgd_pfn(pgd_t pgd)
18077+{
18078+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18079+}
18080+
18081 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18082
18083 static inline int pmd_large(pmd_t pte)
18084@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18085 return pte_clear_flags(pte, _PAGE_RW);
18086 }
18087
18088+static inline pte_t pte_mkread(pte_t pte)
18089+{
18090+ return __pte(pte_val(pte) | _PAGE_USER);
18091+}
18092+
18093 static inline pte_t pte_mkexec(pte_t pte)
18094 {
18095- return pte_clear_flags(pte, _PAGE_NX);
18096+#ifdef CONFIG_X86_PAE
18097+ if (__supported_pte_mask & _PAGE_NX)
18098+ return pte_clear_flags(pte, _PAGE_NX);
18099+ else
18100+#endif
18101+ return pte_set_flags(pte, _PAGE_USER);
18102+}
18103+
18104+static inline pte_t pte_exprotect(pte_t pte)
18105+{
18106+#ifdef CONFIG_X86_PAE
18107+ if (__supported_pte_mask & _PAGE_NX)
18108+ return pte_set_flags(pte, _PAGE_NX);
18109+ else
18110+#endif
18111+ return pte_clear_flags(pte, _PAGE_USER);
18112 }
18113
18114 static inline pte_t pte_mkdirty(pte_t pte)
18115@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18116 #endif
18117
18118 #ifndef __ASSEMBLY__
18119+
18120+#ifdef CONFIG_PAX_PER_CPU_PGD
18121+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18122+enum cpu_pgd_type {kernel = 0, user = 1};
18123+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18124+{
18125+ return cpu_pgd[cpu][type];
18126+}
18127+#endif
18128+
18129 #include <linux/mm_types.h>
18130 #include <linux/mmdebug.h>
18131 #include <linux/log2.h>
18132@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18133 * Currently stuck as a macro due to indirect forward reference to
18134 * linux/mmzone.h's __section_mem_map_addr() definition:
18135 */
18136-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18137+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18138
18139 /* Find an entry in the second-level page table.. */
18140 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18141@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18142 * Currently stuck as a macro due to indirect forward reference to
18143 * linux/mmzone.h's __section_mem_map_addr() definition:
18144 */
18145-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18146+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18147
18148 /* to find an entry in a page-table-directory. */
18149 static inline unsigned long pud_index(unsigned long address)
18150@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18151
18152 static inline int pgd_bad(pgd_t pgd)
18153 {
18154- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18155+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18156 }
18157
18158 static inline int pgd_none(pgd_t pgd)
18159@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18160 * pgd_offset() returns a (pgd_t *)
18161 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18162 */
18163-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18164+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18165+
18166+#ifdef CONFIG_PAX_PER_CPU_PGD
18167+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18168+#endif
18169+
18170 /*
18171 * a shortcut which implies the use of the kernel's pgd, instead
18172 * of a process's
18173@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18174 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18175 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18176
18177+#ifdef CONFIG_X86_32
18178+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18179+#else
18180+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18181+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18182+
18183+#ifdef CONFIG_PAX_MEMORY_UDEREF
18184+#ifdef __ASSEMBLY__
18185+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18186+#else
18187+extern unsigned long pax_user_shadow_base;
18188+extern pgdval_t clone_pgd_mask;
18189+#endif
18190+#else
18191+#define pax_user_shadow_base (0UL)
18192+#endif
18193+
18194+#endif
18195+
18196 #ifndef __ASSEMBLY__
18197
18198 extern int direct_gbpages;
18199@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18200 * dst and src can be on the same page, but the range must not overlap,
18201 * and must not cross a page boundary.
18202 */
18203-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18204+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18205 {
18206- memcpy(dst, src, count * sizeof(pgd_t));
18207+ pax_open_kernel();
18208+ while (count--)
18209+ *dst++ = *src++;
18210+ pax_close_kernel();
18211 }
18212
18213+#ifdef CONFIG_PAX_PER_CPU_PGD
18214+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18215+#endif
18216+
18217+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18218+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18219+#else
18220+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18221+#endif
18222+
18223 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18224 static inline int page_level_shift(enum pg_level level)
18225 {
18226diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18227index b6c0b40..3535d47 100644
18228--- a/arch/x86/include/asm/pgtable_32.h
18229+++ b/arch/x86/include/asm/pgtable_32.h
18230@@ -25,9 +25,6 @@
18231 struct mm_struct;
18232 struct vm_area_struct;
18233
18234-extern pgd_t swapper_pg_dir[1024];
18235-extern pgd_t initial_page_table[1024];
18236-
18237 static inline void pgtable_cache_init(void) { }
18238 static inline void check_pgt_cache(void) { }
18239 void paging_init(void);
18240@@ -45,6 +42,12 @@ void paging_init(void);
18241 # include <asm/pgtable-2level.h>
18242 #endif
18243
18244+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18245+extern pgd_t initial_page_table[PTRS_PER_PGD];
18246+#ifdef CONFIG_X86_PAE
18247+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18248+#endif
18249+
18250 #if defined(CONFIG_HIGHPTE)
18251 #define pte_offset_map(dir, address) \
18252 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18253@@ -59,12 +62,17 @@ void paging_init(void);
18254 /* Clear a kernel PTE and flush it from the TLB */
18255 #define kpte_clear_flush(ptep, vaddr) \
18256 do { \
18257+ pax_open_kernel(); \
18258 pte_clear(&init_mm, (vaddr), (ptep)); \
18259+ pax_close_kernel(); \
18260 __flush_tlb_one((vaddr)); \
18261 } while (0)
18262
18263 #endif /* !__ASSEMBLY__ */
18264
18265+#define HAVE_ARCH_UNMAPPED_AREA
18266+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18267+
18268 /*
18269 * kern_addr_valid() is (1) for FLATMEM and (0) for
18270 * SPARSEMEM and DISCONTIGMEM
18271diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18272index 9fb2f2b..b04b4bf 100644
18273--- a/arch/x86/include/asm/pgtable_32_types.h
18274+++ b/arch/x86/include/asm/pgtable_32_types.h
18275@@ -8,7 +8,7 @@
18276 */
18277 #ifdef CONFIG_X86_PAE
18278 # include <asm/pgtable-3level_types.h>
18279-# define PMD_SIZE (1UL << PMD_SHIFT)
18280+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18281 # define PMD_MASK (~(PMD_SIZE - 1))
18282 #else
18283 # include <asm/pgtable-2level_types.h>
18284@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18285 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18286 #endif
18287
18288+#ifdef CONFIG_PAX_KERNEXEC
18289+#ifndef __ASSEMBLY__
18290+extern unsigned char MODULES_EXEC_VADDR[];
18291+extern unsigned char MODULES_EXEC_END[];
18292+#endif
18293+#include <asm/boot.h>
18294+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18295+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18296+#else
18297+#define ktla_ktva(addr) (addr)
18298+#define ktva_ktla(addr) (addr)
18299+#endif
18300+
18301 #define MODULES_VADDR VMALLOC_START
18302 #define MODULES_END VMALLOC_END
18303 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18304diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18305index 2ee7811..55aca24 100644
18306--- a/arch/x86/include/asm/pgtable_64.h
18307+++ b/arch/x86/include/asm/pgtable_64.h
18308@@ -16,11 +16,16 @@
18309
18310 extern pud_t level3_kernel_pgt[512];
18311 extern pud_t level3_ident_pgt[512];
18312+extern pud_t level3_vmalloc_start_pgt[512];
18313+extern pud_t level3_vmalloc_end_pgt[512];
18314+extern pud_t level3_vmemmap_pgt[512];
18315+extern pud_t level2_vmemmap_pgt[512];
18316 extern pmd_t level2_kernel_pgt[512];
18317 extern pmd_t level2_fixmap_pgt[512];
18318-extern pmd_t level2_ident_pgt[512];
18319-extern pte_t level1_fixmap_pgt[512];
18320-extern pgd_t init_level4_pgt[];
18321+extern pmd_t level2_ident_pgt[2][512];
18322+extern pte_t level1_fixmap_pgt[3][512];
18323+extern pte_t level1_vsyscall_pgt[512];
18324+extern pgd_t init_level4_pgt[512];
18325
18326 #define swapper_pg_dir init_level4_pgt
18327
18328@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18329
18330 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18331 {
18332+ pax_open_kernel();
18333 *pmdp = pmd;
18334+ pax_close_kernel();
18335 }
18336
18337 static inline void native_pmd_clear(pmd_t *pmd)
18338@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18339
18340 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18341 {
18342+ pax_open_kernel();
18343 *pudp = pud;
18344+ pax_close_kernel();
18345 }
18346
18347 static inline void native_pud_clear(pud_t *pud)
18348@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18349
18350 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18351 {
18352+ pax_open_kernel();
18353+ *pgdp = pgd;
18354+ pax_close_kernel();
18355+}
18356+
18357+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18358+{
18359 *pgdp = pgd;
18360 }
18361
18362diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18363index e6844df..432b56e 100644
18364--- a/arch/x86/include/asm/pgtable_64_types.h
18365+++ b/arch/x86/include/asm/pgtable_64_types.h
18366@@ -60,11 +60,16 @@ typedef struct { pteval_t pte; } pte_t;
18367 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18368 #define MODULES_END _AC(0xffffffffff000000, UL)
18369 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18370+#define MODULES_EXEC_VADDR MODULES_VADDR
18371+#define MODULES_EXEC_END MODULES_END
18372 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18373 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18374 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18375 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18376
18377+#define ktla_ktva(addr) (addr)
18378+#define ktva_ktla(addr) (addr)
18379+
18380 #define EARLY_DYNAMIC_PAGE_TABLES 64
18381
18382 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18383diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18384index 78f0c8c..4424bb0 100644
18385--- a/arch/x86/include/asm/pgtable_types.h
18386+++ b/arch/x86/include/asm/pgtable_types.h
18387@@ -85,8 +85,10 @@
18388
18389 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18390 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18391-#else
18392+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18393 #define _PAGE_NX (_AT(pteval_t, 0))
18394+#else
18395+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18396 #endif
18397
18398 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18399@@ -141,6 +143,9 @@ enum page_cache_mode {
18400 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18401 _PAGE_ACCESSED)
18402
18403+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18404+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18405+
18406 #define __PAGE_KERNEL_EXEC \
18407 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18408 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18409@@ -148,7 +153,7 @@ enum page_cache_mode {
18410 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18411 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18412 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18413-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18414+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18415 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18416 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18417 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18418@@ -194,7 +199,7 @@ enum page_cache_mode {
18419 #ifdef CONFIG_X86_64
18420 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18421 #else
18422-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18423+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18424 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18425 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18426 #endif
18427@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18428 {
18429 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18430 }
18431+#endif
18432
18433+#if CONFIG_PGTABLE_LEVELS == 3
18434+#include <asm-generic/pgtable-nopud.h>
18435+#endif
18436+
18437+#if CONFIG_PGTABLE_LEVELS == 2
18438+#include <asm-generic/pgtable-nopmd.h>
18439+#endif
18440+
18441+#ifndef __ASSEMBLY__
18442 #if CONFIG_PGTABLE_LEVELS > 3
18443 typedef struct { pudval_t pud; } pud_t;
18444
18445@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18446 return pud.pud;
18447 }
18448 #else
18449-#include <asm-generic/pgtable-nopud.h>
18450-
18451 static inline pudval_t native_pud_val(pud_t pud)
18452 {
18453 return native_pgd_val(pud.pgd);
18454@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18455 return pmd.pmd;
18456 }
18457 #else
18458-#include <asm-generic/pgtable-nopmd.h>
18459-
18460 static inline pmdval_t native_pmd_val(pmd_t pmd)
18461 {
18462 return native_pgd_val(pmd.pud.pgd);
18463@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18464
18465 extern pteval_t __supported_pte_mask;
18466 extern void set_nx(void);
18467-extern int nx_enabled;
18468
18469 #define pgprot_writecombine pgprot_writecombine
18470 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18471diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18472index 8f327184..368fb29 100644
18473--- a/arch/x86/include/asm/preempt.h
18474+++ b/arch/x86/include/asm/preempt.h
18475@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18476 */
18477 static __always_inline bool __preempt_count_dec_and_test(void)
18478 {
18479- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18480+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18481 }
18482
18483 /*
18484diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18485index 23ba676..6584489 100644
18486--- a/arch/x86/include/asm/processor.h
18487+++ b/arch/x86/include/asm/processor.h
18488@@ -130,7 +130,7 @@ struct cpuinfo_x86 {
18489 /* Index into per_cpu list: */
18490 u16 cpu_index;
18491 u32 microcode;
18492-};
18493+} __randomize_layout;
18494
18495 #define X86_VENDOR_INTEL 0
18496 #define X86_VENDOR_CYRIX 1
18497@@ -201,9 +201,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18498 : "memory");
18499 }
18500
18501+/* invpcid (%rdx),%rax */
18502+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18503+
18504+#define INVPCID_SINGLE_ADDRESS 0UL
18505+#define INVPCID_SINGLE_CONTEXT 1UL
18506+#define INVPCID_ALL_GLOBAL 2UL
18507+#define INVPCID_ALL_NONGLOBAL 3UL
18508+
18509+#define PCID_KERNEL 0UL
18510+#define PCID_USER 1UL
18511+#define PCID_NOFLUSH (1UL << 63)
18512+
18513 static inline void load_cr3(pgd_t *pgdir)
18514 {
18515- write_cr3(__pa(pgdir));
18516+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18517 }
18518
18519 #ifdef CONFIG_X86_32
18520@@ -300,7 +312,7 @@ struct tss_struct {
18521
18522 } ____cacheline_aligned;
18523
18524-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);
18525+extern struct tss_struct cpu_tss[NR_CPUS];
18526
18527 #ifdef CONFIG_X86_32
18528 DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);
18529@@ -500,6 +512,7 @@ struct thread_struct {
18530 unsigned short ds;
18531 unsigned short fsindex;
18532 unsigned short gsindex;
18533+ unsigned short ss;
18534 #endif
18535 #ifdef CONFIG_X86_32
18536 unsigned long ip;
18537@@ -585,10 +598,10 @@ static inline void native_swapgs(void)
18538 #endif
18539 }
18540
18541-static inline unsigned long current_top_of_stack(void)
18542+static inline unsigned long current_top_of_stack(unsigned int cpu)
18543 {
18544 #ifdef CONFIG_X86_64
18545- return this_cpu_read_stable(cpu_tss.x86_tss.sp0);
18546+ return cpu_tss[cpu].x86_tss.sp0;
18547 #else
18548 /* sp0 on x86_32 is special in and around vm86 mode. */
18549 return this_cpu_read_stable(cpu_current_top_of_stack);
18550@@ -837,8 +850,15 @@ static inline void spin_lock_prefetch(const void *x)
18551 */
18552 #define TASK_SIZE PAGE_OFFSET
18553 #define TASK_SIZE_MAX TASK_SIZE
18554+
18555+#ifdef CONFIG_PAX_SEGMEXEC
18556+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18557+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18558+#else
18559 #define STACK_TOP TASK_SIZE
18560-#define STACK_TOP_MAX STACK_TOP
18561+#endif
18562+
18563+#define STACK_TOP_MAX TASK_SIZE
18564
18565 #define INIT_THREAD { \
18566 .sp0 = TOP_OF_INIT_STACK, \
18567@@ -859,12 +879,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18568 * "struct pt_regs" is possible, but they may contain the
18569 * completely wrong values.
18570 */
18571-#define task_pt_regs(task) \
18572-({ \
18573- unsigned long __ptr = (unsigned long)task_stack_page(task); \
18574- __ptr += THREAD_SIZE - TOP_OF_KERNEL_STACK_PADDING; \
18575- ((struct pt_regs *)__ptr) - 1; \
18576-})
18577+#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1)
18578
18579 #define KSTK_ESP(task) (task_pt_regs(task)->sp)
18580
18581@@ -878,13 +893,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18582 * particular problem by preventing anything from being mapped
18583 * at the maximum canonical address.
18584 */
18585-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18586+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18587
18588 /* This decides where the kernel will search for a free chunk of vm
18589 * space during mmap's.
18590 */
18591 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18592- 0xc0000000 : 0xFFFFe000)
18593+ 0xc0000000 : 0xFFFFf000)
18594
18595 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18596 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18597@@ -918,6 +933,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18598 */
18599 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18600
18601+#ifdef CONFIG_PAX_SEGMEXEC
18602+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18603+#endif
18604+
18605 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18606
18607 /* Get/set a process' ability to use the timestamp counter instruction */
18608@@ -962,7 +981,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18609 return 0;
18610 }
18611
18612-extern unsigned long arch_align_stack(unsigned long sp);
18613+#define arch_align_stack(x) ((x) & ~0xfUL)
18614 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18615
18616 void default_idle(void);
18617@@ -972,6 +991,6 @@ bool xen_set_default_idle(void);
18618 #define xen_set_default_idle 0
18619 #endif
18620
18621-void stop_this_cpu(void *dummy);
18622+void stop_this_cpu(void *dummy) __noreturn;
18623 void df_debug(struct pt_regs *regs, long error_code);
18624 #endif /* _ASM_X86_PROCESSOR_H */
18625diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18626index 5fabf13..7388158 100644
18627--- a/arch/x86/include/asm/ptrace.h
18628+++ b/arch/x86/include/asm/ptrace.h
18629@@ -125,15 +125,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18630 #ifdef CONFIG_X86_64
18631 static inline bool user_64bit_mode(struct pt_regs *regs)
18632 {
18633+ unsigned long cs = regs->cs & 0xffff;
18634 #ifndef CONFIG_PARAVIRT
18635 /*
18636 * On non-paravirt systems, this is the only long mode CPL 3
18637 * selector. We do not allow long mode selectors in the LDT.
18638 */
18639- return regs->cs == __USER_CS;
18640+ return cs == __USER_CS;
18641 #else
18642 /* Headers are too twisted for this to go in paravirt.h. */
18643- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18644+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18645 #endif
18646 }
18647
18648@@ -180,9 +181,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18649 * Traps from the kernel do not save sp and ss.
18650 * Use the helper function to retrieve sp.
18651 */
18652- if (offset == offsetof(struct pt_regs, sp) &&
18653- regs->cs == __KERNEL_CS)
18654- return kernel_stack_pointer(regs);
18655+ if (offset == offsetof(struct pt_regs, sp)) {
18656+ unsigned long cs = regs->cs & 0xffff;
18657+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18658+ return kernel_stack_pointer(regs);
18659+ }
18660 #endif
18661 return *(unsigned long *)((unsigned long)regs + offset);
18662 }
18663diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18664index ae0e241..e80b10b 100644
18665--- a/arch/x86/include/asm/qrwlock.h
18666+++ b/arch/x86/include/asm/qrwlock.h
18667@@ -7,8 +7,8 @@
18668 #define queue_write_unlock queue_write_unlock
18669 static inline void queue_write_unlock(struct qrwlock *lock)
18670 {
18671- barrier();
18672- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18673+ barrier();
18674+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18675 }
18676 #endif
18677
18678diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18679index 9c6b890..5305f53 100644
18680--- a/arch/x86/include/asm/realmode.h
18681+++ b/arch/x86/include/asm/realmode.h
18682@@ -22,16 +22,14 @@ struct real_mode_header {
18683 #endif
18684 /* APM/BIOS reboot */
18685 u32 machine_real_restart_asm;
18686-#ifdef CONFIG_X86_64
18687 u32 machine_real_restart_seg;
18688-#endif
18689 };
18690
18691 /* This must match data at trampoline_32/64.S */
18692 struct trampoline_header {
18693 #ifdef CONFIG_X86_32
18694 u32 start;
18695- u16 gdt_pad;
18696+ u16 boot_cs;
18697 u16 gdt_limit;
18698 u32 gdt_base;
18699 #else
18700diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18701index a82c4f1..ac45053 100644
18702--- a/arch/x86/include/asm/reboot.h
18703+++ b/arch/x86/include/asm/reboot.h
18704@@ -6,13 +6,13 @@
18705 struct pt_regs;
18706
18707 struct machine_ops {
18708- void (*restart)(char *cmd);
18709- void (*halt)(void);
18710- void (*power_off)(void);
18711+ void (* __noreturn restart)(char *cmd);
18712+ void (* __noreturn halt)(void);
18713+ void (* __noreturn power_off)(void);
18714 void (*shutdown)(void);
18715 void (*crash_shutdown)(struct pt_regs *);
18716- void (*emergency_restart)(void);
18717-};
18718+ void (* __noreturn emergency_restart)(void);
18719+} __no_const;
18720
18721 extern struct machine_ops machine_ops;
18722
18723diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18724index 8f7866a..e442f20 100644
18725--- a/arch/x86/include/asm/rmwcc.h
18726+++ b/arch/x86/include/asm/rmwcc.h
18727@@ -3,7 +3,34 @@
18728
18729 #ifdef CC_HAVE_ASM_GOTO
18730
18731-#define __GEN_RMWcc(fullop, var, cc, ...) \
18732+#ifdef CONFIG_PAX_REFCOUNT
18733+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18734+do { \
18735+ asm_volatile_goto (fullop \
18736+ ";jno 0f\n" \
18737+ fullantiop \
18738+ ";int $4\n0:\n" \
18739+ _ASM_EXTABLE(0b, 0b) \
18740+ ";j" cc " %l[cc_label]" \
18741+ : : "m" (var), ## __VA_ARGS__ \
18742+ : "memory" : cc_label); \
18743+ return 0; \
18744+cc_label: \
18745+ return 1; \
18746+} while (0)
18747+#else
18748+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18749+do { \
18750+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18751+ : : "m" (var), ## __VA_ARGS__ \
18752+ : "memory" : cc_label); \
18753+ return 0; \
18754+cc_label: \
18755+ return 1; \
18756+} while (0)
18757+#endif
18758+
18759+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18760 do { \
18761 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18762 : : "m" (var), ## __VA_ARGS__ \
18763@@ -13,15 +40,46 @@ cc_label: \
18764 return 1; \
18765 } while (0)
18766
18767-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18768- __GEN_RMWcc(op " " arg0, var, cc)
18769+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18770+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18771
18772-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18773- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18774+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18775+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18776+
18777+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18778+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18779+
18780+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18781+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18782
18783 #else /* !CC_HAVE_ASM_GOTO */
18784
18785-#define __GEN_RMWcc(fullop, var, cc, ...) \
18786+#ifdef CONFIG_PAX_REFCOUNT
18787+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18788+do { \
18789+ char c; \
18790+ asm volatile (fullop \
18791+ ";jno 0f\n" \
18792+ fullantiop \
18793+ ";int $4\n0:\n" \
18794+ _ASM_EXTABLE(0b, 0b) \
18795+ "; set" cc " %1" \
18796+ : "+m" (var), "=qm" (c) \
18797+ : __VA_ARGS__ : "memory"); \
18798+ return c != 0; \
18799+} while (0)
18800+#else
18801+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18802+do { \
18803+ char c; \
18804+ asm volatile (fullop "; set" cc " %1" \
18805+ : "+m" (var), "=qm" (c) \
18806+ : __VA_ARGS__ : "memory"); \
18807+ return c != 0; \
18808+} while (0)
18809+#endif
18810+
18811+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18812 do { \
18813 char c; \
18814 asm volatile (fullop "; set" cc " %1" \
18815@@ -30,11 +88,17 @@ do { \
18816 return c != 0; \
18817 } while (0)
18818
18819-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18820- __GEN_RMWcc(op " " arg0, var, cc)
18821+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18822+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18823+
18824+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18825+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18826+
18827+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18828+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18829
18830-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18831- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18832+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18833+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18834
18835 #endif /* CC_HAVE_ASM_GOTO */
18836
18837diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18838index cad82c9..2e5c5c1 100644
18839--- a/arch/x86/include/asm/rwsem.h
18840+++ b/arch/x86/include/asm/rwsem.h
18841@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18842 {
18843 asm volatile("# beginning down_read\n\t"
18844 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18845+
18846+#ifdef CONFIG_PAX_REFCOUNT
18847+ "jno 0f\n"
18848+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18849+ "int $4\n0:\n"
18850+ _ASM_EXTABLE(0b, 0b)
18851+#endif
18852+
18853 /* adds 0x00000001 */
18854 " jns 1f\n"
18855 " call call_rwsem_down_read_failed\n"
18856@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18857 "1:\n\t"
18858 " mov %1,%2\n\t"
18859 " add %3,%2\n\t"
18860+
18861+#ifdef CONFIG_PAX_REFCOUNT
18862+ "jno 0f\n"
18863+ "sub %3,%2\n"
18864+ "int $4\n0:\n"
18865+ _ASM_EXTABLE(0b, 0b)
18866+#endif
18867+
18868 " jle 2f\n\t"
18869 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18870 " jnz 1b\n\t"
18871@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18872 long tmp;
18873 asm volatile("# beginning down_write\n\t"
18874 LOCK_PREFIX " xadd %1,(%2)\n\t"
18875+
18876+#ifdef CONFIG_PAX_REFCOUNT
18877+ "jno 0f\n"
18878+ "mov %1,(%2)\n"
18879+ "int $4\n0:\n"
18880+ _ASM_EXTABLE(0b, 0b)
18881+#endif
18882+
18883 /* adds 0xffff0001, returns the old value */
18884 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18885 /* was the active mask 0 before? */
18886@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18887 long tmp;
18888 asm volatile("# beginning __up_read\n\t"
18889 LOCK_PREFIX " xadd %1,(%2)\n\t"
18890+
18891+#ifdef CONFIG_PAX_REFCOUNT
18892+ "jno 0f\n"
18893+ "mov %1,(%2)\n"
18894+ "int $4\n0:\n"
18895+ _ASM_EXTABLE(0b, 0b)
18896+#endif
18897+
18898 /* subtracts 1, returns the old value */
18899 " jns 1f\n\t"
18900 " call call_rwsem_wake\n" /* expects old value in %edx */
18901@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18902 long tmp;
18903 asm volatile("# beginning __up_write\n\t"
18904 LOCK_PREFIX " xadd %1,(%2)\n\t"
18905+
18906+#ifdef CONFIG_PAX_REFCOUNT
18907+ "jno 0f\n"
18908+ "mov %1,(%2)\n"
18909+ "int $4\n0:\n"
18910+ _ASM_EXTABLE(0b, 0b)
18911+#endif
18912+
18913 /* subtracts 0xffff0001, returns the old value */
18914 " jns 1f\n\t"
18915 " call call_rwsem_wake\n" /* expects old value in %edx */
18916@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18917 {
18918 asm volatile("# beginning __downgrade_write\n\t"
18919 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18920+
18921+#ifdef CONFIG_PAX_REFCOUNT
18922+ "jno 0f\n"
18923+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18924+ "int $4\n0:\n"
18925+ _ASM_EXTABLE(0b, 0b)
18926+#endif
18927+
18928 /*
18929 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18930 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18931@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18932 */
18933 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18934 {
18935- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18936+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18937+
18938+#ifdef CONFIG_PAX_REFCOUNT
18939+ "jno 0f\n"
18940+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18941+ "int $4\n0:\n"
18942+ _ASM_EXTABLE(0b, 0b)
18943+#endif
18944+
18945 : "+m" (sem->count)
18946 : "er" (delta));
18947 }
18948@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18949 */
18950 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18951 {
18952- return delta + xadd(&sem->count, delta);
18953+ return delta + xadd_check_overflow(&sem->count, delta);
18954 }
18955
18956 #endif /* __KERNEL__ */
18957diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18958index 7d5a192..23ef1aa 100644
18959--- a/arch/x86/include/asm/segment.h
18960+++ b/arch/x86/include/asm/segment.h
18961@@ -82,14 +82,20 @@
18962 * 26 - ESPFIX small SS
18963 * 27 - per-cpu [ offset to per-cpu data area ]
18964 * 28 - stack_canary-20 [ for stack protector ] <=== cacheline #8
18965- * 29 - unused
18966- * 30 - unused
18967+ * 29 - PCI BIOS CS
18968+ * 30 - PCI BIOS DS
18969 * 31 - TSS for double fault handler
18970 */
18971+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18972+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18973+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18974+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18975+
18976 #define GDT_ENTRY_TLS_MIN 6
18977 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18978
18979 #define GDT_ENTRY_KERNEL_CS 12
18980+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 4
18981 #define GDT_ENTRY_KERNEL_DS 13
18982 #define GDT_ENTRY_DEFAULT_USER_CS 14
18983 #define GDT_ENTRY_DEFAULT_USER_DS 15
18984@@ -106,6 +112,12 @@
18985 #define GDT_ENTRY_PERCPU 27
18986 #define GDT_ENTRY_STACK_CANARY 28
18987
18988+#define GDT_ENTRY_PCIBIOS_CS 29
18989+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
18990+
18991+#define GDT_ENTRY_PCIBIOS_DS 30
18992+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
18993+
18994 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
18995
18996 /*
18997@@ -118,6 +130,7 @@
18998 */
18999
19000 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19001+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19002 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19003 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19004 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3)
19005@@ -129,7 +142,7 @@
19006 #define PNP_CS16 (GDT_ENTRY_PNPBIOS_CS16*8)
19007
19008 /* "Is this PNP code selector (PNP_CS32 or PNP_CS16)?" */
19009-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == PNP_CS32)
19010+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19011
19012 /* data segment for BIOS: */
19013 #define PNP_DS (GDT_ENTRY_PNPBIOS_DS*8)
19014@@ -176,6 +189,8 @@
19015 #define GDT_ENTRY_DEFAULT_USER_DS 5
19016 #define GDT_ENTRY_DEFAULT_USER_CS 6
19017
19018+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19019+
19020 /* Needs two entries */
19021 #define GDT_ENTRY_TSS 8
19022 /* Needs two entries */
19023@@ -187,10 +202,12 @@
19024 /* Abused to load per CPU data from limit */
19025 #define GDT_ENTRY_PER_CPU 15
19026
19027+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19028+
19029 /*
19030 * Number of entries in the GDT table:
19031 */
19032-#define GDT_ENTRIES 16
19033+#define GDT_ENTRIES 17
19034
19035 /*
19036 * Segment selector values corresponding to the above entries:
19037@@ -200,7 +217,9 @@
19038 */
19039 #define __KERNEL32_CS (GDT_ENTRY_KERNEL32_CS*8)
19040 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19041+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19042 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19043+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19044 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8 + 3)
19045 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19046 #define __USER32_DS __USER_DS
19047diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19048index ba665eb..0f72938 100644
19049--- a/arch/x86/include/asm/smap.h
19050+++ b/arch/x86/include/asm/smap.h
19051@@ -25,6 +25,18 @@
19052
19053 #include <asm/alternative-asm.h>
19054
19055+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19056+#define ASM_PAX_OPEN_USERLAND \
19057+ ALTERNATIVE "", "call __pax_open_userland", X86_FEATURE_STRONGUDEREF
19058+
19059+#define ASM_PAX_CLOSE_USERLAND \
19060+ ALTERNATIVE "", "call __pax_close_userland", X86_FEATURE_STRONGUDEREF
19061+
19062+#else
19063+#define ASM_PAX_OPEN_USERLAND
19064+#define ASM_PAX_CLOSE_USERLAND
19065+#endif
19066+
19067 #ifdef CONFIG_X86_SMAP
19068
19069 #define ASM_CLAC \
19070@@ -44,6 +56,37 @@
19071
19072 #include <asm/alternative.h>
19073
19074+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19075+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19076+
19077+extern void __pax_open_userland(void);
19078+static __always_inline unsigned long pax_open_userland(void)
19079+{
19080+
19081+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19082+ asm volatile(ALTERNATIVE("", "call %P[open]", X86_FEATURE_STRONGUDEREF)
19083+ :
19084+ : [open] "i" (__pax_open_userland)
19085+ : "memory", "rax");
19086+#endif
19087+
19088+ return 0;
19089+}
19090+
19091+extern void __pax_close_userland(void);
19092+static __always_inline unsigned long pax_close_userland(void)
19093+{
19094+
19095+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19096+ asm volatile(ALTERNATIVE("", "call %P[close]", X86_FEATURE_STRONGUDEREF)
19097+ :
19098+ : [close] "i" (__pax_close_userland)
19099+ : "memory", "rax");
19100+#endif
19101+
19102+ return 0;
19103+}
19104+
19105 #ifdef CONFIG_X86_SMAP
19106
19107 static __always_inline void clac(void)
19108diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19109index 17a8dce..79f7280 100644
19110--- a/arch/x86/include/asm/smp.h
19111+++ b/arch/x86/include/asm/smp.h
19112@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19113 /* cpus sharing the last level cache: */
19114 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19115 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19116-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19117+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19118
19119 static inline struct cpumask *cpu_sibling_mask(int cpu)
19120 {
19121@@ -78,7 +78,7 @@ struct smp_ops {
19122
19123 void (*send_call_func_ipi)(const struct cpumask *mask);
19124 void (*send_call_func_single_ipi)(int cpu);
19125-};
19126+} __no_const;
19127
19128 /* Globals due to paravirt */
19129 extern void set_cpu_sibling_map(int cpu);
19130@@ -192,14 +192,8 @@ extern unsigned disabled_cpus;
19131 extern int safe_smp_processor_id(void);
19132
19133 #elif defined(CONFIG_X86_64_SMP)
19134-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19135-
19136-#define stack_smp_processor_id() \
19137-({ \
19138- struct thread_info *ti; \
19139- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19140- ti->cpu; \
19141-})
19142+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19143+#define stack_smp_processor_id() raw_smp_processor_id()
19144 #define safe_smp_processor_id() smp_processor_id()
19145
19146 #endif
19147diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19148index 6a99859..03cb807 100644
19149--- a/arch/x86/include/asm/stackprotector.h
19150+++ b/arch/x86/include/asm/stackprotector.h
19151@@ -47,7 +47,7 @@
19152 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19153 */
19154 #define GDT_STACK_CANARY_INIT \
19155- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19156+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19157
19158 /*
19159 * Initialize the stackprotector canary value.
19160@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19161
19162 static inline void load_stack_canary_segment(void)
19163 {
19164-#ifdef CONFIG_X86_32
19165+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19166 asm volatile ("mov %0, %%gs" : : "r" (0));
19167 #endif
19168 }
19169diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19170index 70bbe39..4ae2bd4 100644
19171--- a/arch/x86/include/asm/stacktrace.h
19172+++ b/arch/x86/include/asm/stacktrace.h
19173@@ -11,28 +11,20 @@
19174
19175 extern int kstack_depth_to_print;
19176
19177-struct thread_info;
19178+struct task_struct;
19179 struct stacktrace_ops;
19180
19181-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19182- unsigned long *stack,
19183- unsigned long bp,
19184- const struct stacktrace_ops *ops,
19185- void *data,
19186- unsigned long *end,
19187- int *graph);
19188+typedef unsigned long walk_stack_t(struct task_struct *task,
19189+ void *stack_start,
19190+ unsigned long *stack,
19191+ unsigned long bp,
19192+ const struct stacktrace_ops *ops,
19193+ void *data,
19194+ unsigned long *end,
19195+ int *graph);
19196
19197-extern unsigned long
19198-print_context_stack(struct thread_info *tinfo,
19199- unsigned long *stack, unsigned long bp,
19200- const struct stacktrace_ops *ops, void *data,
19201- unsigned long *end, int *graph);
19202-
19203-extern unsigned long
19204-print_context_stack_bp(struct thread_info *tinfo,
19205- unsigned long *stack, unsigned long bp,
19206- const struct stacktrace_ops *ops, void *data,
19207- unsigned long *end, int *graph);
19208+extern walk_stack_t print_context_stack;
19209+extern walk_stack_t print_context_stack_bp;
19210
19211 /* Generic stack tracer with callbacks */
19212
19213@@ -40,7 +32,7 @@ struct stacktrace_ops {
19214 void (*address)(void *data, unsigned long address, int reliable);
19215 /* On negative return stop dumping */
19216 int (*stack)(void *data, char *name);
19217- walk_stack_t walk_stack;
19218+ walk_stack_t *walk_stack;
19219 };
19220
19221 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19222diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19223index 751bf4b..3cc39f1 100644
19224--- a/arch/x86/include/asm/switch_to.h
19225+++ b/arch/x86/include/asm/switch_to.h
19226@@ -79,12 +79,12 @@ do { \
19227 #else /* CONFIG_X86_32 */
19228
19229 /* frame pointer must be last for get_wchan */
19230-#define SAVE_CONTEXT "pushq %%rbp ; movq %%rsi,%%rbp\n\t"
19231-#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp\t"
19232+#define SAVE_CONTEXT "pushf ; pushq %%rbp ; movq %%rsi,%%rbp\n\t"
19233+#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp ; popf\t"
19234
19235 #define __EXTRA_CLOBBER \
19236 , "rcx", "rbx", "rdx", "r8", "r9", "r10", "r11", \
19237- "r12", "r13", "r14", "r15", "flags"
19238+ "r12", "r13", "r14", "r15"
19239
19240 #ifdef CONFIG_CC_STACKPROTECTOR
19241 #define __switch_canary \
19242@@ -100,11 +100,7 @@ do { \
19243 #define __switch_canary_iparam
19244 #endif /* CC_STACKPROTECTOR */
19245
19246-/*
19247- * There is no need to save or restore flags, because flags are always
19248- * clean in kernel mode, with the possible exception of IOPL. Kernel IOPL
19249- * has no effect.
19250- */
19251+/* Save restore flags to clear handle leaking NT */
19252 #define switch_to(prev, next, last) \
19253 asm volatile(SAVE_CONTEXT \
19254 "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */ \
19255@@ -112,7 +108,7 @@ do { \
19256 "call __switch_to\n\t" \
19257 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19258 __switch_canary \
19259- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19260+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19261 "movq %%rax,%%rdi\n\t" \
19262 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19263 "jnz ret_from_fork\n\t" \
19264@@ -123,7 +119,7 @@ do { \
19265 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19266 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19267 [_tif_fork] "i" (_TIF_FORK), \
19268- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19269+ [thread_info] "m" (current_tinfo), \
19270 [current_task] "m" (current_task) \
19271 __switch_canary_iparam \
19272 : "memory", "cc" __EXTRA_CLOBBER)
19273diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19274index b4bdec3..e8af9bc 100644
19275--- a/arch/x86/include/asm/thread_info.h
19276+++ b/arch/x86/include/asm/thread_info.h
19277@@ -36,7 +36,7 @@
19278 #ifdef CONFIG_X86_32
19279 # define TOP_OF_KERNEL_STACK_PADDING 8
19280 #else
19281-# define TOP_OF_KERNEL_STACK_PADDING 0
19282+# define TOP_OF_KERNEL_STACK_PADDING 16
19283 #endif
19284
19285 /*
19286@@ -50,27 +50,26 @@ struct task_struct;
19287 #include <linux/atomic.h>
19288
19289 struct thread_info {
19290- struct task_struct *task; /* main task structure */
19291 __u32 flags; /* low level flags */
19292 __u32 status; /* thread synchronous flags */
19293 __u32 cpu; /* current CPU */
19294 int saved_preempt_count;
19295 mm_segment_t addr_limit;
19296 void __user *sysenter_return;
19297+ unsigned long lowest_stack;
19298 unsigned int sig_on_uaccess_error:1;
19299 unsigned int uaccess_err:1; /* uaccess failed */
19300 };
19301
19302-#define INIT_THREAD_INFO(tsk) \
19303+#define INIT_THREAD_INFO \
19304 { \
19305- .task = &tsk, \
19306 .flags = 0, \
19307 .cpu = 0, \
19308 .saved_preempt_count = INIT_PREEMPT_COUNT, \
19309 .addr_limit = KERNEL_DS, \
19310 }
19311
19312-#define init_thread_info (init_thread_union.thread_info)
19313+#define init_thread_info (init_thread_union.stack)
19314 #define init_stack (init_thread_union.stack)
19315
19316 #else /* !__ASSEMBLY__ */
19317@@ -110,6 +109,7 @@ struct thread_info {
19318 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19319 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19320 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19321+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19322
19323 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19324 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19325@@ -133,17 +133,18 @@ struct thread_info {
19326 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19327 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19328 #define _TIF_X32 (1 << TIF_X32)
19329+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19330
19331 /* work to do in syscall_trace_enter() */
19332 #define _TIF_WORK_SYSCALL_ENTRY \
19333 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19334 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19335- _TIF_NOHZ)
19336+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19337
19338 /* work to do in syscall_trace_leave() */
19339 #define _TIF_WORK_SYSCALL_EXIT \
19340 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19341- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19342+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19343
19344 /* work to do on interrupt/exception return */
19345 #define _TIF_WORK_MASK \
19346@@ -154,7 +155,7 @@ struct thread_info {
19347 /* work to do on any return to user space */
19348 #define _TIF_ALLWORK_MASK \
19349 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19350- _TIF_NOHZ)
19351+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19352
19353 /* Only used for 64 bit */
19354 #define _TIF_DO_NOTIFY_MASK \
19355@@ -179,9 +180,11 @@ struct thread_info {
19356
19357 DECLARE_PER_CPU(unsigned long, kernel_stack);
19358
19359+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19360+
19361 static inline struct thread_info *current_thread_info(void)
19362 {
19363- return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
19364+ return this_cpu_read_stable(current_tinfo);
19365 }
19366
19367 static inline unsigned long current_stack_pointer(void)
19368@@ -199,8 +202,7 @@ static inline unsigned long current_stack_pointer(void)
19369
19370 /* Load thread_info address into "reg" */
19371 #define GET_THREAD_INFO(reg) \
19372- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19373- _ASM_SUB $(THREAD_SIZE),reg ;
19374+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19375
19376 /*
19377 * ASM operand which evaluates to a 'thread_info' address of
19378@@ -293,5 +295,12 @@ static inline bool is_ia32_task(void)
19379 extern void arch_task_cache_init(void);
19380 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19381 extern void arch_release_task_struct(struct task_struct *tsk);
19382+
19383+#define __HAVE_THREAD_FUNCTIONS
19384+#define task_thread_info(task) (&(task)->tinfo)
19385+#define task_stack_page(task) ((task)->stack)
19386+#define setup_thread_stack(p, org) do {} while (0)
19387+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19388+
19389 #endif
19390 #endif /* _ASM_X86_THREAD_INFO_H */
19391diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19392index cd79194..6a9956f 100644
19393--- a/arch/x86/include/asm/tlbflush.h
19394+++ b/arch/x86/include/asm/tlbflush.h
19395@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19396
19397 static inline void __native_flush_tlb(void)
19398 {
19399+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19400+ u64 descriptor[2];
19401+
19402+ descriptor[0] = PCID_KERNEL;
19403+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19404+ return;
19405+ }
19406+
19407+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19408+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19409+ unsigned int cpu = raw_get_cpu();
19410+
19411+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19412+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19413+ raw_put_cpu_no_resched();
19414+ return;
19415+ }
19416+#endif
19417+
19418 native_write_cr3(native_read_cr3());
19419 }
19420
19421 static inline void __native_flush_tlb_global_irq_disabled(void)
19422 {
19423- unsigned long cr4;
19424+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19425+ u64 descriptor[2];
19426
19427- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19428- /* clear PGE */
19429- native_write_cr4(cr4 & ~X86_CR4_PGE);
19430- /* write old PGE again and flush TLBs */
19431- native_write_cr4(cr4);
19432+ descriptor[0] = PCID_KERNEL;
19433+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19434+ } else {
19435+ unsigned long cr4;
19436+
19437+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19438+ /* clear PGE */
19439+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19440+ /* write old PGE again and flush TLBs */
19441+ native_write_cr4(cr4);
19442+ }
19443 }
19444
19445 static inline void __native_flush_tlb_global(void)
19446@@ -118,6 +144,43 @@ static inline void __native_flush_tlb_global(void)
19447
19448 static inline void __native_flush_tlb_single(unsigned long addr)
19449 {
19450+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19451+ u64 descriptor[2];
19452+
19453+ descriptor[0] = PCID_KERNEL;
19454+ descriptor[1] = addr;
19455+
19456+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19457+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19458+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19459+ if (addr < TASK_SIZE_MAX)
19460+ descriptor[1] += pax_user_shadow_base;
19461+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19462+ }
19463+
19464+ descriptor[0] = PCID_USER;
19465+ descriptor[1] = addr;
19466+ }
19467+#endif
19468+
19469+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19470+ return;
19471+ }
19472+
19473+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19474+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19475+ unsigned int cpu = raw_get_cpu();
19476+
19477+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19478+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19479+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19480+ raw_put_cpu_no_resched();
19481+
19482+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19483+ addr += pax_user_shadow_base;
19484+ }
19485+#endif
19486+
19487 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19488 }
19489
19490diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19491index ace9dec..3f9e253 100644
19492--- a/arch/x86/include/asm/uaccess.h
19493+++ b/arch/x86/include/asm/uaccess.h
19494@@ -7,6 +7,7 @@
19495 #include <linux/compiler.h>
19496 #include <linux/thread_info.h>
19497 #include <linux/string.h>
19498+#include <linux/spinlock.h>
19499 #include <asm/asm.h>
19500 #include <asm/page.h>
19501 #include <asm/smap.h>
19502@@ -29,7 +30,12 @@
19503
19504 #define get_ds() (KERNEL_DS)
19505 #define get_fs() (current_thread_info()->addr_limit)
19506+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19507+void __set_fs(mm_segment_t x);
19508+void set_fs(mm_segment_t x);
19509+#else
19510 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19511+#endif
19512
19513 #define segment_eq(a, b) ((a).seg == (b).seg)
19514
19515@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19516 * checks that the pointer is in the user space range - after calling
19517 * this function, memory access functions may still return -EFAULT.
19518 */
19519-#define access_ok(type, addr, size) \
19520- likely(!__range_not_ok(addr, size, user_addr_max()))
19521+extern int _cond_resched(void);
19522+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19523+#define access_ok(type, addr, size) \
19524+({ \
19525+ unsigned long __size = size; \
19526+ unsigned long __addr = (unsigned long)addr; \
19527+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19528+ if (__ret_ao && __size) { \
19529+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19530+ unsigned long __end_ao = __addr + __size - 1; \
19531+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19532+ while (__addr_ao <= __end_ao) { \
19533+ char __c_ao; \
19534+ __addr_ao += PAGE_SIZE; \
19535+ if (__size > PAGE_SIZE) \
19536+ _cond_resched(); \
19537+ if (__get_user(__c_ao, (char __user *)__addr)) \
19538+ break; \
19539+ if (type != VERIFY_WRITE) { \
19540+ __addr = __addr_ao; \
19541+ continue; \
19542+ } \
19543+ if (__put_user(__c_ao, (char __user *)__addr)) \
19544+ break; \
19545+ __addr = __addr_ao; \
19546+ } \
19547+ } \
19548+ } \
19549+ __ret_ao; \
19550+})
19551
19552 /*
19553 * The exception table consists of pairs of addresses relative to the
19554@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19555 extern int __get_user_bad(void);
19556
19557 /*
19558- * This is a type: either unsigned long, if the argument fits into
19559- * that type, or otherwise unsigned long long.
19560+ * This is a type: either (un)signed int, if the argument fits into
19561+ * that type, or otherwise (un)signed long long.
19562 */
19563 #define __inttype(x) \
19564-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19565+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19566+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19567+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19568
19569 /**
19570 * get_user: - Get a simple variable from user space.
19571@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19572 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19573 __chk_user_ptr(ptr); \
19574 might_fault(); \
19575+ pax_open_userland(); \
19576 asm volatile("call __get_user_%P3" \
19577 : "=a" (__ret_gu), "=r" (__val_gu) \
19578 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19579 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19580+ pax_close_userland(); \
19581 __ret_gu; \
19582 })
19583
19584@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19585 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19586 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19587
19588-
19589+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19590+#define __copyuser_seg "gs;"
19591+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19592+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19593+#else
19594+#define __copyuser_seg
19595+#define __COPYUSER_SET_ES
19596+#define __COPYUSER_RESTORE_ES
19597+#endif
19598
19599 #ifdef CONFIG_X86_32
19600 #define __put_user_asm_u64(x, addr, err, errret) \
19601 asm volatile(ASM_STAC "\n" \
19602- "1: movl %%eax,0(%2)\n" \
19603- "2: movl %%edx,4(%2)\n" \
19604+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19605+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19606 "3: " ASM_CLAC "\n" \
19607 ".section .fixup,\"ax\"\n" \
19608 "4: movl %3,%0\n" \
19609@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19610
19611 #define __put_user_asm_ex_u64(x, addr) \
19612 asm volatile(ASM_STAC "\n" \
19613- "1: movl %%eax,0(%1)\n" \
19614- "2: movl %%edx,4(%1)\n" \
19615+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19616+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19617 "3: " ASM_CLAC "\n" \
19618 _ASM_EXTABLE_EX(1b, 2b) \
19619 _ASM_EXTABLE_EX(2b, 3b) \
19620@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19621 __typeof__(*(ptr)) __pu_val; \
19622 __chk_user_ptr(ptr); \
19623 might_fault(); \
19624- __pu_val = x; \
19625+ __pu_val = (x); \
19626+ pax_open_userland(); \
19627 switch (sizeof(*(ptr))) { \
19628 case 1: \
19629 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19630@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19631 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19632 break; \
19633 } \
19634+ pax_close_userland(); \
19635 __ret_pu; \
19636 })
19637
19638@@ -355,8 +403,10 @@ do { \
19639 } while (0)
19640
19641 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19642+do { \
19643+ pax_open_userland(); \
19644 asm volatile(ASM_STAC "\n" \
19645- "1: mov"itype" %2,%"rtype"1\n" \
19646+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19647 "2: " ASM_CLAC "\n" \
19648 ".section .fixup,\"ax\"\n" \
19649 "3: mov %3,%0\n" \
19650@@ -364,8 +414,10 @@ do { \
19651 " jmp 2b\n" \
19652 ".previous\n" \
19653 _ASM_EXTABLE(1b, 3b) \
19654- : "=r" (err), ltype(x) \
19655- : "m" (__m(addr)), "i" (errret), "0" (err))
19656+ : "=r" (err), ltype (x) \
19657+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19658+ pax_close_userland(); \
19659+} while (0)
19660
19661 #define __get_user_size_ex(x, ptr, size) \
19662 do { \
19663@@ -389,7 +441,7 @@ do { \
19664 } while (0)
19665
19666 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19667- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19668+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19669 "2:\n" \
19670 _ASM_EXTABLE_EX(1b, 2b) \
19671 : ltype(x) : "m" (__m(addr)))
19672@@ -406,13 +458,24 @@ do { \
19673 int __gu_err; \
19674 unsigned long __gu_val; \
19675 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19676- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19677+ (x) = (__typeof__(*(ptr)))__gu_val; \
19678 __gu_err; \
19679 })
19680
19681 /* FIXME: this hack is definitely wrong -AK */
19682 struct __large_struct { unsigned long buf[100]; };
19683-#define __m(x) (*(struct __large_struct __user *)(x))
19684+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19685+#define ____m(x) \
19686+({ \
19687+ unsigned long ____x = (unsigned long)(x); \
19688+ if (____x < pax_user_shadow_base) \
19689+ ____x += pax_user_shadow_base; \
19690+ (typeof(x))____x; \
19691+})
19692+#else
19693+#define ____m(x) (x)
19694+#endif
19695+#define __m(x) (*(struct __large_struct __user *)____m(x))
19696
19697 /*
19698 * Tell gcc we read from memory instead of writing: this is because
19699@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19700 * aliasing issues.
19701 */
19702 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19703+do { \
19704+ pax_open_userland(); \
19705 asm volatile(ASM_STAC "\n" \
19706- "1: mov"itype" %"rtype"1,%2\n" \
19707+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19708 "2: " ASM_CLAC "\n" \
19709 ".section .fixup,\"ax\"\n" \
19710 "3: mov %3,%0\n" \
19711@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19712 ".previous\n" \
19713 _ASM_EXTABLE(1b, 3b) \
19714 : "=r"(err) \
19715- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19716+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19717+ pax_close_userland(); \
19718+} while (0)
19719
19720 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19721- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19722+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19723 "2:\n" \
19724 _ASM_EXTABLE_EX(1b, 2b) \
19725 : : ltype(x), "m" (__m(addr)))
19726@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19727 */
19728 #define uaccess_try do { \
19729 current_thread_info()->uaccess_err = 0; \
19730+ pax_open_userland(); \
19731 stac(); \
19732 barrier();
19733
19734 #define uaccess_catch(err) \
19735 clac(); \
19736+ pax_close_userland(); \
19737 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19738 } while (0)
19739
19740@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19741 * On error, the variable @x is set to zero.
19742 */
19743
19744+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19745+#define __get_user(x, ptr) get_user((x), (ptr))
19746+#else
19747 #define __get_user(x, ptr) \
19748 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19749+#endif
19750
19751 /**
19752 * __put_user: - Write a simple value into user space, with less checking.
19753@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19754 * Returns zero on success, or -EFAULT on error.
19755 */
19756
19757+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19758+#define __put_user(x, ptr) put_user((x), (ptr))
19759+#else
19760 #define __put_user(x, ptr) \
19761 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19762+#endif
19763
19764 #define __get_user_unaligned __get_user
19765 #define __put_user_unaligned __put_user
19766@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19767 #define get_user_ex(x, ptr) do { \
19768 unsigned long __gue_val; \
19769 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19770- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19771+ (x) = (__typeof__(*(ptr)))__gue_val; \
19772 } while (0)
19773
19774 #define put_user_try uaccess_try
19775@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19776 extern __must_check long strnlen_user(const char __user *str, long n);
19777
19778 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19779-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19780+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19781
19782 extern void __cmpxchg_wrong_size(void)
19783 __compiletime_error("Bad argument size for cmpxchg");
19784@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19785 __typeof__(ptr) __uval = (uval); \
19786 __typeof__(*(ptr)) __old = (old); \
19787 __typeof__(*(ptr)) __new = (new); \
19788+ pax_open_userland(); \
19789 switch (size) { \
19790 case 1: \
19791 { \
19792 asm volatile("\t" ASM_STAC "\n" \
19793- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19794+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19795 "2:\t" ASM_CLAC "\n" \
19796 "\t.section .fixup, \"ax\"\n" \
19797 "3:\tmov %3, %0\n" \
19798 "\tjmp 2b\n" \
19799 "\t.previous\n" \
19800 _ASM_EXTABLE(1b, 3b) \
19801- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19802+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19803 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19804 : "memory" \
19805 ); \
19806@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19807 case 2: \
19808 { \
19809 asm volatile("\t" ASM_STAC "\n" \
19810- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19811+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19812 "2:\t" ASM_CLAC "\n" \
19813 "\t.section .fixup, \"ax\"\n" \
19814 "3:\tmov %3, %0\n" \
19815 "\tjmp 2b\n" \
19816 "\t.previous\n" \
19817 _ASM_EXTABLE(1b, 3b) \
19818- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19819+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19820 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19821 : "memory" \
19822 ); \
19823@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19824 case 4: \
19825 { \
19826 asm volatile("\t" ASM_STAC "\n" \
19827- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19828+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19829 "2:\t" ASM_CLAC "\n" \
19830 "\t.section .fixup, \"ax\"\n" \
19831 "3:\tmov %3, %0\n" \
19832 "\tjmp 2b\n" \
19833 "\t.previous\n" \
19834 _ASM_EXTABLE(1b, 3b) \
19835- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19836+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19837 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19838 : "memory" \
19839 ); \
19840@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19841 __cmpxchg_wrong_size(); \
19842 \
19843 asm volatile("\t" ASM_STAC "\n" \
19844- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19845+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19846 "2:\t" ASM_CLAC "\n" \
19847 "\t.section .fixup, \"ax\"\n" \
19848 "3:\tmov %3, %0\n" \
19849 "\tjmp 2b\n" \
19850 "\t.previous\n" \
19851 _ASM_EXTABLE(1b, 3b) \
19852- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19853+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19854 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19855 : "memory" \
19856 ); \
19857@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19858 default: \
19859 __cmpxchg_wrong_size(); \
19860 } \
19861+ pax_close_userland(); \
19862 *__uval = __old; \
19863 __ret; \
19864 })
19865@@ -636,17 +715,6 @@ extern struct movsl_mask {
19866
19867 #define ARCH_HAS_NOCACHE_UACCESS 1
19868
19869-#ifdef CONFIG_X86_32
19870-# include <asm/uaccess_32.h>
19871-#else
19872-# include <asm/uaccess_64.h>
19873-#endif
19874-
19875-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19876- unsigned n);
19877-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19878- unsigned n);
19879-
19880 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19881 # define copy_user_diag __compiletime_error
19882 #else
19883@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19884 extern void copy_user_diag("copy_from_user() buffer size is too small")
19885 copy_from_user_overflow(void);
19886 extern void copy_user_diag("copy_to_user() buffer size is too small")
19887-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19888+copy_to_user_overflow(void);
19889
19890 #undef copy_user_diag
19891
19892@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19893
19894 extern void
19895 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19896-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19897+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19898 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19899
19900 #else
19901@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19902
19903 #endif
19904
19905+#ifdef CONFIG_X86_32
19906+# include <asm/uaccess_32.h>
19907+#else
19908+# include <asm/uaccess_64.h>
19909+#endif
19910+
19911 static inline unsigned long __must_check
19912 copy_from_user(void *to, const void __user *from, unsigned long n)
19913 {
19914- int sz = __compiletime_object_size(to);
19915+ size_t sz = __compiletime_object_size(to);
19916
19917 might_fault();
19918
19919@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19920 * case, and do only runtime checking for non-constant sizes.
19921 */
19922
19923- if (likely(sz < 0 || sz >= n))
19924- n = _copy_from_user(to, from, n);
19925- else if(__builtin_constant_p(n))
19926- copy_from_user_overflow();
19927- else
19928- __copy_from_user_overflow(sz, n);
19929+ if (likely(sz != (size_t)-1 && sz < n)) {
19930+ if(__builtin_constant_p(n))
19931+ copy_from_user_overflow();
19932+ else
19933+ __copy_from_user_overflow(sz, n);
19934+ } else if (access_ok(VERIFY_READ, from, n))
19935+ n = __copy_from_user(to, from, n);
19936+ else if ((long)n > 0)
19937+ memset(to, 0, n);
19938
19939 return n;
19940 }
19941@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19942 static inline unsigned long __must_check
19943 copy_to_user(void __user *to, const void *from, unsigned long n)
19944 {
19945- int sz = __compiletime_object_size(from);
19946+ size_t sz = __compiletime_object_size(from);
19947
19948 might_fault();
19949
19950 /* See the comment in copy_from_user() above. */
19951- if (likely(sz < 0 || sz >= n))
19952- n = _copy_to_user(to, from, n);
19953- else if(__builtin_constant_p(n))
19954- copy_to_user_overflow();
19955- else
19956- __copy_to_user_overflow(sz, n);
19957+ if (likely(sz != (size_t)-1 && sz < n)) {
19958+ if(__builtin_constant_p(n))
19959+ copy_to_user_overflow();
19960+ else
19961+ __copy_to_user_overflow(sz, n);
19962+ } else if (access_ok(VERIFY_WRITE, to, n))
19963+ n = __copy_to_user(to, from, n);
19964
19965 return n;
19966 }
19967diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19968index 3c03a5d..edb68ae 100644
19969--- a/arch/x86/include/asm/uaccess_32.h
19970+++ b/arch/x86/include/asm/uaccess_32.h
19971@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19972 * anything, so this is accurate.
19973 */
19974
19975-static __always_inline unsigned long __must_check
19976+static __always_inline __size_overflow(3) unsigned long __must_check
19977 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19978 {
19979+ if ((long)n < 0)
19980+ return n;
19981+
19982+ check_object_size(from, n, true);
19983+
19984 if (__builtin_constant_p(n)) {
19985 unsigned long ret;
19986
19987@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
19988 __copy_to_user(void __user *to, const void *from, unsigned long n)
19989 {
19990 might_fault();
19991+
19992 return __copy_to_user_inatomic(to, from, n);
19993 }
19994
19995-static __always_inline unsigned long
19996+static __always_inline __size_overflow(3) unsigned long
19997 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
19998 {
19999+ if ((long)n < 0)
20000+ return n;
20001+
20002 /* Avoid zeroing the tail if the copy fails..
20003 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20004 * but as the zeroing behaviour is only significant when n is not
20005@@ -137,6 +146,12 @@ static __always_inline unsigned long
20006 __copy_from_user(void *to, const void __user *from, unsigned long n)
20007 {
20008 might_fault();
20009+
20010+ if ((long)n < 0)
20011+ return n;
20012+
20013+ check_object_size(to, n, false);
20014+
20015 if (__builtin_constant_p(n)) {
20016 unsigned long ret;
20017
20018@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20019 const void __user *from, unsigned long n)
20020 {
20021 might_fault();
20022+
20023+ if ((long)n < 0)
20024+ return n;
20025+
20026 if (__builtin_constant_p(n)) {
20027 unsigned long ret;
20028
20029@@ -181,7 +200,10 @@ static __always_inline unsigned long
20030 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20031 unsigned long n)
20032 {
20033- return __copy_from_user_ll_nocache_nozero(to, from, n);
20034+ if ((long)n < 0)
20035+ return n;
20036+
20037+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20038 }
20039
20040 #endif /* _ASM_X86_UACCESS_32_H */
20041diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20042index f2f9b39..2ae1bf8 100644
20043--- a/arch/x86/include/asm/uaccess_64.h
20044+++ b/arch/x86/include/asm/uaccess_64.h
20045@@ -10,6 +10,9 @@
20046 #include <asm/alternative.h>
20047 #include <asm/cpufeature.h>
20048 #include <asm/page.h>
20049+#include <asm/pgtable.h>
20050+
20051+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20052
20053 /*
20054 * Copy To/From Userspace
20055@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20056 __must_check unsigned long
20057 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20058
20059-static __always_inline __must_check unsigned long
20060-copy_user_generic(void *to, const void *from, unsigned len)
20061+static __always_inline __must_check __size_overflow(3) unsigned long
20062+copy_user_generic(void *to, const void *from, unsigned long len)
20063 {
20064 unsigned ret;
20065
20066@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20067 }
20068
20069 __must_check unsigned long
20070-copy_in_user(void __user *to, const void __user *from, unsigned len);
20071+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20072
20073 static __always_inline __must_check
20074-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20075+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20076 {
20077- int ret = 0;
20078+ size_t sz = __compiletime_object_size(dst);
20079+ unsigned ret = 0;
20080+
20081+ if (size > INT_MAX)
20082+ return size;
20083+
20084+ check_object_size(dst, size, false);
20085+
20086+#ifdef CONFIG_PAX_MEMORY_UDEREF
20087+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20088+ return size;
20089+#endif
20090+
20091+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20092+ if(__builtin_constant_p(size))
20093+ copy_from_user_overflow();
20094+ else
20095+ __copy_from_user_overflow(sz, size);
20096+ return size;
20097+ }
20098
20099 if (!__builtin_constant_p(size))
20100- return copy_user_generic(dst, (__force void *)src, size);
20101+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20102 switch (size) {
20103- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20104+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20105 ret, "b", "b", "=q", 1);
20106 return ret;
20107- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20108+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20109 ret, "w", "w", "=r", 2);
20110 return ret;
20111- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20112+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20113 ret, "l", "k", "=r", 4);
20114 return ret;
20115- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20116+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20117 ret, "q", "", "=r", 8);
20118 return ret;
20119 case 10:
20120- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20121+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20122 ret, "q", "", "=r", 10);
20123 if (unlikely(ret))
20124 return ret;
20125 __get_user_asm(*(u16 *)(8 + (char *)dst),
20126- (u16 __user *)(8 + (char __user *)src),
20127+ (const u16 __user *)(8 + (const char __user *)src),
20128 ret, "w", "w", "=r", 2);
20129 return ret;
20130 case 16:
20131- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20132+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20133 ret, "q", "", "=r", 16);
20134 if (unlikely(ret))
20135 return ret;
20136 __get_user_asm(*(u64 *)(8 + (char *)dst),
20137- (u64 __user *)(8 + (char __user *)src),
20138+ (const u64 __user *)(8 + (const char __user *)src),
20139 ret, "q", "", "=r", 8);
20140 return ret;
20141 default:
20142- return copy_user_generic(dst, (__force void *)src, size);
20143+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20144 }
20145 }
20146
20147 static __always_inline __must_check
20148-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20149+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20150 {
20151 might_fault();
20152 return __copy_from_user_nocheck(dst, src, size);
20153 }
20154
20155 static __always_inline __must_check
20156-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20157+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20158 {
20159- int ret = 0;
20160+ size_t sz = __compiletime_object_size(src);
20161+ unsigned ret = 0;
20162+
20163+ if (size > INT_MAX)
20164+ return size;
20165+
20166+ check_object_size(src, size, true);
20167+
20168+#ifdef CONFIG_PAX_MEMORY_UDEREF
20169+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20170+ return size;
20171+#endif
20172+
20173+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20174+ if(__builtin_constant_p(size))
20175+ copy_to_user_overflow();
20176+ else
20177+ __copy_to_user_overflow(sz, size);
20178+ return size;
20179+ }
20180
20181 if (!__builtin_constant_p(size))
20182- return copy_user_generic((__force void *)dst, src, size);
20183+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20184 switch (size) {
20185- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20186+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20187 ret, "b", "b", "iq", 1);
20188 return ret;
20189- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20190+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20191 ret, "w", "w", "ir", 2);
20192 return ret;
20193- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20194+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20195 ret, "l", "k", "ir", 4);
20196 return ret;
20197- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20198+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20199 ret, "q", "", "er", 8);
20200 return ret;
20201 case 10:
20202- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20203+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20204 ret, "q", "", "er", 10);
20205 if (unlikely(ret))
20206 return ret;
20207 asm("":::"memory");
20208- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20209+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20210 ret, "w", "w", "ir", 2);
20211 return ret;
20212 case 16:
20213- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20214+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20215 ret, "q", "", "er", 16);
20216 if (unlikely(ret))
20217 return ret;
20218 asm("":::"memory");
20219- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20220+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20221 ret, "q", "", "er", 8);
20222 return ret;
20223 default:
20224- return copy_user_generic((__force void *)dst, src, size);
20225+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20226 }
20227 }
20228
20229 static __always_inline __must_check
20230-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20231+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20232 {
20233 might_fault();
20234 return __copy_to_user_nocheck(dst, src, size);
20235 }
20236
20237 static __always_inline __must_check
20238-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20239+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20240 {
20241- int ret = 0;
20242+ unsigned ret = 0;
20243
20244 might_fault();
20245+
20246+ if (size > INT_MAX)
20247+ return size;
20248+
20249+#ifdef CONFIG_PAX_MEMORY_UDEREF
20250+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20251+ return size;
20252+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20253+ return size;
20254+#endif
20255+
20256 if (!__builtin_constant_p(size))
20257- return copy_user_generic((__force void *)dst,
20258- (__force void *)src, size);
20259+ return copy_user_generic((__force_kernel void *)____m(dst),
20260+ (__force_kernel const void *)____m(src), size);
20261 switch (size) {
20262 case 1: {
20263 u8 tmp;
20264- __get_user_asm(tmp, (u8 __user *)src,
20265+ __get_user_asm(tmp, (const u8 __user *)src,
20266 ret, "b", "b", "=q", 1);
20267 if (likely(!ret))
20268 __put_user_asm(tmp, (u8 __user *)dst,
20269@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20270 }
20271 case 2: {
20272 u16 tmp;
20273- __get_user_asm(tmp, (u16 __user *)src,
20274+ __get_user_asm(tmp, (const u16 __user *)src,
20275 ret, "w", "w", "=r", 2);
20276 if (likely(!ret))
20277 __put_user_asm(tmp, (u16 __user *)dst,
20278@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20279
20280 case 4: {
20281 u32 tmp;
20282- __get_user_asm(tmp, (u32 __user *)src,
20283+ __get_user_asm(tmp, (const u32 __user *)src,
20284 ret, "l", "k", "=r", 4);
20285 if (likely(!ret))
20286 __put_user_asm(tmp, (u32 __user *)dst,
20287@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20288 }
20289 case 8: {
20290 u64 tmp;
20291- __get_user_asm(tmp, (u64 __user *)src,
20292+ __get_user_asm(tmp, (const u64 __user *)src,
20293 ret, "q", "", "=r", 8);
20294 if (likely(!ret))
20295 __put_user_asm(tmp, (u64 __user *)dst,
20296@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20297 return ret;
20298 }
20299 default:
20300- return copy_user_generic((__force void *)dst,
20301- (__force void *)src, size);
20302+ return copy_user_generic((__force_kernel void *)____m(dst),
20303+ (__force_kernel const void *)____m(src), size);
20304 }
20305 }
20306
20307-static __must_check __always_inline int
20308-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20309+static __must_check __always_inline unsigned long
20310+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20311 {
20312 return __copy_from_user_nocheck(dst, src, size);
20313 }
20314
20315-static __must_check __always_inline int
20316-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20317+static __must_check __always_inline unsigned long
20318+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20319 {
20320 return __copy_to_user_nocheck(dst, src, size);
20321 }
20322
20323-extern long __copy_user_nocache(void *dst, const void __user *src,
20324- unsigned size, int zerorest);
20325+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20326+ unsigned long size, int zerorest);
20327
20328-static inline int
20329-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20330+static inline unsigned long
20331+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20332 {
20333 might_fault();
20334+
20335+ if (size > INT_MAX)
20336+ return size;
20337+
20338+#ifdef CONFIG_PAX_MEMORY_UDEREF
20339+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20340+ return size;
20341+#endif
20342+
20343 return __copy_user_nocache(dst, src, size, 1);
20344 }
20345
20346-static inline int
20347+static inline unsigned long
20348 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20349- unsigned size)
20350+ unsigned long size)
20351 {
20352+ if (size > INT_MAX)
20353+ return size;
20354+
20355+#ifdef CONFIG_PAX_MEMORY_UDEREF
20356+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20357+ return size;
20358+#endif
20359+
20360 return __copy_user_nocache(dst, src, size, 0);
20361 }
20362
20363 unsigned long
20364-copy_user_handle_tail(char *to, char *from, unsigned len);
20365+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20366
20367 #endif /* _ASM_X86_UACCESS_64_H */
20368diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20369index 5b238981..77fdd78 100644
20370--- a/arch/x86/include/asm/word-at-a-time.h
20371+++ b/arch/x86/include/asm/word-at-a-time.h
20372@@ -11,7 +11,7 @@
20373 * and shift, for example.
20374 */
20375 struct word_at_a_time {
20376- const unsigned long one_bits, high_bits;
20377+ unsigned long one_bits, high_bits;
20378 };
20379
20380 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20381diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20382index f58a9c7..dc378042a 100644
20383--- a/arch/x86/include/asm/x86_init.h
20384+++ b/arch/x86/include/asm/x86_init.h
20385@@ -129,7 +129,7 @@ struct x86_init_ops {
20386 struct x86_init_timers timers;
20387 struct x86_init_iommu iommu;
20388 struct x86_init_pci pci;
20389-};
20390+} __no_const;
20391
20392 /**
20393 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20394@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20395 void (*setup_percpu_clockev)(void);
20396 void (*early_percpu_clock_init)(void);
20397 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20398-};
20399+} __no_const;
20400
20401 struct timespec;
20402
20403@@ -168,7 +168,7 @@ struct x86_platform_ops {
20404 void (*save_sched_clock_state)(void);
20405 void (*restore_sched_clock_state)(void);
20406 void (*apic_post_init)(void);
20407-};
20408+} __no_const;
20409
20410 struct pci_dev;
20411 struct msi_msg;
20412@@ -182,7 +182,7 @@ struct x86_msi_ops {
20413 void (*teardown_msi_irqs)(struct pci_dev *dev);
20414 void (*restore_msi_irqs)(struct pci_dev *dev);
20415 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20416-};
20417+} __no_const;
20418
20419 struct IO_APIC_route_entry;
20420 struct io_apic_irq_attr;
20421@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20422 unsigned int destination, int vector,
20423 struct io_apic_irq_attr *attr);
20424 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20425-};
20426+} __no_const;
20427
20428 extern struct x86_init_ops x86_init;
20429 extern struct x86_cpuinit_ops x86_cpuinit;
20430diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20431index c44a5d5..7f83cfc 100644
20432--- a/arch/x86/include/asm/xen/page.h
20433+++ b/arch/x86/include/asm/xen/page.h
20434@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20435 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20436 * cases needing an extended handling.
20437 */
20438-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20439+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20440 {
20441 unsigned long mfn;
20442
20443diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20444index c9a6d68..cb57f42 100644
20445--- a/arch/x86/include/asm/xsave.h
20446+++ b/arch/x86/include/asm/xsave.h
20447@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20448 if (unlikely(err))
20449 return -EFAULT;
20450
20451+ pax_open_userland();
20452 __asm__ __volatile__(ASM_STAC "\n"
20453- "1:"XSAVE"\n"
20454+ "1:"
20455+ __copyuser_seg
20456+ XSAVE"\n"
20457 "2: " ASM_CLAC "\n"
20458 xstate_fault
20459 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20460 : "memory");
20461+ pax_close_userland();
20462 return err;
20463 }
20464
20465@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20466 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20467 {
20468 int err = 0;
20469- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20470+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20471 u32 lmask = mask;
20472 u32 hmask = mask >> 32;
20473
20474+ pax_open_userland();
20475 __asm__ __volatile__(ASM_STAC "\n"
20476- "1:"XRSTOR"\n"
20477+ "1:"
20478+ __copyuser_seg
20479+ XRSTOR"\n"
20480 "2: " ASM_CLAC "\n"
20481 xstate_fault
20482 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20483 : "memory"); /* memory required? */
20484+ pax_close_userland();
20485 return err;
20486 }
20487
20488diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20489index 960a8a9..404daf7 100644
20490--- a/arch/x86/include/uapi/asm/e820.h
20491+++ b/arch/x86/include/uapi/asm/e820.h
20492@@ -68,7 +68,7 @@ struct e820map {
20493 #define ISA_START_ADDRESS 0xa0000
20494 #define ISA_END_ADDRESS 0x100000
20495
20496-#define BIOS_BEGIN 0x000a0000
20497+#define BIOS_BEGIN 0x000c0000
20498 #define BIOS_END 0x00100000
20499
20500 #define BIOS_ROM_BASE 0xffe00000
20501diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20502index 9bcd0b5..750f1b7 100644
20503--- a/arch/x86/kernel/Makefile
20504+++ b/arch/x86/kernel/Makefile
20505@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20506 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20507 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20508 obj-y += probe_roms.o
20509-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20510+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20511 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20512 obj-$(CONFIG_X86_64) += mcount_64.o
20513 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20514diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20515index dbe76a1..e2ec334 100644
20516--- a/arch/x86/kernel/acpi/boot.c
20517+++ b/arch/x86/kernel/acpi/boot.c
20518@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20519 * If your system is blacklisted here, but you find that acpi=force
20520 * works for you, please contact linux-acpi@vger.kernel.org
20521 */
20522-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20523+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20524 /*
20525 * Boxes that need ACPI disabled
20526 */
20527@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20528 };
20529
20530 /* second table for DMI checks that should run after early-quirks */
20531-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20532+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20533 /*
20534 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20535 * which includes some code which overrides all temperature
20536diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20537index d1daead..acd77e2 100644
20538--- a/arch/x86/kernel/acpi/sleep.c
20539+++ b/arch/x86/kernel/acpi/sleep.c
20540@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20541 #else /* CONFIG_64BIT */
20542 #ifdef CONFIG_SMP
20543 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20544+
20545+ pax_open_kernel();
20546 early_gdt_descr.address =
20547 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20548+ pax_close_kernel();
20549+
20550 initial_gs = per_cpu_offset(smp_processor_id());
20551 #endif
20552 initial_code = (unsigned long)wakeup_long64;
20553diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20554index 665c6b7..eae4d56 100644
20555--- a/arch/x86/kernel/acpi/wakeup_32.S
20556+++ b/arch/x86/kernel/acpi/wakeup_32.S
20557@@ -29,13 +29,11 @@ wakeup_pmode_return:
20558 # and restore the stack ... but you need gdt for this to work
20559 movl saved_context_esp, %esp
20560
20561- movl %cs:saved_magic, %eax
20562- cmpl $0x12345678, %eax
20563+ cmpl $0x12345678, saved_magic
20564 jne bogus_magic
20565
20566 # jump to place where we left off
20567- movl saved_eip, %eax
20568- jmp *%eax
20569+ jmp *(saved_eip)
20570
20571 bogus_magic:
20572 jmp bogus_magic
20573diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20574index aef6531..d7ca83a 100644
20575--- a/arch/x86/kernel/alternative.c
20576+++ b/arch/x86/kernel/alternative.c
20577@@ -248,7 +248,9 @@ static void __init_or_module add_nops(void *insns, unsigned int len)
20578 unsigned int noplen = len;
20579 if (noplen > ASM_NOP_MAX)
20580 noplen = ASM_NOP_MAX;
20581+ pax_open_kernel();
20582 memcpy(insns, ideal_nops[noplen], noplen);
20583+ pax_close_kernel();
20584 insns += noplen;
20585 len -= noplen;
20586 }
20587@@ -276,6 +278,13 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf)
20588 if (a->replacementlen != 5)
20589 return;
20590
20591+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20592+ if (orig_insn < (u8 *)_text || (u8 *)_einittext <= orig_insn)
20593+ orig_insn = ktva_ktla(orig_insn);
20594+ else
20595+ orig_insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20596+#endif
20597+
20598 o_dspl = *(s32 *)(insnbuf + 1);
20599
20600 /* next_rip of the replacement JMP */
20601@@ -346,6 +355,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20602 {
20603 struct alt_instr *a;
20604 u8 *instr, *replacement;
20605+ u8 *vinstr, *vreplacement;
20606 u8 insnbuf[MAX_PATCH_LEN];
20607
20608 DPRINTK("alt table %p -> %p", start, end);
20609@@ -361,46 +371,71 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20610 for (a = start; a < end; a++) {
20611 int insnbuf_sz = 0;
20612
20613- instr = (u8 *)&a->instr_offset + a->instr_offset;
20614- replacement = (u8 *)&a->repl_offset + a->repl_offset;
20615+ vinstr = instr = (u8 *)&a->instr_offset + a->instr_offset;
20616+
20617+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20618+ if ((u8 *)_text - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR) <= instr &&
20619+ instr < (u8 *)_einittext - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR)) {
20620+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20621+ vinstr = ktla_ktva(instr);
20622+ } else if ((u8 *)_text <= instr && instr < (u8 *)_einittext) {
20623+ vinstr = ktla_ktva(instr);
20624+ } else {
20625+ instr = ktva_ktla(instr);
20626+ }
20627+#endif
20628+
20629+ vreplacement = replacement = (u8 *)&a->repl_offset + a->repl_offset;
20630+
20631+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20632+ if ((u8 *)_text - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR) <= replacement &&
20633+ replacement < (u8 *)_einittext - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR)) {
20634+ replacement += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20635+ vreplacement = ktla_ktva(replacement);
20636+ } else if ((u8 *)_text <= replacement && replacement < (u8 *)_einittext) {
20637+ vreplacement = ktla_ktva(replacement);
20638+ } else
20639+ replacement = ktva_ktla(replacement);
20640+#endif
20641+
20642 BUG_ON(a->instrlen > sizeof(insnbuf));
20643 BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
20644 if (!boot_cpu_has(a->cpuid)) {
20645 if (a->padlen > 1)
20646- optimize_nops(a, instr);
20647+ optimize_nops(a, vinstr);
20648
20649 continue;
20650 }
20651
20652- DPRINTK("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d), pad: %d",
20653+ DPRINTK("feat: %d*32+%d, old: (%p/%p, len: %d), repl: (%p, len: %d), pad: %d",
20654 a->cpuid >> 5,
20655 a->cpuid & 0x1f,
20656- instr, a->instrlen,
20657- replacement, a->replacementlen, a->padlen);
20658+ instr, vinstr, a->instrlen,
20659+ vreplacement, a->replacementlen, a->padlen);
20660
20661- DUMP_BYTES(instr, a->instrlen, "%p: old_insn: ", instr);
20662- DUMP_BYTES(replacement, a->replacementlen, "%p: rpl_insn: ", replacement);
20663+ DUMP_BYTES(vinstr, a->instrlen, "%p: old_insn: ", vinstr);
20664+ DUMP_BYTES(vreplacement, a->replacementlen, "%p: rpl_insn: ", vreplacement);
20665
20666- memcpy(insnbuf, replacement, a->replacementlen);
20667+ memcpy(insnbuf, vreplacement, a->replacementlen);
20668 insnbuf_sz = a->replacementlen;
20669
20670 /* 0xe8 is a relative jump; fix the offset. */
20671 if (*insnbuf == 0xe8 && a->replacementlen == 5) {
20672- *(s32 *)(insnbuf + 1) += replacement - instr;
20673+ *(s32 *)(insnbuf + 1) += vreplacement - vinstr;
20674 DPRINTK("Fix CALL offset: 0x%x, CALL 0x%lx",
20675 *(s32 *)(insnbuf + 1),
20676- (unsigned long)instr + *(s32 *)(insnbuf + 1) + 5);
20677+ (unsigned long)vinstr + *(s32 *)(insnbuf + 1) + 5);
20678 }
20679
20680- if (a->replacementlen && is_jmp(replacement[0]))
20681- recompute_jump(a, instr, replacement, insnbuf);
20682+ if (a->replacementlen && is_jmp(vreplacement[0]))
20683+ recompute_jump(a, instr, vreplacement, insnbuf);
20684
20685 if (a->instrlen > a->replacementlen) {
20686 add_nops(insnbuf + a->replacementlen,
20687 a->instrlen - a->replacementlen);
20688 insnbuf_sz += a->instrlen - a->replacementlen;
20689 }
20690- DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr);
20691+ DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", vinstr);
20692
20693 text_poke_early(instr, insnbuf, insnbuf_sz);
20694 }
20695@@ -416,10 +451,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20696 for (poff = start; poff < end; poff++) {
20697 u8 *ptr = (u8 *)poff + *poff;
20698
20699+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20700+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20701+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20702+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20703+#endif
20704+
20705 if (!*poff || ptr < text || ptr >= text_end)
20706 continue;
20707 /* turn DS segment override prefix into lock prefix */
20708- if (*ptr == 0x3e)
20709+ if (*ktla_ktva(ptr) == 0x3e)
20710 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20711 }
20712 mutex_unlock(&text_mutex);
20713@@ -434,10 +475,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20714 for (poff = start; poff < end; poff++) {
20715 u8 *ptr = (u8 *)poff + *poff;
20716
20717+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20718+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20719+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20720+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20721+#endif
20722+
20723 if (!*poff || ptr < text || ptr >= text_end)
20724 continue;
20725 /* turn lock prefix into DS segment override prefix */
20726- if (*ptr == 0xf0)
20727+ if (*ktla_ktva(ptr) == 0xf0)
20728 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20729 }
20730 mutex_unlock(&text_mutex);
20731@@ -574,7 +621,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20732
20733 BUG_ON(p->len > MAX_PATCH_LEN);
20734 /* prep the buffer with the original instructions */
20735- memcpy(insnbuf, p->instr, p->len);
20736+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20737 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20738 (unsigned long)p->instr, p->len);
20739
20740@@ -621,7 +668,7 @@ void __init alternative_instructions(void)
20741 if (!uniproc_patched || num_possible_cpus() == 1)
20742 free_init_pages("SMP alternatives",
20743 (unsigned long)__smp_locks,
20744- (unsigned long)__smp_locks_end);
20745+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20746 #endif
20747
20748 apply_paravirt(__parainstructions, __parainstructions_end);
20749@@ -641,13 +688,17 @@ void __init alternative_instructions(void)
20750 * instructions. And on the local CPU you need to be protected again NMI or MCE
20751 * handlers seeing an inconsistent instruction while you patch.
20752 */
20753-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20754+void *__kprobes text_poke_early(void *addr, const void *opcode,
20755 size_t len)
20756 {
20757 unsigned long flags;
20758 local_irq_save(flags);
20759- memcpy(addr, opcode, len);
20760+
20761+ pax_open_kernel();
20762+ memcpy(ktla_ktva(addr), opcode, len);
20763 sync_core();
20764+ pax_close_kernel();
20765+
20766 local_irq_restore(flags);
20767 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20768 that causes hangs on some VIA CPUs. */
20769@@ -669,36 +720,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20770 */
20771 void *text_poke(void *addr, const void *opcode, size_t len)
20772 {
20773- unsigned long flags;
20774- char *vaddr;
20775+ unsigned char *vaddr = ktla_ktva(addr);
20776 struct page *pages[2];
20777- int i;
20778+ size_t i;
20779
20780 if (!core_kernel_text((unsigned long)addr)) {
20781- pages[0] = vmalloc_to_page(addr);
20782- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20783+ pages[0] = vmalloc_to_page(vaddr);
20784+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20785 } else {
20786- pages[0] = virt_to_page(addr);
20787+ pages[0] = virt_to_page(vaddr);
20788 WARN_ON(!PageReserved(pages[0]));
20789- pages[1] = virt_to_page(addr + PAGE_SIZE);
20790+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20791 }
20792 BUG_ON(!pages[0]);
20793- local_irq_save(flags);
20794- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20795- if (pages[1])
20796- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20797- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20798- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20799- clear_fixmap(FIX_TEXT_POKE0);
20800- if (pages[1])
20801- clear_fixmap(FIX_TEXT_POKE1);
20802- local_flush_tlb();
20803- sync_core();
20804- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20805- that causes hangs on some VIA CPUs. */
20806+ text_poke_early(addr, opcode, len);
20807 for (i = 0; i < len; i++)
20808- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20809- local_irq_restore(flags);
20810+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20811 return addr;
20812 }
20813
20814@@ -752,7 +789,7 @@ int poke_int3_handler(struct pt_regs *regs)
20815 */
20816 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20817 {
20818- unsigned char int3 = 0xcc;
20819+ const unsigned char int3 = 0xcc;
20820
20821 bp_int3_handler = handler;
20822 bp_int3_addr = (u8 *)addr + sizeof(int3);
20823diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20824index cde732c..6365ac2 100644
20825--- a/arch/x86/kernel/apic/apic.c
20826+++ b/arch/x86/kernel/apic/apic.c
20827@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20828 /*
20829 * Debug level, exported for io_apic.c
20830 */
20831-unsigned int apic_verbosity;
20832+int apic_verbosity;
20833
20834 int pic_mode;
20835
20836@@ -1857,7 +1857,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20837 apic_write(APIC_ESR, 0);
20838 v = apic_read(APIC_ESR);
20839 ack_APIC_irq();
20840- atomic_inc(&irq_err_count);
20841+ atomic_inc_unchecked(&irq_err_count);
20842
20843 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20844 smp_processor_id(), v);
20845diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20846index de918c4..32eed23 100644
20847--- a/arch/x86/kernel/apic/apic_flat_64.c
20848+++ b/arch/x86/kernel/apic/apic_flat_64.c
20849@@ -154,7 +154,7 @@ static int flat_probe(void)
20850 return 1;
20851 }
20852
20853-static struct apic apic_flat = {
20854+static struct apic apic_flat __read_only = {
20855 .name = "flat",
20856 .probe = flat_probe,
20857 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20858@@ -260,7 +260,7 @@ static int physflat_probe(void)
20859 return 0;
20860 }
20861
20862-static struct apic apic_physflat = {
20863+static struct apic apic_physflat __read_only = {
20864
20865 .name = "physical flat",
20866 .probe = physflat_probe,
20867diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20868index b205cdb..d8503ff 100644
20869--- a/arch/x86/kernel/apic/apic_noop.c
20870+++ b/arch/x86/kernel/apic/apic_noop.c
20871@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20872 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20873 }
20874
20875-struct apic apic_noop = {
20876+struct apic apic_noop __read_only = {
20877 .name = "noop",
20878 .probe = noop_probe,
20879 .acpi_madt_oem_check = NULL,
20880diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20881index c4a8d63..fe893ac 100644
20882--- a/arch/x86/kernel/apic/bigsmp_32.c
20883+++ b/arch/x86/kernel/apic/bigsmp_32.c
20884@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20885 return dmi_bigsmp;
20886 }
20887
20888-static struct apic apic_bigsmp = {
20889+static struct apic apic_bigsmp __read_only = {
20890
20891 .name = "bigsmp",
20892 .probe = probe_bigsmp,
20893diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20894index f4dc246..fbab133 100644
20895--- a/arch/x86/kernel/apic/io_apic.c
20896+++ b/arch/x86/kernel/apic/io_apic.c
20897@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20898 return ret;
20899 }
20900
20901-atomic_t irq_mis_count;
20902+atomic_unchecked_t irq_mis_count;
20903
20904 #ifdef CONFIG_GENERIC_PENDING_IRQ
20905 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20906@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20907 * at the cpu.
20908 */
20909 if (!(v & (1 << (i & 0x1f)))) {
20910- atomic_inc(&irq_mis_count);
20911+ atomic_inc_unchecked(&irq_mis_count);
20912
20913 eoi_ioapic_irq(irq, cfg);
20914 }
20915@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20916 ioapic_irqd_unmask(data, cfg, masked);
20917 }
20918
20919-static struct irq_chip ioapic_chip __read_mostly = {
20920+static struct irq_chip ioapic_chip = {
20921 .name = "IO-APIC",
20922 .irq_startup = startup_ioapic_irq,
20923 .irq_mask = mask_ioapic_irq,
20924@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20925 ack_APIC_irq();
20926 }
20927
20928-static struct irq_chip lapic_chip __read_mostly = {
20929+static struct irq_chip lapic_chip = {
20930 .name = "local-APIC",
20931 .irq_mask = mask_lapic_irq,
20932 .irq_unmask = unmask_lapic_irq,
20933diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20934index bda4886..f9c7195 100644
20935--- a/arch/x86/kernel/apic/probe_32.c
20936+++ b/arch/x86/kernel/apic/probe_32.c
20937@@ -72,7 +72,7 @@ static int probe_default(void)
20938 return 1;
20939 }
20940
20941-static struct apic apic_default = {
20942+static struct apic apic_default __read_only = {
20943
20944 .name = "default",
20945 .probe = probe_default,
20946diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20947index 6cedd79..023ff8e 100644
20948--- a/arch/x86/kernel/apic/vector.c
20949+++ b/arch/x86/kernel/apic/vector.c
20950@@ -21,7 +21,7 @@
20951
20952 static DEFINE_RAW_SPINLOCK(vector_lock);
20953
20954-void lock_vector_lock(void)
20955+void lock_vector_lock(void) __acquires(vector_lock)
20956 {
20957 /* Used to the online set of cpus does not change
20958 * during assign_irq_vector.
20959@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20960 raw_spin_lock(&vector_lock);
20961 }
20962
20963-void unlock_vector_lock(void)
20964+void unlock_vector_lock(void) __releases(vector_lock)
20965 {
20966 raw_spin_unlock(&vector_lock);
20967 }
20968diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20969index ab3219b..e8033eb 100644
20970--- a/arch/x86/kernel/apic/x2apic_cluster.c
20971+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20972@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20973 return notifier_from_errno(err);
20974 }
20975
20976-static struct notifier_block __refdata x2apic_cpu_notifier = {
20977+static struct notifier_block x2apic_cpu_notifier = {
20978 .notifier_call = update_clusterinfo,
20979 };
20980
20981@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20982 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20983 }
20984
20985-static struct apic apic_x2apic_cluster = {
20986+static struct apic apic_x2apic_cluster __read_only = {
20987
20988 .name = "cluster x2apic",
20989 .probe = x2apic_cluster_probe,
20990diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20991index 6fae733..5ca17af 100644
20992--- a/arch/x86/kernel/apic/x2apic_phys.c
20993+++ b/arch/x86/kernel/apic/x2apic_phys.c
20994@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20995 return apic == &apic_x2apic_phys;
20996 }
20997
20998-static struct apic apic_x2apic_phys = {
20999+static struct apic apic_x2apic_phys __read_only = {
21000
21001 .name = "physical x2apic",
21002 .probe = x2apic_phys_probe,
21003diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
21004index c8d9295..9af2d03 100644
21005--- a/arch/x86/kernel/apic/x2apic_uv_x.c
21006+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
21007@@ -375,7 +375,7 @@ static int uv_probe(void)
21008 return apic == &apic_x2apic_uv_x;
21009 }
21010
21011-static struct apic __refdata apic_x2apic_uv_x = {
21012+static struct apic apic_x2apic_uv_x __read_only = {
21013
21014 .name = "UV large system",
21015 .probe = uv_probe,
21016diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
21017index 927ec92..de68f32 100644
21018--- a/arch/x86/kernel/apm_32.c
21019+++ b/arch/x86/kernel/apm_32.c
21020@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
21021 * This is for buggy BIOS's that refer to (real mode) segment 0x40
21022 * even though they are called in protected mode.
21023 */
21024-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21025+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21026 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21027
21028 static const char driver_version[] = "1.16ac"; /* no spaces */
21029@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21030 BUG_ON(cpu != 0);
21031 gdt = get_cpu_gdt_table(cpu);
21032 save_desc_40 = gdt[0x40 / 8];
21033+
21034+ pax_open_kernel();
21035 gdt[0x40 / 8] = bad_bios_desc;
21036+ pax_close_kernel();
21037
21038 apm_irq_save(flags);
21039 APM_DO_SAVE_SEGS;
21040@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21041 &call->esi);
21042 APM_DO_RESTORE_SEGS;
21043 apm_irq_restore(flags);
21044+
21045+ pax_open_kernel();
21046 gdt[0x40 / 8] = save_desc_40;
21047+ pax_close_kernel();
21048+
21049 put_cpu();
21050
21051 return call->eax & 0xff;
21052@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21053 BUG_ON(cpu != 0);
21054 gdt = get_cpu_gdt_table(cpu);
21055 save_desc_40 = gdt[0x40 / 8];
21056+
21057+ pax_open_kernel();
21058 gdt[0x40 / 8] = bad_bios_desc;
21059+ pax_close_kernel();
21060
21061 apm_irq_save(flags);
21062 APM_DO_SAVE_SEGS;
21063@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21064 &call->eax);
21065 APM_DO_RESTORE_SEGS;
21066 apm_irq_restore(flags);
21067+
21068+ pax_open_kernel();
21069 gdt[0x40 / 8] = save_desc_40;
21070+ pax_close_kernel();
21071+
21072 put_cpu();
21073 return error;
21074 }
21075@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21076 return 0;
21077 }
21078
21079-static struct dmi_system_id __initdata apm_dmi_table[] = {
21080+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21081 {
21082 print_if_true,
21083 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21084@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21085 * code to that CPU.
21086 */
21087 gdt = get_cpu_gdt_table(0);
21088+
21089+ pax_open_kernel();
21090 set_desc_base(&gdt[APM_CS >> 3],
21091 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21092 set_desc_base(&gdt[APM_CS_16 >> 3],
21093 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21094 set_desc_base(&gdt[APM_DS >> 3],
21095 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21096+ pax_close_kernel();
21097
21098 proc_create("apm", 0, NULL, &apm_file_ops);
21099
21100diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21101index 9f6b934..cf5ffb3 100644
21102--- a/arch/x86/kernel/asm-offsets.c
21103+++ b/arch/x86/kernel/asm-offsets.c
21104@@ -32,6 +32,8 @@ void common(void) {
21105 OFFSET(TI_flags, thread_info, flags);
21106 OFFSET(TI_status, thread_info, status);
21107 OFFSET(TI_addr_limit, thread_info, addr_limit);
21108+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21109+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21110
21111 BLANK();
21112 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21113@@ -52,8 +54,26 @@ void common(void) {
21114 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21115 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21116 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21117+
21118+#ifdef CONFIG_PAX_KERNEXEC
21119+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21120 #endif
21121
21122+#ifdef CONFIG_PAX_MEMORY_UDEREF
21123+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21124+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21125+#ifdef CONFIG_X86_64
21126+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21127+#endif
21128+#endif
21129+
21130+#endif
21131+
21132+ BLANK();
21133+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21134+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21135+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21136+
21137 #ifdef CONFIG_XEN
21138 BLANK();
21139 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21140diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21141index 5ce6f2d..9e738f3 100644
21142--- a/arch/x86/kernel/asm-offsets_64.c
21143+++ b/arch/x86/kernel/asm-offsets_64.c
21144@@ -80,6 +80,7 @@ int main(void)
21145 BLANK();
21146 #undef ENTRY
21147
21148+ DEFINE(TSS_size, sizeof(struct tss_struct));
21149 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21150 OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
21151 BLANK();
21152diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21153index 9bff687..5b899fb 100644
21154--- a/arch/x86/kernel/cpu/Makefile
21155+++ b/arch/x86/kernel/cpu/Makefile
21156@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21157 CFLAGS_REMOVE_perf_event.o = -pg
21158 endif
21159
21160-# Make sure load_percpu_segment has no stackprotector
21161-nostackp := $(call cc-option, -fno-stack-protector)
21162-CFLAGS_common.o := $(nostackp)
21163-
21164 obj-y := intel_cacheinfo.o scattered.o topology.o
21165 obj-y += common.o
21166 obj-y += rdrand.o
21167diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21168index e4cf633..941f450 100644
21169--- a/arch/x86/kernel/cpu/amd.c
21170+++ b/arch/x86/kernel/cpu/amd.c
21171@@ -729,7 +729,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21172 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21173 {
21174 /* AMD errata T13 (order #21922) */
21175- if ((c->x86 == 6)) {
21176+ if (c->x86 == 6) {
21177 /* Duron Rev A0 */
21178 if (c->x86_model == 3 && c->x86_mask == 0)
21179 size = 64;
21180diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21181index a62cf04..a55415c 100644
21182--- a/arch/x86/kernel/cpu/common.c
21183+++ b/arch/x86/kernel/cpu/common.c
21184@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21185
21186 static const struct cpu_dev *this_cpu = &default_cpu;
21187
21188-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21189-#ifdef CONFIG_X86_64
21190- /*
21191- * We need valid kernel segments for data and code in long mode too
21192- * IRET will check the segment types kkeil 2000/10/28
21193- * Also sysret mandates a special GDT layout
21194- *
21195- * TLS descriptors are currently at a different place compared to i386.
21196- * Hopefully nobody expects them at a fixed place (Wine?)
21197- */
21198- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21199- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21200- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21201- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21202- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21203- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21204-#else
21205- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21206- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21207- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21208- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21209- /*
21210- * Segments used for calling PnP BIOS have byte granularity.
21211- * They code segments and data segments have fixed 64k limits,
21212- * the transfer segment sizes are set at run time.
21213- */
21214- /* 32-bit code */
21215- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21216- /* 16-bit code */
21217- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21218- /* 16-bit data */
21219- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21220- /* 16-bit data */
21221- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21222- /* 16-bit data */
21223- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21224- /*
21225- * The APM segments have byte granularity and their bases
21226- * are set at run time. All have 64k limits.
21227- */
21228- /* 32-bit code */
21229- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21230- /* 16-bit code */
21231- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21232- /* data */
21233- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21234-
21235- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21236- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21237- GDT_STACK_CANARY_INIT
21238-#endif
21239-} };
21240-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21241-
21242 static int __init x86_xsave_setup(char *s)
21243 {
21244 if (strlen(s))
21245@@ -306,6 +252,109 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21246 }
21247 }
21248
21249+#ifdef CONFIG_PAX_MEMORY_UDEREF
21250+#ifdef CONFIG_X86_64
21251+static bool uderef_enabled __read_only = true;
21252+unsigned long pax_user_shadow_base __read_only;
21253+EXPORT_SYMBOL(pax_user_shadow_base);
21254+extern char pax_enter_kernel_user[];
21255+extern char pax_exit_kernel_user[];
21256+
21257+static int __init setup_pax_weakuderef(char *str)
21258+{
21259+ if (uderef_enabled)
21260+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21261+ return 1;
21262+}
21263+__setup("pax_weakuderef", setup_pax_weakuderef);
21264+#endif
21265+
21266+static int __init setup_pax_nouderef(char *str)
21267+{
21268+#ifdef CONFIG_X86_32
21269+ unsigned int cpu;
21270+ struct desc_struct *gdt;
21271+
21272+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
21273+ gdt = get_cpu_gdt_table(cpu);
21274+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
21275+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
21276+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
21277+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
21278+ }
21279+ loadsegment(ds, __KERNEL_DS);
21280+ loadsegment(es, __KERNEL_DS);
21281+ loadsegment(ss, __KERNEL_DS);
21282+#else
21283+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
21284+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
21285+ clone_pgd_mask = ~(pgdval_t)0UL;
21286+ pax_user_shadow_base = 0UL;
21287+ setup_clear_cpu_cap(X86_FEATURE_PCIDUDEREF);
21288+ uderef_enabled = false;
21289+#endif
21290+
21291+ return 0;
21292+}
21293+early_param("pax_nouderef", setup_pax_nouderef);
21294+#endif
21295+
21296+#ifdef CONFIG_X86_64
21297+static __init int setup_disable_pcid(char *arg)
21298+{
21299+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21300+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21301+
21302+#ifdef CONFIG_PAX_MEMORY_UDEREF
21303+ if (uderef_enabled)
21304+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21305+#endif
21306+
21307+ return 1;
21308+}
21309+__setup("nopcid", setup_disable_pcid);
21310+
21311+static void setup_pcid(struct cpuinfo_x86 *c)
21312+{
21313+ if (cpu_has(c, X86_FEATURE_PCID)) {
21314+ printk("PAX: PCID detected\n");
21315+ cr4_set_bits(X86_CR4_PCIDE);
21316+ } else
21317+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21318+
21319+ if (cpu_has(c, X86_FEATURE_INVPCID))
21320+ printk("PAX: INVPCID detected\n");
21321+
21322+#ifdef CONFIG_PAX_MEMORY_UDEREF
21323+ if (!uderef_enabled) {
21324+ printk("PAX: UDEREF disabled\n");
21325+ return;
21326+ }
21327+
21328+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21329+ pax_open_kernel();
21330+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21331+ pax_close_kernel();
21332+ printk("PAX: slow and weak UDEREF enabled\n");
21333+ return;
21334+ }
21335+
21336+ set_cpu_cap(c, X86_FEATURE_PCIDUDEREF);
21337+
21338+ pax_open_kernel();
21339+ clone_pgd_mask = ~(pgdval_t)0UL;
21340+ pax_close_kernel();
21341+ if (pax_user_shadow_base)
21342+ printk("PAX: weak UDEREF enabled\n");
21343+ else {
21344+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21345+ printk("PAX: strong UDEREF enabled\n");
21346+ }
21347+#endif
21348+
21349+}
21350+#endif
21351+
21352 /*
21353 * Some CPU features depend on higher CPUID levels, which may not always
21354 * be available due to CPUID level capping or broken virtualization
21355@@ -406,7 +455,7 @@ void switch_to_new_gdt(int cpu)
21356 {
21357 struct desc_ptr gdt_descr;
21358
21359- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21360+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21361 gdt_descr.size = GDT_SIZE - 1;
21362 load_gdt(&gdt_descr);
21363 /* Reload the per-cpu base */
21364@@ -935,6 +984,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21365 setup_smep(c);
21366 setup_smap(c);
21367
21368+#ifdef CONFIG_X86_32
21369+#ifdef CONFIG_PAX_PAGEEXEC
21370+ if (!(__supported_pte_mask & _PAGE_NX))
21371+ clear_cpu_cap(c, X86_FEATURE_PSE);
21372+#endif
21373+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21374+ clear_cpu_cap(c, X86_FEATURE_SEP);
21375+#endif
21376+#endif
21377+
21378+#ifdef CONFIG_X86_64
21379+ setup_pcid(c);
21380+#endif
21381+
21382 /*
21383 * The vendor-specific functions might have changed features.
21384 * Now we do "generic changes."
21385@@ -1009,7 +1072,7 @@ void enable_sep_cpu(void)
21386 int cpu;
21387
21388 cpu = get_cpu();
21389- tss = &per_cpu(cpu_tss, cpu);
21390+ tss = cpu_tss + cpu;
21391
21392 if (!boot_cpu_has(X86_FEATURE_SEP))
21393 goto out;
21394@@ -1155,14 +1218,16 @@ static __init int setup_disablecpuid(char *arg)
21395 }
21396 __setup("clearcpuid=", setup_disablecpuid);
21397
21398+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21399+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21400+
21401 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21402- (unsigned long)&init_thread_union + THREAD_SIZE;
21403+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21404 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21405
21406 #ifdef CONFIG_X86_64
21407-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21408-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21409- (unsigned long) debug_idt_table };
21410+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21411+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21412
21413 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21414 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21415@@ -1367,7 +1432,7 @@ void cpu_init(void)
21416 */
21417 load_ucode_ap();
21418
21419- t = &per_cpu(cpu_tss, cpu);
21420+ t = cpu_tss + cpu;
21421 oist = &per_cpu(orig_ist, cpu);
21422
21423 #ifdef CONFIG_NUMA
21424@@ -1399,7 +1464,6 @@ void cpu_init(void)
21425 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21426 barrier();
21427
21428- x86_configure_nx();
21429 x2apic_setup();
21430
21431 /*
21432@@ -1451,7 +1515,7 @@ void cpu_init(void)
21433 {
21434 int cpu = smp_processor_id();
21435 struct task_struct *curr = current;
21436- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
21437+ struct tss_struct *t = cpu_tss + cpu;
21438 struct thread_struct *thread = &curr->thread;
21439
21440 wait_for_master_cpu(cpu);
21441diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21442index edcb0e2..a138233 100644
21443--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21444+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21445@@ -519,25 +519,23 @@ cache_private_attrs_is_visible(struct kobject *kobj,
21446 return 0;
21447 }
21448
21449+static struct attribute *amd_l3_attrs[4];
21450+
21451 static struct attribute_group cache_private_group = {
21452 .is_visible = cache_private_attrs_is_visible,
21453+ .attrs = amd_l3_attrs,
21454 };
21455
21456 static void init_amd_l3_attrs(void)
21457 {
21458 int n = 1;
21459- static struct attribute **amd_l3_attrs;
21460-
21461- if (amd_l3_attrs) /* already initialized */
21462- return;
21463
21464 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21465 n += 2;
21466 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21467 n += 1;
21468
21469- amd_l3_attrs = kcalloc(n, sizeof(*amd_l3_attrs), GFP_KERNEL);
21470- if (!amd_l3_attrs)
21471+ if (n > 1 && amd_l3_attrs[0]) /* already initialized */
21472 return;
21473
21474 n = 0;
21475@@ -547,8 +545,6 @@ static void init_amd_l3_attrs(void)
21476 }
21477 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21478 amd_l3_attrs[n++] = &dev_attr_subcaches.attr;
21479-
21480- cache_private_group.attrs = amd_l3_attrs;
21481 }
21482
21483 const struct attribute_group *
21484@@ -559,7 +555,7 @@ cache_get_priv_group(struct cacheinfo *this_leaf)
21485 if (this_leaf->level < 3 || !nb)
21486 return NULL;
21487
21488- if (nb && nb->l3_cache.indices)
21489+ if (nb->l3_cache.indices)
21490 init_amd_l3_attrs();
21491
21492 return &cache_private_group;
21493diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21494index 20190bd..cadb2ab 100644
21495--- a/arch/x86/kernel/cpu/mcheck/mce.c
21496+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21497@@ -47,6 +47,7 @@
21498 #include <asm/tlbflush.h>
21499 #include <asm/mce.h>
21500 #include <asm/msr.h>
21501+#include <asm/local.h>
21502
21503 #include "mce-internal.h"
21504
21505@@ -256,7 +257,7 @@ static void print_mce(struct mce *m)
21506 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21507 m->cs, m->ip);
21508
21509- if (m->cs == __KERNEL_CS)
21510+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21511 print_symbol("{%s}", m->ip);
21512 pr_cont("\n");
21513 }
21514@@ -289,10 +290,10 @@ static void print_mce(struct mce *m)
21515
21516 #define PANIC_TIMEOUT 5 /* 5 seconds */
21517
21518-static atomic_t mce_panicked;
21519+static atomic_unchecked_t mce_panicked;
21520
21521 static int fake_panic;
21522-static atomic_t mce_fake_panicked;
21523+static atomic_unchecked_t mce_fake_panicked;
21524
21525 /* Panic in progress. Enable interrupts and wait for final IPI */
21526 static void wait_for_panic(void)
21527@@ -316,7 +317,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21528 /*
21529 * Make sure only one CPU runs in machine check panic
21530 */
21531- if (atomic_inc_return(&mce_panicked) > 1)
21532+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21533 wait_for_panic();
21534 barrier();
21535
21536@@ -324,7 +325,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21537 console_verbose();
21538 } else {
21539 /* Don't log too much for fake panic */
21540- if (atomic_inc_return(&mce_fake_panicked) > 1)
21541+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21542 return;
21543 }
21544 /* First print corrected ones that are still unlogged */
21545@@ -363,7 +364,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21546 if (!fake_panic) {
21547 if (panic_timeout == 0)
21548 panic_timeout = mca_cfg.panic_timeout;
21549- panic(msg);
21550+ panic("%s", msg);
21551 } else
21552 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21553 }
21554@@ -749,7 +750,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21555 * might have been modified by someone else.
21556 */
21557 rmb();
21558- if (atomic_read(&mce_panicked))
21559+ if (atomic_read_unchecked(&mce_panicked))
21560 wait_for_panic();
21561 if (!mca_cfg.monarch_timeout)
21562 goto out;
21563@@ -1679,7 +1680,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21564 }
21565
21566 /* Call the installed machine check handler for this CPU setup. */
21567-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21568+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21569 unexpected_machine_check;
21570
21571 /*
21572@@ -1702,7 +1703,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21573 return;
21574 }
21575
21576+ pax_open_kernel();
21577 machine_check_vector = do_machine_check;
21578+ pax_close_kernel();
21579
21580 __mcheck_cpu_init_generic();
21581 __mcheck_cpu_init_vendor(c);
21582@@ -1716,7 +1719,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21583 */
21584
21585 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21586-static int mce_chrdev_open_count; /* #times opened */
21587+static local_t mce_chrdev_open_count; /* #times opened */
21588 static int mce_chrdev_open_exclu; /* already open exclusive? */
21589
21590 static int mce_chrdev_open(struct inode *inode, struct file *file)
21591@@ -1724,7 +1727,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21592 spin_lock(&mce_chrdev_state_lock);
21593
21594 if (mce_chrdev_open_exclu ||
21595- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21596+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21597 spin_unlock(&mce_chrdev_state_lock);
21598
21599 return -EBUSY;
21600@@ -1732,7 +1735,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21601
21602 if (file->f_flags & O_EXCL)
21603 mce_chrdev_open_exclu = 1;
21604- mce_chrdev_open_count++;
21605+ local_inc(&mce_chrdev_open_count);
21606
21607 spin_unlock(&mce_chrdev_state_lock);
21608
21609@@ -1743,7 +1746,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21610 {
21611 spin_lock(&mce_chrdev_state_lock);
21612
21613- mce_chrdev_open_count--;
21614+ local_dec(&mce_chrdev_open_count);
21615 mce_chrdev_open_exclu = 0;
21616
21617 spin_unlock(&mce_chrdev_state_lock);
21618@@ -2419,7 +2422,7 @@ static __init void mce_init_banks(void)
21619
21620 for (i = 0; i < mca_cfg.banks; i++) {
21621 struct mce_bank *b = &mce_banks[i];
21622- struct device_attribute *a = &b->attr;
21623+ device_attribute_no_const *a = &b->attr;
21624
21625 sysfs_attr_init(&a->attr);
21626 a->attr.name = b->attrname;
21627@@ -2526,7 +2529,7 @@ struct dentry *mce_get_debugfs_dir(void)
21628 static void mce_reset(void)
21629 {
21630 cpu_missing = 0;
21631- atomic_set(&mce_fake_panicked, 0);
21632+ atomic_set_unchecked(&mce_fake_panicked, 0);
21633 atomic_set(&mce_executing, 0);
21634 atomic_set(&mce_callin, 0);
21635 atomic_set(&global_nwo, 0);
21636diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21637index 737b0ad..09ec66e 100644
21638--- a/arch/x86/kernel/cpu/mcheck/p5.c
21639+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21640@@ -12,6 +12,7 @@
21641 #include <asm/tlbflush.h>
21642 #include <asm/mce.h>
21643 #include <asm/msr.h>
21644+#include <asm/pgtable.h>
21645
21646 /* By default disabled */
21647 int mce_p5_enabled __read_mostly;
21648@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21649 if (!cpu_has(c, X86_FEATURE_MCE))
21650 return;
21651
21652+ pax_open_kernel();
21653 machine_check_vector = pentium_machine_check;
21654+ pax_close_kernel();
21655 /* Make sure the vector pointer is visible before we enable MCEs: */
21656 wmb();
21657
21658diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21659index 44f1382..315b292 100644
21660--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21661+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21662@@ -11,6 +11,7 @@
21663 #include <asm/tlbflush.h>
21664 #include <asm/mce.h>
21665 #include <asm/msr.h>
21666+#include <asm/pgtable.h>
21667
21668 /* Machine check handler for WinChip C6: */
21669 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21670@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21671 {
21672 u32 lo, hi;
21673
21674+ pax_open_kernel();
21675 machine_check_vector = winchip_machine_check;
21676+ pax_close_kernel();
21677 /* Make sure the vector pointer is visible before we enable MCEs: */
21678 wmb();
21679
21680diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21681index 36a8361..e7058c2 100644
21682--- a/arch/x86/kernel/cpu/microcode/core.c
21683+++ b/arch/x86/kernel/cpu/microcode/core.c
21684@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21685 return NOTIFY_OK;
21686 }
21687
21688-static struct notifier_block __refdata mc_cpu_notifier = {
21689+static struct notifier_block mc_cpu_notifier = {
21690 .notifier_call = mc_cpu_callback,
21691 };
21692
21693diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21694index a41bead..4e3685b 100644
21695--- a/arch/x86/kernel/cpu/microcode/intel.c
21696+++ b/arch/x86/kernel/cpu/microcode/intel.c
21697@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21698
21699 static int get_ucode_user(void *to, const void *from, size_t n)
21700 {
21701- return copy_from_user(to, from, n);
21702+ return copy_from_user(to, (const void __force_user *)from, n);
21703 }
21704
21705 static enum ucode_state
21706 request_microcode_user(int cpu, const void __user *buf, size_t size)
21707 {
21708- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21709+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21710 }
21711
21712 static void microcode_fini_cpu(int cpu)
21713diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21714index ea5f363..cb0e905 100644
21715--- a/arch/x86/kernel/cpu/mtrr/main.c
21716+++ b/arch/x86/kernel/cpu/mtrr/main.c
21717@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21718 u64 size_or_mask, size_and_mask;
21719 static bool mtrr_aps_delayed_init;
21720
21721-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21722+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21723
21724 const struct mtrr_ops *mtrr_if;
21725
21726diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21727index df5e41f..816c719 100644
21728--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21729+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21730@@ -25,7 +25,7 @@ struct mtrr_ops {
21731 int (*validate_add_page)(unsigned long base, unsigned long size,
21732 unsigned int type);
21733 int (*have_wrcomb)(void);
21734-};
21735+} __do_const;
21736
21737 extern int generic_get_free_region(unsigned long base, unsigned long size,
21738 int replace_reg);
21739diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21740index aa4e3a7..469370f 100644
21741--- a/arch/x86/kernel/cpu/perf_event.c
21742+++ b/arch/x86/kernel/cpu/perf_event.c
21743@@ -1509,7 +1509,7 @@ static void __init pmu_check_apic(void)
21744
21745 }
21746
21747-static struct attribute_group x86_pmu_format_group = {
21748+static attribute_group_no_const x86_pmu_format_group = {
21749 .name = "format",
21750 .attrs = NULL,
21751 };
21752@@ -1608,7 +1608,7 @@ static struct attribute *events_attr[] = {
21753 NULL,
21754 };
21755
21756-static struct attribute_group x86_pmu_events_group = {
21757+static attribute_group_no_const x86_pmu_events_group = {
21758 .name = "events",
21759 .attrs = events_attr,
21760 };
21761@@ -2181,7 +2181,7 @@ static unsigned long get_segment_base(unsigned int segment)
21762 if (idx > GDT_ENTRIES)
21763 return 0;
21764
21765- desc = raw_cpu_ptr(gdt_page.gdt);
21766+ desc = get_cpu_gdt_table(smp_processor_id());
21767 }
21768
21769 return get_desc_base(desc + idx);
21770@@ -2271,7 +2271,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21771 break;
21772
21773 perf_callchain_store(entry, frame.return_address);
21774- fp = frame.next_frame;
21775+ fp = (const void __force_user *)frame.next_frame;
21776 }
21777 }
21778
21779diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21780index 97242a9..cf9c30e 100644
21781--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21782+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21783@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21784 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21785 {
21786 struct attribute **attrs;
21787- struct attribute_group *attr_group;
21788+ attribute_group_no_const *attr_group;
21789 int i = 0, j;
21790
21791 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21792diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21793index 2813ea0..3ef5969c8 100644
21794--- a/arch/x86/kernel/cpu/perf_event_intel.c
21795+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21796@@ -3033,10 +3033,10 @@ __init int intel_pmu_init(void)
21797 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21798
21799 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21800- u64 capabilities;
21801+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21802
21803- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21804- x86_pmu.intel_cap.capabilities = capabilities;
21805+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21806+ x86_pmu.intel_cap.capabilities = capabilities;
21807 }
21808
21809 intel_ds_init();
21810diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21811index 7795f3f..3535b76 100644
21812--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
21813+++ b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21814@@ -252,7 +252,7 @@ static void bts_event_start(struct perf_event *event, int flags)
21815 __bts_event_start(event);
21816
21817 /* PMI handler: this counter is running and likely generating PMIs */
21818- ACCESS_ONCE(bts->started) = 1;
21819+ ACCESS_ONCE_RW(bts->started) = 1;
21820 }
21821
21822 static void __bts_event_stop(struct perf_event *event)
21823@@ -266,7 +266,7 @@ static void __bts_event_stop(struct perf_event *event)
21824 if (event->hw.state & PERF_HES_STOPPED)
21825 return;
21826
21827- ACCESS_ONCE(event->hw.state) |= PERF_HES_STOPPED;
21828+ ACCESS_ONCE_RW(event->hw.state) |= PERF_HES_STOPPED;
21829 }
21830
21831 static void bts_event_stop(struct perf_event *event, int flags)
21832@@ -274,7 +274,7 @@ static void bts_event_stop(struct perf_event *event, int flags)
21833 struct bts_ctx *bts = this_cpu_ptr(&bts_ctx);
21834
21835 /* PMI handler: don't restart this counter */
21836- ACCESS_ONCE(bts->started) = 0;
21837+ ACCESS_ONCE_RW(bts->started) = 0;
21838
21839 __bts_event_stop(event);
21840
21841diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21842index cb77b11..8867302 100644
21843--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21844+++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21845@@ -1360,7 +1360,9 @@ static int __init intel_cqm_init(void)
21846 goto out;
21847 }
21848
21849- event_attr_intel_cqm_llc_scale.event_str = str;
21850+ pax_open_kernel();
21851+ *(const char **)&event_attr_intel_cqm_llc_scale.event_str = str;
21852+ pax_close_kernel();
21853
21854 ret = intel_cqm_setup_rmid_cache();
21855 if (ret)
21856diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21857index 123ff1b..d53e500 100644
21858--- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
21859+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21860@@ -116,16 +116,12 @@ static const struct attribute_group *pt_attr_groups[] = {
21861
21862 static int __init pt_pmu_hw_init(void)
21863 {
21864- struct dev_ext_attribute *de_attrs;
21865- struct attribute **attrs;
21866- size_t size;
21867- int ret;
21868+ static struct dev_ext_attribute de_attrs[ARRAY_SIZE(pt_caps)];
21869+ static struct attribute *attrs[ARRAY_SIZE(pt_caps)];
21870 long i;
21871
21872- attrs = NULL;
21873- ret = -ENODEV;
21874 if (!test_cpu_cap(&boot_cpu_data, X86_FEATURE_INTEL_PT))
21875- goto fail;
21876+ return -ENODEV;
21877
21878 for (i = 0; i < PT_CPUID_LEAVES; i++) {
21879 cpuid_count(20, i,
21880@@ -135,39 +131,25 @@ static int __init pt_pmu_hw_init(void)
21881 &pt_pmu.caps[CR_EDX + i*4]);
21882 }
21883
21884- ret = -ENOMEM;
21885- size = sizeof(struct attribute *) * (ARRAY_SIZE(pt_caps)+1);
21886- attrs = kzalloc(size, GFP_KERNEL);
21887- if (!attrs)
21888- goto fail;
21889-
21890- size = sizeof(struct dev_ext_attribute) * (ARRAY_SIZE(pt_caps)+1);
21891- de_attrs = kzalloc(size, GFP_KERNEL);
21892- if (!de_attrs)
21893- goto fail;
21894-
21895+ pax_open_kernel();
21896 for (i = 0; i < ARRAY_SIZE(pt_caps); i++) {
21897- struct dev_ext_attribute *de_attr = de_attrs + i;
21898+ struct dev_ext_attribute *de_attr = &de_attrs[i];
21899
21900- de_attr->attr.attr.name = pt_caps[i].name;
21901+ *(const char **)&de_attr->attr.attr.name = pt_caps[i].name;
21902
21903 sysfs_attr_init(&de_attr->attr.attr);
21904
21905- de_attr->attr.attr.mode = S_IRUGO;
21906- de_attr->attr.show = pt_cap_show;
21907- de_attr->var = (void *)i;
21908+ *(umode_t *)&de_attr->attr.attr.mode = S_IRUGO;
21909+ *(void **)&de_attr->attr.show = pt_cap_show;
21910+ *(void **)&de_attr->var = (void *)i;
21911
21912 attrs[i] = &de_attr->attr.attr;
21913 }
21914
21915- pt_cap_group.attrs = attrs;
21916+ *(struct attribute ***)&pt_cap_group.attrs = attrs;
21917+ pax_close_kernel();
21918
21919 return 0;
21920-
21921-fail:
21922- kfree(attrs);
21923-
21924- return ret;
21925 }
21926
21927 #define PT_CONFIG_MASK (RTIT_CTL_TSC_EN | RTIT_CTL_DISRETC)
21928@@ -928,7 +910,7 @@ static void pt_event_start(struct perf_event *event, int mode)
21929 return;
21930 }
21931
21932- ACCESS_ONCE(pt->handle_nmi) = 1;
21933+ ACCESS_ONCE_RW(pt->handle_nmi) = 1;
21934 event->hw.state = 0;
21935
21936 pt_config_buffer(buf->cur->table, buf->cur_idx,
21937@@ -945,7 +927,7 @@ static void pt_event_stop(struct perf_event *event, int mode)
21938 * Protect against the PMI racing with disabling wrmsr,
21939 * see comment in intel_pt_interrupt().
21940 */
21941- ACCESS_ONCE(pt->handle_nmi) = 0;
21942+ ACCESS_ONCE_RW(pt->handle_nmi) = 0;
21943 pt_config_start(false);
21944
21945 if (event->hw.state == PERF_HES_STOPPED)
21946diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21947index 358c54a..f068235 100644
21948--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21949+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21950@@ -487,7 +487,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21951 NULL,
21952 };
21953
21954-static struct attribute_group rapl_pmu_events_group = {
21955+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21956 .name = "events",
21957 .attrs = NULL, /* patched at runtime */
21958 };
21959diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21960index 90b7c50..7863ae3 100644
21961--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21962+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21963@@ -732,7 +732,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21964 static int __init uncore_type_init(struct intel_uncore_type *type)
21965 {
21966 struct intel_uncore_pmu *pmus;
21967- struct attribute_group *attr_group;
21968+ attribute_group_no_const *attr_group;
21969 struct attribute **attrs;
21970 int i, j;
21971
21972diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21973index ceac8f5..a562de7 100644
21974--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21975+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21976@@ -115,7 +115,7 @@ struct intel_uncore_box {
21977 struct uncore_event_desc {
21978 struct kobj_attribute attr;
21979 const char *config;
21980-};
21981+} __do_const;
21982
21983 ssize_t uncore_event_show(struct kobject *kobj,
21984 struct kobj_attribute *attr, char *buf);
21985diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21986index 83741a7..bd3507d 100644
21987--- a/arch/x86/kernel/cpuid.c
21988+++ b/arch/x86/kernel/cpuid.c
21989@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21990 return notifier_from_errno(err);
21991 }
21992
21993-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21994+static struct notifier_block cpuid_class_cpu_notifier =
21995 {
21996 .notifier_call = cpuid_class_cpu_callback,
21997 };
21998diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21999index afa64ad..dce67dd 100644
22000--- a/arch/x86/kernel/crash_dump_64.c
22001+++ b/arch/x86/kernel/crash_dump_64.c
22002@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
22003 return -ENOMEM;
22004
22005 if (userbuf) {
22006- if (copy_to_user(buf, vaddr + offset, csize)) {
22007+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
22008 iounmap(vaddr);
22009 return -EFAULT;
22010 }
22011diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
22012index f6dfd93..892ade4 100644
22013--- a/arch/x86/kernel/doublefault.c
22014+++ b/arch/x86/kernel/doublefault.c
22015@@ -12,7 +12,7 @@
22016
22017 #define DOUBLEFAULT_STACKSIZE (1024)
22018 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
22019-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
22020+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
22021
22022 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
22023
22024@@ -22,7 +22,7 @@ static void doublefault_fn(void)
22025 unsigned long gdt, tss;
22026
22027 native_store_gdt(&gdt_desc);
22028- gdt = gdt_desc.address;
22029+ gdt = (unsigned long)gdt_desc.address;
22030
22031 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
22032
22033@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
22034 /* 0x2 bit is always set */
22035 .flags = X86_EFLAGS_SF | 0x2,
22036 .sp = STACK_START,
22037- .es = __USER_DS,
22038+ .es = __KERNEL_DS,
22039 .cs = __KERNEL_CS,
22040 .ss = __KERNEL_DS,
22041- .ds = __USER_DS,
22042+ .ds = __KERNEL_DS,
22043 .fs = __KERNEL_PERCPU,
22044
22045 .__cr3 = __pa_nodebug(swapper_pg_dir),
22046diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
22047index 9c30acf..8cf2411 100644
22048--- a/arch/x86/kernel/dumpstack.c
22049+++ b/arch/x86/kernel/dumpstack.c
22050@@ -2,6 +2,9 @@
22051 * Copyright (C) 1991, 1992 Linus Torvalds
22052 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
22053 */
22054+#ifdef CONFIG_GRKERNSEC_HIDESYM
22055+#define __INCLUDED_BY_HIDESYM 1
22056+#endif
22057 #include <linux/kallsyms.h>
22058 #include <linux/kprobes.h>
22059 #include <linux/uaccess.h>
22060@@ -35,23 +38,21 @@ static void printk_stack_address(unsigned long address, int reliable,
22061
22062 void printk_address(unsigned long address)
22063 {
22064- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
22065+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
22066 }
22067
22068 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
22069 static void
22070 print_ftrace_graph_addr(unsigned long addr, void *data,
22071 const struct stacktrace_ops *ops,
22072- struct thread_info *tinfo, int *graph)
22073+ struct task_struct *task, int *graph)
22074 {
22075- struct task_struct *task;
22076 unsigned long ret_addr;
22077 int index;
22078
22079 if (addr != (unsigned long)return_to_handler)
22080 return;
22081
22082- task = tinfo->task;
22083 index = task->curr_ret_stack;
22084
22085 if (!task->ret_stack || index < *graph)
22086@@ -68,7 +69,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22087 static inline void
22088 print_ftrace_graph_addr(unsigned long addr, void *data,
22089 const struct stacktrace_ops *ops,
22090- struct thread_info *tinfo, int *graph)
22091+ struct task_struct *task, int *graph)
22092 { }
22093 #endif
22094
22095@@ -79,10 +80,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22096 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
22097 */
22098
22099-static inline int valid_stack_ptr(struct thread_info *tinfo,
22100- void *p, unsigned int size, void *end)
22101+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
22102 {
22103- void *t = tinfo;
22104 if (end) {
22105 if (p < end && p >= (end-THREAD_SIZE))
22106 return 1;
22107@@ -93,14 +92,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
22108 }
22109
22110 unsigned long
22111-print_context_stack(struct thread_info *tinfo,
22112+print_context_stack(struct task_struct *task, void *stack_start,
22113 unsigned long *stack, unsigned long bp,
22114 const struct stacktrace_ops *ops, void *data,
22115 unsigned long *end, int *graph)
22116 {
22117 struct stack_frame *frame = (struct stack_frame *)bp;
22118
22119- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
22120+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
22121 unsigned long addr;
22122
22123 addr = *stack;
22124@@ -112,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
22125 } else {
22126 ops->address(data, addr, 0);
22127 }
22128- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22129+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22130 }
22131 stack++;
22132 }
22133@@ -121,7 +120,7 @@ print_context_stack(struct thread_info *tinfo,
22134 EXPORT_SYMBOL_GPL(print_context_stack);
22135
22136 unsigned long
22137-print_context_stack_bp(struct thread_info *tinfo,
22138+print_context_stack_bp(struct task_struct *task, void *stack_start,
22139 unsigned long *stack, unsigned long bp,
22140 const struct stacktrace_ops *ops, void *data,
22141 unsigned long *end, int *graph)
22142@@ -129,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22143 struct stack_frame *frame = (struct stack_frame *)bp;
22144 unsigned long *ret_addr = &frame->return_address;
22145
22146- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
22147+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
22148 unsigned long addr = *ret_addr;
22149
22150 if (!__kernel_text_address(addr))
22151@@ -138,7 +137,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22152 ops->address(data, addr, 1);
22153 frame = frame->next_frame;
22154 ret_addr = &frame->return_address;
22155- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22156+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22157 }
22158
22159 return (unsigned long)frame;
22160@@ -226,6 +225,8 @@ unsigned long oops_begin(void)
22161 EXPORT_SYMBOL_GPL(oops_begin);
22162 NOKPROBE_SYMBOL(oops_begin);
22163
22164+extern void gr_handle_kernel_exploit(void);
22165+
22166 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22167 {
22168 if (regs && kexec_should_crash(current))
22169@@ -247,7 +248,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22170 panic("Fatal exception in interrupt");
22171 if (panic_on_oops)
22172 panic("Fatal exception");
22173- do_exit(signr);
22174+
22175+ gr_handle_kernel_exploit();
22176+
22177+ do_group_exit(signr);
22178 }
22179 NOKPROBE_SYMBOL(oops_end);
22180
22181diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22182index 464ffd6..01f2cda 100644
22183--- a/arch/x86/kernel/dumpstack_32.c
22184+++ b/arch/x86/kernel/dumpstack_32.c
22185@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22186 bp = stack_frame(task, regs);
22187
22188 for (;;) {
22189- struct thread_info *context;
22190+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22191 void *end_stack;
22192
22193 end_stack = is_hardirq_stack(stack, cpu);
22194 if (!end_stack)
22195 end_stack = is_softirq_stack(stack, cpu);
22196
22197- context = task_thread_info(task);
22198- bp = ops->walk_stack(context, stack, bp, ops, data,
22199+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22200 end_stack, &graph);
22201
22202 /* Stop if not on irq stack */
22203@@ -137,16 +136,17 @@ void show_regs(struct pt_regs *regs)
22204 unsigned int code_len = code_bytes;
22205 unsigned char c;
22206 u8 *ip;
22207+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22208
22209 pr_emerg("Stack:\n");
22210 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22211
22212 pr_emerg("Code:");
22213
22214- ip = (u8 *)regs->ip - code_prologue;
22215+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22216 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22217 /* try starting at IP */
22218- ip = (u8 *)regs->ip;
22219+ ip = (u8 *)regs->ip + cs_base;
22220 code_len = code_len - code_prologue + 1;
22221 }
22222 for (i = 0; i < code_len; i++, ip++) {
22223@@ -155,7 +155,7 @@ void show_regs(struct pt_regs *regs)
22224 pr_cont(" Bad EIP value.");
22225 break;
22226 }
22227- if (ip == (u8 *)regs->ip)
22228+ if (ip == (u8 *)regs->ip + cs_base)
22229 pr_cont(" <%02x>", c);
22230 else
22231 pr_cont(" %02x", c);
22232@@ -168,6 +168,7 @@ int is_valid_bugaddr(unsigned long ip)
22233 {
22234 unsigned short ud2;
22235
22236+ ip = ktla_ktva(ip);
22237 if (ip < PAGE_OFFSET)
22238 return 0;
22239 if (probe_kernel_address((unsigned short *)ip, ud2))
22240@@ -175,3 +176,15 @@ int is_valid_bugaddr(unsigned long ip)
22241
22242 return ud2 == 0x0b0f;
22243 }
22244+
22245+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22246+void __used pax_check_alloca(unsigned long size)
22247+{
22248+ unsigned long sp = (unsigned long)&sp, stack_left;
22249+
22250+ /* all kernel stacks are of the same size */
22251+ stack_left = sp & (THREAD_SIZE - 1);
22252+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22253+}
22254+EXPORT_SYMBOL(pax_check_alloca);
22255+#endif
22256diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22257index 5f1c626..1cba97e 100644
22258--- a/arch/x86/kernel/dumpstack_64.c
22259+++ b/arch/x86/kernel/dumpstack_64.c
22260@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22261 const struct stacktrace_ops *ops, void *data)
22262 {
22263 const unsigned cpu = get_cpu();
22264- struct thread_info *tinfo;
22265 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22266 unsigned long dummy;
22267 unsigned used = 0;
22268 int graph = 0;
22269 int done = 0;
22270+ void *stack_start;
22271
22272 if (!task)
22273 task = current;
22274@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22275 * current stack address. If the stacks consist of nested
22276 * exceptions
22277 */
22278- tinfo = task_thread_info(task);
22279 while (!done) {
22280 unsigned long *stack_end;
22281 enum stack_type stype;
22282@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22283 if (ops->stack(data, id) < 0)
22284 break;
22285
22286- bp = ops->walk_stack(tinfo, stack, bp, ops,
22287+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22288 data, stack_end, &graph);
22289 ops->stack(data, "<EOE>");
22290 /*
22291@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22292 * second-to-last pointer (index -2 to end) in the
22293 * exception stack:
22294 */
22295+ if ((u16)stack_end[-1] != __KERNEL_DS)
22296+ goto out;
22297 stack = (unsigned long *) stack_end[-2];
22298 done = 0;
22299 break;
22300@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22301
22302 if (ops->stack(data, "IRQ") < 0)
22303 break;
22304- bp = ops->walk_stack(tinfo, stack, bp,
22305+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22306 ops, data, stack_end, &graph);
22307 /*
22308 * We link to the next stack (which would be
22309@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22310 /*
22311 * This handles the process stack:
22312 */
22313- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22314+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22315+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22316+out:
22317 put_cpu();
22318 }
22319 EXPORT_SYMBOL(dump_trace);
22320@@ -347,8 +350,55 @@ int is_valid_bugaddr(unsigned long ip)
22321 {
22322 unsigned short ud2;
22323
22324- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22325+ if (probe_kernel_address((unsigned short *)ip, ud2))
22326 return 0;
22327
22328 return ud2 == 0x0b0f;
22329 }
22330+
22331+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22332+void __used pax_check_alloca(unsigned long size)
22333+{
22334+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22335+ unsigned cpu, used;
22336+ char *id;
22337+
22338+ /* check the process stack first */
22339+ stack_start = (unsigned long)task_stack_page(current);
22340+ stack_end = stack_start + THREAD_SIZE;
22341+ if (likely(stack_start <= sp && sp < stack_end)) {
22342+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22343+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22344+ return;
22345+ }
22346+
22347+ cpu = get_cpu();
22348+
22349+ /* check the irq stacks */
22350+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22351+ stack_start = stack_end - IRQ_STACK_SIZE;
22352+ if (stack_start <= sp && sp < stack_end) {
22353+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22354+ put_cpu();
22355+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22356+ return;
22357+ }
22358+
22359+ /* check the exception stacks */
22360+ used = 0;
22361+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22362+ stack_start = stack_end - EXCEPTION_STKSZ;
22363+ if (stack_end && stack_start <= sp && sp < stack_end) {
22364+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22365+ put_cpu();
22366+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22367+ return;
22368+ }
22369+
22370+ put_cpu();
22371+
22372+ /* unknown stack */
22373+ BUG();
22374+}
22375+EXPORT_SYMBOL(pax_check_alloca);
22376+#endif
22377diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22378index e2ce85d..00ccad0 100644
22379--- a/arch/x86/kernel/e820.c
22380+++ b/arch/x86/kernel/e820.c
22381@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22382
22383 static void early_panic(char *msg)
22384 {
22385- early_printk(msg);
22386- panic(msg);
22387+ early_printk("%s", msg);
22388+ panic("%s", msg);
22389 }
22390
22391 static int userdef __initdata;
22392diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22393index 89427d8..00c0d52 100644
22394--- a/arch/x86/kernel/early_printk.c
22395+++ b/arch/x86/kernel/early_printk.c
22396@@ -7,6 +7,7 @@
22397 #include <linux/pci_regs.h>
22398 #include <linux/pci_ids.h>
22399 #include <linux/errno.h>
22400+#include <linux/sched.h>
22401 #include <asm/io.h>
22402 #include <asm/processor.h>
22403 #include <asm/fcntl.h>
22404diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22405index 1c30976..71b41b9 100644
22406--- a/arch/x86/kernel/entry_32.S
22407+++ b/arch/x86/kernel/entry_32.S
22408@@ -177,13 +177,154 @@
22409 /*CFI_REL_OFFSET gs, PT_GS*/
22410 .endm
22411 .macro SET_KERNEL_GS reg
22412+
22413+#ifdef CONFIG_CC_STACKPROTECTOR
22414 movl $(__KERNEL_STACK_CANARY), \reg
22415+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22416+ movl $(__USER_DS), \reg
22417+#else
22418+ xorl \reg, \reg
22419+#endif
22420+
22421 movl \reg, %gs
22422 .endm
22423
22424 #endif /* CONFIG_X86_32_LAZY_GS */
22425
22426-.macro SAVE_ALL
22427+.macro pax_enter_kernel
22428+#ifdef CONFIG_PAX_KERNEXEC
22429+ call pax_enter_kernel
22430+#endif
22431+.endm
22432+
22433+.macro pax_exit_kernel
22434+#ifdef CONFIG_PAX_KERNEXEC
22435+ call pax_exit_kernel
22436+#endif
22437+.endm
22438+
22439+#ifdef CONFIG_PAX_KERNEXEC
22440+ENTRY(pax_enter_kernel)
22441+#ifdef CONFIG_PARAVIRT
22442+ pushl %eax
22443+ pushl %ecx
22444+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22445+ mov %eax, %esi
22446+#else
22447+ mov %cr0, %esi
22448+#endif
22449+ bts $X86_CR0_WP_BIT, %esi
22450+ jnc 1f
22451+ mov %cs, %esi
22452+ cmp $__KERNEL_CS, %esi
22453+ jz 3f
22454+ ljmp $__KERNEL_CS, $3f
22455+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22456+2:
22457+#ifdef CONFIG_PARAVIRT
22458+ mov %esi, %eax
22459+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22460+#else
22461+ mov %esi, %cr0
22462+#endif
22463+3:
22464+#ifdef CONFIG_PARAVIRT
22465+ popl %ecx
22466+ popl %eax
22467+#endif
22468+ ret
22469+ENDPROC(pax_enter_kernel)
22470+
22471+ENTRY(pax_exit_kernel)
22472+#ifdef CONFIG_PARAVIRT
22473+ pushl %eax
22474+ pushl %ecx
22475+#endif
22476+ mov %cs, %esi
22477+ cmp $__KERNEXEC_KERNEL_CS, %esi
22478+ jnz 2f
22479+#ifdef CONFIG_PARAVIRT
22480+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22481+ mov %eax, %esi
22482+#else
22483+ mov %cr0, %esi
22484+#endif
22485+ btr $X86_CR0_WP_BIT, %esi
22486+ ljmp $__KERNEL_CS, $1f
22487+1:
22488+#ifdef CONFIG_PARAVIRT
22489+ mov %esi, %eax
22490+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22491+#else
22492+ mov %esi, %cr0
22493+#endif
22494+2:
22495+#ifdef CONFIG_PARAVIRT
22496+ popl %ecx
22497+ popl %eax
22498+#endif
22499+ ret
22500+ENDPROC(pax_exit_kernel)
22501+#endif
22502+
22503+ .macro pax_erase_kstack
22504+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22505+ call pax_erase_kstack
22506+#endif
22507+ .endm
22508+
22509+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22510+/*
22511+ * ebp: thread_info
22512+ */
22513+ENTRY(pax_erase_kstack)
22514+ pushl %edi
22515+ pushl %ecx
22516+ pushl %eax
22517+
22518+ mov TI_lowest_stack(%ebp), %edi
22519+ mov $-0xBEEF, %eax
22520+ std
22521+
22522+1: mov %edi, %ecx
22523+ and $THREAD_SIZE_asm - 1, %ecx
22524+ shr $2, %ecx
22525+ repne scasl
22526+ jecxz 2f
22527+
22528+ cmp $2*16, %ecx
22529+ jc 2f
22530+
22531+ mov $2*16, %ecx
22532+ repe scasl
22533+ jecxz 2f
22534+ jne 1b
22535+
22536+2: cld
22537+ or $2*4, %edi
22538+ mov %esp, %ecx
22539+ sub %edi, %ecx
22540+
22541+ cmp $THREAD_SIZE_asm, %ecx
22542+ jb 3f
22543+ ud2
22544+3:
22545+
22546+ shr $2, %ecx
22547+ rep stosl
22548+
22549+ mov TI_task_thread_sp0(%ebp), %edi
22550+ sub $128, %edi
22551+ mov %edi, TI_lowest_stack(%ebp)
22552+
22553+ popl %eax
22554+ popl %ecx
22555+ popl %edi
22556+ ret
22557+ENDPROC(pax_erase_kstack)
22558+#endif
22559+
22560+.macro __SAVE_ALL _DS
22561 cld
22562 PUSH_GS
22563 pushl_cfi %fs
22564@@ -206,7 +347,7 @@
22565 CFI_REL_OFFSET ecx, 0
22566 pushl_cfi %ebx
22567 CFI_REL_OFFSET ebx, 0
22568- movl $(__USER_DS), %edx
22569+ movl $\_DS, %edx
22570 movl %edx, %ds
22571 movl %edx, %es
22572 movl $(__KERNEL_PERCPU), %edx
22573@@ -214,6 +355,15 @@
22574 SET_KERNEL_GS %edx
22575 .endm
22576
22577+.macro SAVE_ALL
22578+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22579+ __SAVE_ALL __KERNEL_DS
22580+ pax_enter_kernel
22581+#else
22582+ __SAVE_ALL __USER_DS
22583+#endif
22584+.endm
22585+
22586 .macro RESTORE_INT_REGS
22587 popl_cfi %ebx
22588 CFI_RESTORE ebx
22589@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22590 popfl_cfi
22591 jmp syscall_exit
22592 CFI_ENDPROC
22593-END(ret_from_fork)
22594+ENDPROC(ret_from_fork)
22595
22596 ENTRY(ret_from_kernel_thread)
22597 CFI_STARTPROC
22598@@ -340,7 +490,15 @@ ret_from_intr:
22599 andl $SEGMENT_RPL_MASK, %eax
22600 #endif
22601 cmpl $USER_RPL, %eax
22602+
22603+#ifdef CONFIG_PAX_KERNEXEC
22604+ jae resume_userspace
22605+
22606+ pax_exit_kernel
22607+ jmp resume_kernel
22608+#else
22609 jb resume_kernel # not returning to v8086 or userspace
22610+#endif
22611
22612 ENTRY(resume_userspace)
22613 LOCKDEP_SYS_EXIT
22614@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22615 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22616 # int/exception return?
22617 jne work_pending
22618- jmp restore_all
22619-END(ret_from_exception)
22620+ jmp restore_all_pax
22621+ENDPROC(ret_from_exception)
22622
22623 #ifdef CONFIG_PREEMPT
22624 ENTRY(resume_kernel)
22625@@ -365,7 +523,7 @@ need_resched:
22626 jz restore_all
22627 call preempt_schedule_irq
22628 jmp need_resched
22629-END(resume_kernel)
22630+ENDPROC(resume_kernel)
22631 #endif
22632 CFI_ENDPROC
22633
22634@@ -395,33 +553,45 @@ sysenter_past_esp:
22635 /*CFI_REL_OFFSET cs, 0*/
22636 /*
22637 * Push current_thread_info()->sysenter_return to the stack.
22638- * A tiny bit of offset fixup is necessary: TI_sysenter_return
22639- * is relative to thread_info, which is at the bottom of the
22640- * kernel stack page. 4*4 means the 4 words pushed above;
22641- * TOP_OF_KERNEL_STACK_PADDING takes us to the top of the stack;
22642- * and THREAD_SIZE takes us to the bottom.
22643 */
22644- pushl_cfi ((TI_sysenter_return) - THREAD_SIZE + TOP_OF_KERNEL_STACK_PADDING + 4*4)(%esp)
22645+ pushl_cfi $0
22646 CFI_REL_OFFSET eip, 0
22647
22648 pushl_cfi %eax
22649 SAVE_ALL
22650+ GET_THREAD_INFO(%ebp)
22651+ movl TI_sysenter_return(%ebp),%ebp
22652+ movl %ebp,PT_EIP(%esp)
22653 ENABLE_INTERRUPTS(CLBR_NONE)
22654
22655 /*
22656 * Load the potential sixth argument from user stack.
22657 * Careful about security.
22658 */
22659+ movl PT_OLDESP(%esp),%ebp
22660+
22661+#ifdef CONFIG_PAX_MEMORY_UDEREF
22662+ mov PT_OLDSS(%esp),%ds
22663+1: movl %ds:(%ebp),%ebp
22664+ push %ss
22665+ pop %ds
22666+#else
22667 cmpl $__PAGE_OFFSET-3,%ebp
22668 jae syscall_fault
22669 ASM_STAC
22670 1: movl (%ebp),%ebp
22671 ASM_CLAC
22672+#endif
22673+
22674 movl %ebp,PT_EBP(%esp)
22675 _ASM_EXTABLE(1b,syscall_fault)
22676
22677 GET_THREAD_INFO(%ebp)
22678
22679+#ifdef CONFIG_PAX_RANDKSTACK
22680+ pax_erase_kstack
22681+#endif
22682+
22683 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22684 jnz sysenter_audit
22685 sysenter_do_call:
22686@@ -437,12 +607,24 @@ sysenter_after_call:
22687 testl $_TIF_ALLWORK_MASK, %ecx
22688 jnz sysexit_audit
22689 sysenter_exit:
22690+
22691+#ifdef CONFIG_PAX_RANDKSTACK
22692+ pushl_cfi %eax
22693+ movl %esp, %eax
22694+ call pax_randomize_kstack
22695+ popl_cfi %eax
22696+#endif
22697+
22698+ pax_erase_kstack
22699+
22700 /* if something modifies registers it must also disable sysexit */
22701 movl PT_EIP(%esp), %edx
22702 movl PT_OLDESP(%esp), %ecx
22703 xorl %ebp,%ebp
22704 TRACE_IRQS_ON
22705 1: mov PT_FS(%esp), %fs
22706+2: mov PT_DS(%esp), %ds
22707+3: mov PT_ES(%esp), %es
22708 PTGS_TO_GS
22709 ENABLE_INTERRUPTS_SYSEXIT
22710
22711@@ -456,6 +638,9 @@ sysenter_audit:
22712 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22713 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22714 call __audit_syscall_entry
22715+
22716+ pax_erase_kstack
22717+
22718 popl_cfi %ecx /* get that remapped edx off the stack */
22719 popl_cfi %ecx /* get that remapped esi off the stack */
22720 movl PT_EAX(%esp),%eax /* reload syscall number */
22721@@ -482,10 +667,16 @@ sysexit_audit:
22722
22723 CFI_ENDPROC
22724 .pushsection .fixup,"ax"
22725-2: movl $0,PT_FS(%esp)
22726+4: movl $0,PT_FS(%esp)
22727+ jmp 1b
22728+5: movl $0,PT_DS(%esp)
22729+ jmp 1b
22730+6: movl $0,PT_ES(%esp)
22731 jmp 1b
22732 .popsection
22733- _ASM_EXTABLE(1b,2b)
22734+ _ASM_EXTABLE(1b,4b)
22735+ _ASM_EXTABLE(2b,5b)
22736+ _ASM_EXTABLE(3b,6b)
22737 PTGS_TO_GS_EX
22738 ENDPROC(ia32_sysenter_target)
22739
22740@@ -496,6 +687,11 @@ ENTRY(system_call)
22741 pushl_cfi %eax # save orig_eax
22742 SAVE_ALL
22743 GET_THREAD_INFO(%ebp)
22744+
22745+#ifdef CONFIG_PAX_RANDKSTACK
22746+ pax_erase_kstack
22747+#endif
22748+
22749 # system call tracing in operation / emulation
22750 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22751 jnz syscall_trace_entry
22752@@ -515,6 +711,15 @@ syscall_exit:
22753 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22754 jnz syscall_exit_work
22755
22756+restore_all_pax:
22757+
22758+#ifdef CONFIG_PAX_RANDKSTACK
22759+ movl %esp, %eax
22760+ call pax_randomize_kstack
22761+#endif
22762+
22763+ pax_erase_kstack
22764+
22765 restore_all:
22766 TRACE_IRQS_IRET
22767 restore_all_notrace:
22768@@ -569,14 +774,34 @@ ldt_ss:
22769 * compensating for the offset by changing to the ESPFIX segment with
22770 * a base address that matches for the difference.
22771 */
22772-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22773+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22774 mov %esp, %edx /* load kernel esp */
22775 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22776 mov %dx, %ax /* eax: new kernel esp */
22777 sub %eax, %edx /* offset (low word is 0) */
22778+#ifdef CONFIG_SMP
22779+ movl PER_CPU_VAR(cpu_number), %ebx
22780+ shll $PAGE_SHIFT_asm, %ebx
22781+ addl $cpu_gdt_table, %ebx
22782+#else
22783+ movl $cpu_gdt_table, %ebx
22784+#endif
22785 shr $16, %edx
22786- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22787- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22788+
22789+#ifdef CONFIG_PAX_KERNEXEC
22790+ mov %cr0, %esi
22791+ btr $X86_CR0_WP_BIT, %esi
22792+ mov %esi, %cr0
22793+#endif
22794+
22795+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22796+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22797+
22798+#ifdef CONFIG_PAX_KERNEXEC
22799+ bts $X86_CR0_WP_BIT, %esi
22800+ mov %esi, %cr0
22801+#endif
22802+
22803 pushl_cfi $__ESPFIX_SS
22804 pushl_cfi %eax /* new kernel esp */
22805 /* Disable interrupts, but do not irqtrace this section: we
22806@@ -606,20 +831,18 @@ work_resched:
22807 movl TI_flags(%ebp), %ecx
22808 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22809 # than syscall tracing?
22810- jz restore_all
22811+ jz restore_all_pax
22812 testb $_TIF_NEED_RESCHED, %cl
22813 jnz work_resched
22814
22815 work_notifysig: # deal with pending signals and
22816 # notify-resume requests
22817+ movl %esp, %eax
22818 #ifdef CONFIG_VM86
22819 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22820- movl %esp, %eax
22821 jnz work_notifysig_v86 # returning to kernel-space or
22822 # vm86-space
22823 1:
22824-#else
22825- movl %esp, %eax
22826 #endif
22827 TRACE_IRQS_ON
22828 ENABLE_INTERRUPTS(CLBR_NONE)
22829@@ -640,7 +863,7 @@ work_notifysig_v86:
22830 movl %eax, %esp
22831 jmp 1b
22832 #endif
22833-END(work_pending)
22834+ENDPROC(work_pending)
22835
22836 # perform syscall exit tracing
22837 ALIGN
22838@@ -648,11 +871,14 @@ syscall_trace_entry:
22839 movl $-ENOSYS,PT_EAX(%esp)
22840 movl %esp, %eax
22841 call syscall_trace_enter
22842+
22843+ pax_erase_kstack
22844+
22845 /* What it returned is what we'll actually use. */
22846 cmpl $(NR_syscalls), %eax
22847 jnae syscall_call
22848 jmp syscall_exit
22849-END(syscall_trace_entry)
22850+ENDPROC(syscall_trace_entry)
22851
22852 # perform syscall exit tracing
22853 ALIGN
22854@@ -665,26 +891,30 @@ syscall_exit_work:
22855 movl %esp, %eax
22856 call syscall_trace_leave
22857 jmp resume_userspace
22858-END(syscall_exit_work)
22859+ENDPROC(syscall_exit_work)
22860 CFI_ENDPROC
22861
22862 RING0_INT_FRAME # can't unwind into user space anyway
22863 syscall_fault:
22864+#ifdef CONFIG_PAX_MEMORY_UDEREF
22865+ push %ss
22866+ pop %ds
22867+#endif
22868 ASM_CLAC
22869 GET_THREAD_INFO(%ebp)
22870 movl $-EFAULT,PT_EAX(%esp)
22871 jmp resume_userspace
22872-END(syscall_fault)
22873+ENDPROC(syscall_fault)
22874
22875 syscall_badsys:
22876 movl $-ENOSYS,%eax
22877 jmp syscall_after_call
22878-END(syscall_badsys)
22879+ENDPROC(syscall_badsys)
22880
22881 sysenter_badsys:
22882 movl $-ENOSYS,%eax
22883 jmp sysenter_after_call
22884-END(sysenter_badsys)
22885+ENDPROC(sysenter_badsys)
22886 CFI_ENDPROC
22887
22888 .macro FIXUP_ESPFIX_STACK
22889@@ -697,8 +927,15 @@ END(sysenter_badsys)
22890 */
22891 #ifdef CONFIG_X86_ESPFIX32
22892 /* fixup the stack */
22893- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22894- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22895+#ifdef CONFIG_SMP
22896+ movl PER_CPU_VAR(cpu_number), %ebx
22897+ shll $PAGE_SHIFT_asm, %ebx
22898+ addl $cpu_gdt_table, %ebx
22899+#else
22900+ movl $cpu_gdt_table, %ebx
22901+#endif
22902+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22903+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22904 shl $16, %eax
22905 addl %esp, %eax /* the adjusted stack pointer */
22906 pushl_cfi $__KERNEL_DS
22907@@ -737,7 +974,7 @@ ENTRY(irq_entries_start)
22908 CFI_ADJUST_CFA_OFFSET -4
22909 .align 8
22910 .endr
22911-END(irq_entries_start)
22912+ENDPROC(irq_entries_start)
22913
22914 /*
22915 * the CPU automatically disables interrupts when executing an IRQ vector,
22916@@ -790,7 +1027,7 @@ ENTRY(coprocessor_error)
22917 pushl_cfi $do_coprocessor_error
22918 jmp error_code
22919 CFI_ENDPROC
22920-END(coprocessor_error)
22921+ENDPROC(coprocessor_error)
22922
22923 ENTRY(simd_coprocessor_error)
22924 RING0_INT_FRAME
22925@@ -806,7 +1043,7 @@ ENTRY(simd_coprocessor_error)
22926 #endif
22927 jmp error_code
22928 CFI_ENDPROC
22929-END(simd_coprocessor_error)
22930+ENDPROC(simd_coprocessor_error)
22931
22932 ENTRY(device_not_available)
22933 RING0_INT_FRAME
22934@@ -815,18 +1052,18 @@ ENTRY(device_not_available)
22935 pushl_cfi $do_device_not_available
22936 jmp error_code
22937 CFI_ENDPROC
22938-END(device_not_available)
22939+ENDPROC(device_not_available)
22940
22941 #ifdef CONFIG_PARAVIRT
22942 ENTRY(native_iret)
22943 iret
22944 _ASM_EXTABLE(native_iret, iret_exc)
22945-END(native_iret)
22946+ENDPROC(native_iret)
22947
22948 ENTRY(native_irq_enable_sysexit)
22949 sti
22950 sysexit
22951-END(native_irq_enable_sysexit)
22952+ENDPROC(native_irq_enable_sysexit)
22953 #endif
22954
22955 ENTRY(overflow)
22956@@ -836,7 +1073,7 @@ ENTRY(overflow)
22957 pushl_cfi $do_overflow
22958 jmp error_code
22959 CFI_ENDPROC
22960-END(overflow)
22961+ENDPROC(overflow)
22962
22963 ENTRY(bounds)
22964 RING0_INT_FRAME
22965@@ -845,7 +1082,7 @@ ENTRY(bounds)
22966 pushl_cfi $do_bounds
22967 jmp error_code
22968 CFI_ENDPROC
22969-END(bounds)
22970+ENDPROC(bounds)
22971
22972 ENTRY(invalid_op)
22973 RING0_INT_FRAME
22974@@ -854,7 +1091,7 @@ ENTRY(invalid_op)
22975 pushl_cfi $do_invalid_op
22976 jmp error_code
22977 CFI_ENDPROC
22978-END(invalid_op)
22979+ENDPROC(invalid_op)
22980
22981 ENTRY(coprocessor_segment_overrun)
22982 RING0_INT_FRAME
22983@@ -863,7 +1100,7 @@ ENTRY(coprocessor_segment_overrun)
22984 pushl_cfi $do_coprocessor_segment_overrun
22985 jmp error_code
22986 CFI_ENDPROC
22987-END(coprocessor_segment_overrun)
22988+ENDPROC(coprocessor_segment_overrun)
22989
22990 ENTRY(invalid_TSS)
22991 RING0_EC_FRAME
22992@@ -871,7 +1108,7 @@ ENTRY(invalid_TSS)
22993 pushl_cfi $do_invalid_TSS
22994 jmp error_code
22995 CFI_ENDPROC
22996-END(invalid_TSS)
22997+ENDPROC(invalid_TSS)
22998
22999 ENTRY(segment_not_present)
23000 RING0_EC_FRAME
23001@@ -879,7 +1116,7 @@ ENTRY(segment_not_present)
23002 pushl_cfi $do_segment_not_present
23003 jmp error_code
23004 CFI_ENDPROC
23005-END(segment_not_present)
23006+ENDPROC(segment_not_present)
23007
23008 ENTRY(stack_segment)
23009 RING0_EC_FRAME
23010@@ -887,7 +1124,7 @@ ENTRY(stack_segment)
23011 pushl_cfi $do_stack_segment
23012 jmp error_code
23013 CFI_ENDPROC
23014-END(stack_segment)
23015+ENDPROC(stack_segment)
23016
23017 ENTRY(alignment_check)
23018 RING0_EC_FRAME
23019@@ -895,7 +1132,7 @@ ENTRY(alignment_check)
23020 pushl_cfi $do_alignment_check
23021 jmp error_code
23022 CFI_ENDPROC
23023-END(alignment_check)
23024+ENDPROC(alignment_check)
23025
23026 ENTRY(divide_error)
23027 RING0_INT_FRAME
23028@@ -904,7 +1141,7 @@ ENTRY(divide_error)
23029 pushl_cfi $do_divide_error
23030 jmp error_code
23031 CFI_ENDPROC
23032-END(divide_error)
23033+ENDPROC(divide_error)
23034
23035 #ifdef CONFIG_X86_MCE
23036 ENTRY(machine_check)
23037@@ -914,7 +1151,7 @@ ENTRY(machine_check)
23038 pushl_cfi machine_check_vector
23039 jmp error_code
23040 CFI_ENDPROC
23041-END(machine_check)
23042+ENDPROC(machine_check)
23043 #endif
23044
23045 ENTRY(spurious_interrupt_bug)
23046@@ -924,7 +1161,7 @@ ENTRY(spurious_interrupt_bug)
23047 pushl_cfi $do_spurious_interrupt_bug
23048 jmp error_code
23049 CFI_ENDPROC
23050-END(spurious_interrupt_bug)
23051+ENDPROC(spurious_interrupt_bug)
23052
23053 #ifdef CONFIG_XEN
23054 /* Xen doesn't set %esp to be precisely what the normal sysenter
23055@@ -1033,7 +1270,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
23056
23057 ENTRY(mcount)
23058 ret
23059-END(mcount)
23060+ENDPROC(mcount)
23061
23062 ENTRY(ftrace_caller)
23063 pushl %eax
23064@@ -1063,7 +1300,7 @@ ftrace_graph_call:
23065 .globl ftrace_stub
23066 ftrace_stub:
23067 ret
23068-END(ftrace_caller)
23069+ENDPROC(ftrace_caller)
23070
23071 ENTRY(ftrace_regs_caller)
23072 pushf /* push flags before compare (in cs location) */
23073@@ -1161,7 +1398,7 @@ trace:
23074 popl %ecx
23075 popl %eax
23076 jmp ftrace_stub
23077-END(mcount)
23078+ENDPROC(mcount)
23079 #endif /* CONFIG_DYNAMIC_FTRACE */
23080 #endif /* CONFIG_FUNCTION_TRACER */
23081
23082@@ -1179,7 +1416,7 @@ ENTRY(ftrace_graph_caller)
23083 popl %ecx
23084 popl %eax
23085 ret
23086-END(ftrace_graph_caller)
23087+ENDPROC(ftrace_graph_caller)
23088
23089 .globl return_to_handler
23090 return_to_handler:
23091@@ -1233,15 +1470,18 @@ error_code:
23092 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
23093 REG_TO_PTGS %ecx
23094 SET_KERNEL_GS %ecx
23095- movl $(__USER_DS), %ecx
23096+ movl $(__KERNEL_DS), %ecx
23097 movl %ecx, %ds
23098 movl %ecx, %es
23099+
23100+ pax_enter_kernel
23101+
23102 TRACE_IRQS_OFF
23103 movl %esp,%eax # pt_regs pointer
23104 call *%edi
23105 jmp ret_from_exception
23106 CFI_ENDPROC
23107-END(page_fault)
23108+ENDPROC(page_fault)
23109
23110 /*
23111 * Debug traps and NMI can happen at the one SYSENTER instruction
23112@@ -1284,7 +1524,7 @@ debug_stack_correct:
23113 call do_debug
23114 jmp ret_from_exception
23115 CFI_ENDPROC
23116-END(debug)
23117+ENDPROC(debug)
23118
23119 /*
23120 * NMI is doubly nasty. It can happen _while_ we're handling
23121@@ -1324,6 +1564,9 @@ nmi_stack_correct:
23122 xorl %edx,%edx # zero error code
23123 movl %esp,%eax # pt_regs pointer
23124 call do_nmi
23125+
23126+ pax_exit_kernel
23127+
23128 jmp restore_all_notrace
23129 CFI_ENDPROC
23130
23131@@ -1361,13 +1604,16 @@ nmi_espfix_stack:
23132 FIXUP_ESPFIX_STACK # %eax == %esp
23133 xorl %edx,%edx # zero error code
23134 call do_nmi
23135+
23136+ pax_exit_kernel
23137+
23138 RESTORE_REGS
23139 lss 12+4(%esp), %esp # back to espfix stack
23140 CFI_ADJUST_CFA_OFFSET -24
23141 jmp irq_return
23142 #endif
23143 CFI_ENDPROC
23144-END(nmi)
23145+ENDPROC(nmi)
23146
23147 ENTRY(int3)
23148 RING0_INT_FRAME
23149@@ -1380,14 +1626,14 @@ ENTRY(int3)
23150 call do_int3
23151 jmp ret_from_exception
23152 CFI_ENDPROC
23153-END(int3)
23154+ENDPROC(int3)
23155
23156 ENTRY(general_protection)
23157 RING0_EC_FRAME
23158 pushl_cfi $do_general_protection
23159 jmp error_code
23160 CFI_ENDPROC
23161-END(general_protection)
23162+ENDPROC(general_protection)
23163
23164 #ifdef CONFIG_KVM_GUEST
23165 ENTRY(async_page_fault)
23166@@ -1396,6 +1642,6 @@ ENTRY(async_page_fault)
23167 pushl_cfi $do_async_page_fault
23168 jmp error_code
23169 CFI_ENDPROC
23170-END(async_page_fault)
23171+ENDPROC(async_page_fault)
23172 #endif
23173
23174diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23175index 4bd6c19..a0eba01 100644
23176--- a/arch/x86/kernel/entry_64.S
23177+++ b/arch/x86/kernel/entry_64.S
23178@@ -46,6 +46,8 @@
23179 #include <asm/smap.h>
23180 #include <asm/pgtable_types.h>
23181 #include <linux/err.h>
23182+#include <asm/pgtable.h>
23183+#include <asm/alternative-asm.h>
23184
23185 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23186 #include <linux/elf-em.h>
23187@@ -64,6 +66,401 @@ ENTRY(native_usergs_sysret64)
23188 ENDPROC(native_usergs_sysret64)
23189 #endif /* CONFIG_PARAVIRT */
23190
23191+ .macro ljmpq sel, off
23192+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23193+ .byte 0x48; ljmp *1234f(%rip)
23194+ .pushsection .rodata
23195+ .align 16
23196+ 1234: .quad \off; .word \sel
23197+ .popsection
23198+#else
23199+ pushq $\sel
23200+ pushq $\off
23201+ lretq
23202+#endif
23203+ .endm
23204+
23205+ .macro pax_enter_kernel
23206+ pax_set_fptr_mask
23207+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23208+ call pax_enter_kernel
23209+#endif
23210+ .endm
23211+
23212+ .macro pax_exit_kernel
23213+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23214+ call pax_exit_kernel
23215+#endif
23216+ .endm
23217+
23218+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23219+ENTRY(pax_enter_kernel)
23220+ pushq %rdi
23221+
23222+#ifdef CONFIG_PARAVIRT
23223+ PV_SAVE_REGS(CLBR_RDI)
23224+#endif
23225+
23226+#ifdef CONFIG_PAX_KERNEXEC
23227+ GET_CR0_INTO_RDI
23228+ bts $X86_CR0_WP_BIT,%rdi
23229+ jnc 3f
23230+ mov %cs,%edi
23231+ cmp $__KERNEL_CS,%edi
23232+ jnz 2f
23233+1:
23234+#endif
23235+
23236+#ifdef CONFIG_PAX_MEMORY_UDEREF
23237+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23238+ GET_CR3_INTO_RDI
23239+ cmp $0,%dil
23240+ jnz 112f
23241+ mov $__KERNEL_DS,%edi
23242+ mov %edi,%ss
23243+ jmp 111f
23244+112: cmp $1,%dil
23245+ jz 113f
23246+ ud2
23247+113: sub $4097,%rdi
23248+ bts $63,%rdi
23249+ SET_RDI_INTO_CR3
23250+ mov $__UDEREF_KERNEL_DS,%edi
23251+ mov %edi,%ss
23252+111:
23253+#endif
23254+
23255+#ifdef CONFIG_PARAVIRT
23256+ PV_RESTORE_REGS(CLBR_RDI)
23257+#endif
23258+
23259+ popq %rdi
23260+ pax_force_retaddr
23261+ retq
23262+
23263+#ifdef CONFIG_PAX_KERNEXEC
23264+2: ljmpq __KERNEL_CS,1b
23265+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23266+4: SET_RDI_INTO_CR0
23267+ jmp 1b
23268+#endif
23269+ENDPROC(pax_enter_kernel)
23270+
23271+ENTRY(pax_exit_kernel)
23272+ pushq %rdi
23273+
23274+#ifdef CONFIG_PARAVIRT
23275+ PV_SAVE_REGS(CLBR_RDI)
23276+#endif
23277+
23278+#ifdef CONFIG_PAX_KERNEXEC
23279+ mov %cs,%rdi
23280+ cmp $__KERNEXEC_KERNEL_CS,%edi
23281+ jz 2f
23282+ GET_CR0_INTO_RDI
23283+ bts $X86_CR0_WP_BIT,%rdi
23284+ jnc 4f
23285+1:
23286+#endif
23287+
23288+#ifdef CONFIG_PAX_MEMORY_UDEREF
23289+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23290+ mov %ss,%edi
23291+ cmp $__UDEREF_KERNEL_DS,%edi
23292+ jnz 111f
23293+ GET_CR3_INTO_RDI
23294+ cmp $0,%dil
23295+ jz 112f
23296+ ud2
23297+112: add $4097,%rdi
23298+ bts $63,%rdi
23299+ SET_RDI_INTO_CR3
23300+ mov $__KERNEL_DS,%edi
23301+ mov %edi,%ss
23302+111:
23303+#endif
23304+
23305+#ifdef CONFIG_PARAVIRT
23306+ PV_RESTORE_REGS(CLBR_RDI);
23307+#endif
23308+
23309+ popq %rdi
23310+ pax_force_retaddr
23311+ retq
23312+
23313+#ifdef CONFIG_PAX_KERNEXEC
23314+2: GET_CR0_INTO_RDI
23315+ btr $X86_CR0_WP_BIT,%rdi
23316+ jnc 4f
23317+ ljmpq __KERNEL_CS,3f
23318+3: SET_RDI_INTO_CR0
23319+ jmp 1b
23320+4: ud2
23321+ jmp 4b
23322+#endif
23323+ENDPROC(pax_exit_kernel)
23324+#endif
23325+
23326+ .macro pax_enter_kernel_user
23327+ pax_set_fptr_mask
23328+#ifdef CONFIG_PAX_MEMORY_UDEREF
23329+ call pax_enter_kernel_user
23330+#endif
23331+ .endm
23332+
23333+ .macro pax_exit_kernel_user
23334+#ifdef CONFIG_PAX_MEMORY_UDEREF
23335+ call pax_exit_kernel_user
23336+#endif
23337+#ifdef CONFIG_PAX_RANDKSTACK
23338+ pushq %rax
23339+ pushq %r11
23340+ call pax_randomize_kstack
23341+ popq %r11
23342+ popq %rax
23343+#endif
23344+ .endm
23345+
23346+#ifdef CONFIG_PAX_MEMORY_UDEREF
23347+ENTRY(pax_enter_kernel_user)
23348+ pushq %rdi
23349+ pushq %rbx
23350+
23351+#ifdef CONFIG_PARAVIRT
23352+ PV_SAVE_REGS(CLBR_RDI)
23353+#endif
23354+
23355+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23356+ GET_CR3_INTO_RDI
23357+ cmp $1,%dil
23358+ jnz 4f
23359+ sub $4097,%rdi
23360+ bts $63,%rdi
23361+ SET_RDI_INTO_CR3
23362+ jmp 3f
23363+111:
23364+
23365+ GET_CR3_INTO_RDI
23366+ mov %rdi,%rbx
23367+ add $__START_KERNEL_map,%rbx
23368+ sub phys_base(%rip),%rbx
23369+
23370+#ifdef CONFIG_PARAVIRT
23371+ cmpl $0, pv_info+PARAVIRT_enabled
23372+ jz 1f
23373+ pushq %rdi
23374+ i = 0
23375+ .rept USER_PGD_PTRS
23376+ mov i*8(%rbx),%rsi
23377+ mov $0,%sil
23378+ lea i*8(%rbx),%rdi
23379+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23380+ i = i + 1
23381+ .endr
23382+ popq %rdi
23383+ jmp 2f
23384+1:
23385+#endif
23386+
23387+ i = 0
23388+ .rept USER_PGD_PTRS
23389+ movb $0,i*8(%rbx)
23390+ i = i + 1
23391+ .endr
23392+
23393+2: SET_RDI_INTO_CR3
23394+
23395+#ifdef CONFIG_PAX_KERNEXEC
23396+ GET_CR0_INTO_RDI
23397+ bts $X86_CR0_WP_BIT,%rdi
23398+ SET_RDI_INTO_CR0
23399+#endif
23400+
23401+3:
23402+
23403+#ifdef CONFIG_PARAVIRT
23404+ PV_RESTORE_REGS(CLBR_RDI)
23405+#endif
23406+
23407+ popq %rbx
23408+ popq %rdi
23409+ pax_force_retaddr
23410+ retq
23411+4: ud2
23412+ENDPROC(pax_enter_kernel_user)
23413+
23414+ENTRY(pax_exit_kernel_user)
23415+ pushq %rdi
23416+ pushq %rbx
23417+
23418+#ifdef CONFIG_PARAVIRT
23419+ PV_SAVE_REGS(CLBR_RDI)
23420+#endif
23421+
23422+ GET_CR3_INTO_RDI
23423+ ALTERNATIVE "jmp 1f", "", X86_FEATURE_PCID
23424+ cmp $0,%dil
23425+ jnz 3f
23426+ add $4097,%rdi
23427+ bts $63,%rdi
23428+ SET_RDI_INTO_CR3
23429+ jmp 2f
23430+1:
23431+
23432+ mov %rdi,%rbx
23433+
23434+#ifdef CONFIG_PAX_KERNEXEC
23435+ GET_CR0_INTO_RDI
23436+ btr $X86_CR0_WP_BIT,%rdi
23437+ jnc 3f
23438+ SET_RDI_INTO_CR0
23439+#endif
23440+
23441+ add $__START_KERNEL_map,%rbx
23442+ sub phys_base(%rip),%rbx
23443+
23444+#ifdef CONFIG_PARAVIRT
23445+ cmpl $0, pv_info+PARAVIRT_enabled
23446+ jz 1f
23447+ i = 0
23448+ .rept USER_PGD_PTRS
23449+ mov i*8(%rbx),%rsi
23450+ mov $0x67,%sil
23451+ lea i*8(%rbx),%rdi
23452+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23453+ i = i + 1
23454+ .endr
23455+ jmp 2f
23456+1:
23457+#endif
23458+
23459+ i = 0
23460+ .rept USER_PGD_PTRS
23461+ movb $0x67,i*8(%rbx)
23462+ i = i + 1
23463+ .endr
23464+2:
23465+
23466+#ifdef CONFIG_PARAVIRT
23467+ PV_RESTORE_REGS(CLBR_RDI)
23468+#endif
23469+
23470+ popq %rbx
23471+ popq %rdi
23472+ pax_force_retaddr
23473+ retq
23474+3: ud2
23475+ENDPROC(pax_exit_kernel_user)
23476+#endif
23477+
23478+ .macro pax_enter_kernel_nmi
23479+ pax_set_fptr_mask
23480+
23481+#ifdef CONFIG_PAX_KERNEXEC
23482+ GET_CR0_INTO_RDI
23483+ bts $X86_CR0_WP_BIT,%rdi
23484+ jc 110f
23485+ SET_RDI_INTO_CR0
23486+ or $2,%ebx
23487+110:
23488+#endif
23489+
23490+#ifdef CONFIG_PAX_MEMORY_UDEREF
23491+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23492+ GET_CR3_INTO_RDI
23493+ cmp $0,%dil
23494+ jz 111f
23495+ sub $4097,%rdi
23496+ or $4,%ebx
23497+ bts $63,%rdi
23498+ SET_RDI_INTO_CR3
23499+ mov $__UDEREF_KERNEL_DS,%edi
23500+ mov %edi,%ss
23501+111:
23502+#endif
23503+ .endm
23504+
23505+ .macro pax_exit_kernel_nmi
23506+#ifdef CONFIG_PAX_KERNEXEC
23507+ btr $1,%ebx
23508+ jnc 110f
23509+ GET_CR0_INTO_RDI
23510+ btr $X86_CR0_WP_BIT,%rdi
23511+ SET_RDI_INTO_CR0
23512+110:
23513+#endif
23514+
23515+#ifdef CONFIG_PAX_MEMORY_UDEREF
23516+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23517+ btr $2,%ebx
23518+ jnc 111f
23519+ GET_CR3_INTO_RDI
23520+ add $4097,%rdi
23521+ bts $63,%rdi
23522+ SET_RDI_INTO_CR3
23523+ mov $__KERNEL_DS,%edi
23524+ mov %edi,%ss
23525+111:
23526+#endif
23527+ .endm
23528+
23529+ .macro pax_erase_kstack
23530+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23531+ call pax_erase_kstack
23532+#endif
23533+ .endm
23534+
23535+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23536+ENTRY(pax_erase_kstack)
23537+ pushq %rdi
23538+ pushq %rcx
23539+ pushq %rax
23540+ pushq %r11
23541+
23542+ GET_THREAD_INFO(%r11)
23543+ mov TI_lowest_stack(%r11), %rdi
23544+ mov $-0xBEEF, %rax
23545+ std
23546+
23547+1: mov %edi, %ecx
23548+ and $THREAD_SIZE_asm - 1, %ecx
23549+ shr $3, %ecx
23550+ repne scasq
23551+ jecxz 2f
23552+
23553+ cmp $2*8, %ecx
23554+ jc 2f
23555+
23556+ mov $2*8, %ecx
23557+ repe scasq
23558+ jecxz 2f
23559+ jne 1b
23560+
23561+2: cld
23562+ or $2*8, %rdi
23563+ mov %esp, %ecx
23564+ sub %edi, %ecx
23565+
23566+ cmp $THREAD_SIZE_asm, %rcx
23567+ jb 3f
23568+ ud2
23569+3:
23570+
23571+ shr $3, %ecx
23572+ rep stosq
23573+
23574+ mov TI_task_thread_sp0(%r11), %rdi
23575+ sub $256, %rdi
23576+ mov %rdi, TI_lowest_stack(%r11)
23577+
23578+ popq %r11
23579+ popq %rax
23580+ popq %rcx
23581+ popq %rdi
23582+ pax_force_retaddr
23583+ ret
23584+ENDPROC(pax_erase_kstack)
23585+#endif
23586
23587 .macro TRACE_IRQS_IRETQ
23588 #ifdef CONFIG_TRACE_IRQFLAGS
23589@@ -100,7 +497,7 @@ ENDPROC(native_usergs_sysret64)
23590 .endm
23591
23592 .macro TRACE_IRQS_IRETQ_DEBUG
23593- bt $9,EFLAGS(%rsp) /* interrupts off? */
23594+ bt $X86_EFLAGS_IF_BIT,EFLAGS(%rsp) /* interrupts off? */
23595 jnc 1f
23596 TRACE_IRQS_ON_DEBUG
23597 1:
23598@@ -221,14 +618,6 @@ GLOBAL(system_call_after_swapgs)
23599 /* Construct struct pt_regs on stack */
23600 pushq_cfi $__USER_DS /* pt_regs->ss */
23601 pushq_cfi PER_CPU_VAR(rsp_scratch) /* pt_regs->sp */
23602- /*
23603- * Re-enable interrupts.
23604- * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23605- * must execute atomically in the face of possible interrupt-driven
23606- * task preemption. We must enable interrupts only after we're done
23607- * with using rsp_scratch:
23608- */
23609- ENABLE_INTERRUPTS(CLBR_NONE)
23610 pushq_cfi %r11 /* pt_regs->flags */
23611 pushq_cfi $__USER_CS /* pt_regs->cs */
23612 pushq_cfi %rcx /* pt_regs->ip */
23613@@ -246,7 +635,27 @@ GLOBAL(system_call_after_swapgs)
23614 sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */
23615 CFI_ADJUST_CFA_OFFSET 6*8
23616
23617- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23618+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
23619+ movq_cfi r12, R12
23620+#endif
23621+
23622+ pax_enter_kernel_user
23623+
23624+#ifdef CONFIG_PAX_RANDKSTACK
23625+ pax_erase_kstack
23626+#endif
23627+
23628+ /*
23629+ * Re-enable interrupts.
23630+ * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23631+ * must execute atomically in the face of possible interrupt-driven
23632+ * task preemption. We must enable interrupts only after we're done
23633+ * with using rsp_scratch:
23634+ */
23635+ ENABLE_INTERRUPTS(CLBR_NONE)
23636+
23637+ GET_THREAD_INFO(%rcx)
23638+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23639 jnz tracesys
23640 system_call_fastpath:
23641 #if __SYSCALL_MASK == ~0
23642@@ -279,10 +688,13 @@ system_call_fastpath:
23643 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23644 * very bad.
23645 */
23646- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23647+ GET_THREAD_INFO(%rcx)
23648+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23649 jnz int_ret_from_sys_call_irqs_off /* Go to the slow path */
23650
23651 CFI_REMEMBER_STATE
23652+ pax_exit_kernel_user
23653+ pax_erase_kstack
23654
23655 RESTORE_C_REGS_EXCEPT_RCX_R11
23656 movq RIP(%rsp),%rcx
23657@@ -316,6 +728,9 @@ tracesys:
23658 call syscall_trace_enter_phase1
23659 test %rax, %rax
23660 jnz tracesys_phase2 /* if needed, run the slow path */
23661+
23662+ pax_erase_kstack
23663+
23664 RESTORE_C_REGS_EXCEPT_RAX /* else restore clobbered regs */
23665 movq ORIG_RAX(%rsp), %rax
23666 jmp system_call_fastpath /* and return to the fast path */
23667@@ -327,6 +742,8 @@ tracesys_phase2:
23668 movq %rax,%rdx
23669 call syscall_trace_enter_phase2
23670
23671+ pax_erase_kstack
23672+
23673 /*
23674 * Reload registers from stack in case ptrace changed them.
23675 * We don't reload %rax because syscall_trace_entry_phase2() returned
23676@@ -364,6 +781,8 @@ GLOBAL(int_with_check)
23677 andl %edi,%edx
23678 jnz int_careful
23679 andl $~TS_COMPAT,TI_status(%rcx)
23680+ pax_exit_kernel_user
23681+ pax_erase_kstack
23682 jmp syscall_return
23683
23684 /* Either reschedule or signal or syscall exit tracking needed. */
23685@@ -485,7 +904,7 @@ opportunistic_sysret_failed:
23686 SWAPGS
23687 jmp restore_c_regs_and_iret
23688 CFI_ENDPROC
23689-END(system_call)
23690+ENDPROC(system_call)
23691
23692
23693 .macro FORK_LIKE func
23694@@ -495,7 +914,7 @@ ENTRY(stub_\func)
23695 SAVE_EXTRA_REGS 8
23696 jmp sys_\func
23697 CFI_ENDPROC
23698-END(stub_\func)
23699+ENDPROC(stub_\func)
23700 .endm
23701
23702 FORK_LIKE clone
23703@@ -519,7 +938,7 @@ return_from_execve:
23704 movq %rax,RAX(%rsp)
23705 jmp int_ret_from_sys_call
23706 CFI_ENDPROC
23707-END(stub_execve)
23708+ENDPROC(stub_execve)
23709 /*
23710 * Remaining execve stubs are only 7 bytes long.
23711 * ENTRY() often aligns to 16 bytes, which in this case has no benefits.
23712@@ -531,7 +950,7 @@ GLOBAL(stub_execveat)
23713 call sys_execveat
23714 jmp return_from_execve
23715 CFI_ENDPROC
23716-END(stub_execveat)
23717+ENDPROC(stub_execveat)
23718
23719 #ifdef CONFIG_X86_X32_ABI
23720 .align 8
23721@@ -541,7 +960,7 @@ GLOBAL(stub_x32_execve)
23722 call compat_sys_execve
23723 jmp return_from_execve
23724 CFI_ENDPROC
23725-END(stub_x32_execve)
23726+ENDPROC(stub_x32_execve)
23727 .align 8
23728 GLOBAL(stub_x32_execveat)
23729 CFI_STARTPROC
23730@@ -549,7 +968,7 @@ GLOBAL(stub_x32_execveat)
23731 call compat_sys_execveat
23732 jmp return_from_execve
23733 CFI_ENDPROC
23734-END(stub_x32_execveat)
23735+ENDPROC(stub_x32_execveat)
23736 #endif
23737
23738 #ifdef CONFIG_IA32_EMULATION
23739@@ -592,7 +1011,7 @@ return_from_stub:
23740 movq %rax,RAX(%rsp)
23741 jmp int_ret_from_sys_call
23742 CFI_ENDPROC
23743-END(stub_rt_sigreturn)
23744+ENDPROC(stub_rt_sigreturn)
23745
23746 #ifdef CONFIG_X86_X32_ABI
23747 ENTRY(stub_x32_rt_sigreturn)
23748@@ -602,7 +1021,7 @@ ENTRY(stub_x32_rt_sigreturn)
23749 call sys32_x32_rt_sigreturn
23750 jmp return_from_stub
23751 CFI_ENDPROC
23752-END(stub_x32_rt_sigreturn)
23753+ENDPROC(stub_x32_rt_sigreturn)
23754 #endif
23755
23756 /*
23757@@ -622,7 +1041,7 @@ ENTRY(ret_from_fork)
23758
23759 RESTORE_EXTRA_REGS
23760
23761- testl $3,CS(%rsp) # from kernel_thread?
23762+ testb $3,CS(%rsp) # from kernel_thread?
23763
23764 /*
23765 * By the time we get here, we have no idea whether our pt_regs,
23766@@ -641,7 +1060,7 @@ ENTRY(ret_from_fork)
23767 RESTORE_EXTRA_REGS
23768 jmp int_ret_from_sys_call
23769 CFI_ENDPROC
23770-END(ret_from_fork)
23771+ENDPROC(ret_from_fork)
23772
23773 /*
23774 * Build the entry stubs with some assembler magic.
23775@@ -659,7 +1078,7 @@ ENTRY(irq_entries_start)
23776 .align 8
23777 .endr
23778 CFI_ENDPROC
23779-END(irq_entries_start)
23780+ENDPROC(irq_entries_start)
23781
23782 /*
23783 * Interrupt entry/exit.
23784@@ -672,21 +1091,13 @@ END(irq_entries_start)
23785 /* 0(%rsp): ~(interrupt number) */
23786 .macro interrupt func
23787 cld
23788- /*
23789- * Since nothing in interrupt handling code touches r12...r15 members
23790- * of "struct pt_regs", and since interrupts can nest, we can save
23791- * four stack slots and simultaneously provide
23792- * an unwind-friendly stack layout by saving "truncated" pt_regs
23793- * exactly up to rbp slot, without these members.
23794- */
23795- ALLOC_PT_GPREGS_ON_STACK -RBP
23796- SAVE_C_REGS -RBP
23797- /* this goes to 0(%rsp) for unwinder, not for saving the value: */
23798- SAVE_EXTRA_REGS_RBP -RBP
23799+ ALLOC_PT_GPREGS_ON_STACK
23800+ SAVE_C_REGS
23801+ SAVE_EXTRA_REGS
23802
23803- leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */
23804+ movq %rsp,%rdi /* arg1 for \func (pointer to pt_regs) */
23805
23806- testl $3, CS-RBP(%rsp)
23807+ testb $3, CS(%rsp)
23808 je 1f
23809 SWAPGS
23810 1:
23811@@ -709,8 +1120,20 @@ END(irq_entries_start)
23812 CFI_ESCAPE 0x0f /* DW_CFA_def_cfa_expression */, 6, \
23813 0x77 /* DW_OP_breg7 (rsp) */, 0, \
23814 0x06 /* DW_OP_deref */, \
23815- 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS-RBP, \
23816+ 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS, \
23817 0x22 /* DW_OP_plus */
23818+
23819+#ifdef CONFIG_PAX_MEMORY_UDEREF
23820+ testb $3, CS(%rdi)
23821+ jnz 1f
23822+ pax_enter_kernel
23823+ jmp 2f
23824+1: pax_enter_kernel_user
23825+2:
23826+#else
23827+ pax_enter_kernel
23828+#endif
23829+
23830 /* We entered an interrupt context - irqs are off: */
23831 TRACE_IRQS_OFF
23832
23833@@ -735,13 +1158,12 @@ ret_from_intr:
23834
23835 /* Restore saved previous stack */
23836 popq %rsi
23837- CFI_DEF_CFA rsi,SIZEOF_PTREGS-RBP /* reg/off reset after def_cfa_expr */
23838- /* return code expects complete pt_regs - adjust rsp accordingly: */
23839- leaq -RBP(%rsi),%rsp
23840+ CFI_DEF_CFA rsi,SIZEOF_PTREGS /* reg/off reset after def_cfa_expr */
23841+ movq %rsi, %rsp
23842 CFI_DEF_CFA_REGISTER rsp
23843- CFI_ADJUST_CFA_OFFSET RBP
23844+ CFI_ADJUST_CFA_OFFSET 0
23845
23846- testl $3,CS(%rsp)
23847+ testb $3,CS(%rsp)
23848 je retint_kernel
23849 /* Interrupt came from user space */
23850
23851@@ -763,6 +1185,8 @@ retint_swapgs: /* return to user-space */
23852 * The iretq could re-enable interrupts:
23853 */
23854 DISABLE_INTERRUPTS(CLBR_ANY)
23855+ pax_exit_kernel_user
23856+# pax_erase_kstack
23857 TRACE_IRQS_IRETQ
23858
23859 SWAPGS
23860@@ -781,6 +1205,21 @@ retint_kernel:
23861 jmp 0b
23862 1:
23863 #endif
23864+
23865+ pax_exit_kernel
23866+
23867+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23868+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23869+ * namely calling EFI runtime services with a phys mapping. We're
23870+ * starting off with NOPs and patch in the real instrumentation
23871+ * (BTS/OR) before starting any userland process; even before starting
23872+ * up the APs.
23873+ */
23874+ ALTERNATIVE "", "pax_force_retaddr 16*8", X86_FEATURE_ALWAYS
23875+#else
23876+ pax_force_retaddr RIP
23877+#endif
23878+
23879 /*
23880 * The iretq could re-enable interrupts:
23881 */
23882@@ -822,15 +1261,15 @@ native_irq_return_ldt:
23883 SWAPGS
23884 movq PER_CPU_VAR(espfix_waddr),%rdi
23885 movq %rax,(0*8)(%rdi) /* RAX */
23886- movq (2*8)(%rsp),%rax /* RIP */
23887+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23888 movq %rax,(1*8)(%rdi)
23889- movq (3*8)(%rsp),%rax /* CS */
23890+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23891 movq %rax,(2*8)(%rdi)
23892- movq (4*8)(%rsp),%rax /* RFLAGS */
23893+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23894 movq %rax,(3*8)(%rdi)
23895- movq (6*8)(%rsp),%rax /* SS */
23896+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23897 movq %rax,(5*8)(%rdi)
23898- movq (5*8)(%rsp),%rax /* RSP */
23899+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23900 movq %rax,(4*8)(%rdi)
23901 andl $0xffff0000,%eax
23902 popq_cfi %rdi
23903@@ -873,7 +1312,7 @@ retint_signal:
23904 jmp retint_with_reschedule
23905
23906 CFI_ENDPROC
23907-END(common_interrupt)
23908+ENDPROC(common_interrupt)
23909
23910 /*
23911 * APIC interrupts.
23912@@ -887,7 +1326,7 @@ ENTRY(\sym)
23913 interrupt \do_sym
23914 jmp ret_from_intr
23915 CFI_ENDPROC
23916-END(\sym)
23917+ENDPROC(\sym)
23918 .endm
23919
23920 #ifdef CONFIG_TRACING
23921@@ -960,7 +1399,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23922 /*
23923 * Exception entry points.
23924 */
23925-#define CPU_TSS_IST(x) PER_CPU_VAR(cpu_tss) + (TSS_ist + ((x) - 1) * 8)
23926+#define CPU_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23927
23928 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23929 ENTRY(\sym)
23930@@ -1016,6 +1455,12 @@ ENTRY(\sym)
23931 .endif
23932
23933 .if \shift_ist != -1
23934+#ifdef CONFIG_SMP
23935+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23936+ lea cpu_tss(%r13), %r13
23937+#else
23938+ lea cpu_tss(%rip), %r13
23939+#endif
23940 subq $EXCEPTION_STKSZ, CPU_TSS_IST(\shift_ist)
23941 .endif
23942
23943@@ -1063,7 +1508,7 @@ ENTRY(\sym)
23944 .endif
23945
23946 CFI_ENDPROC
23947-END(\sym)
23948+ENDPROC(\sym)
23949 .endm
23950
23951 #ifdef CONFIG_TRACING
23952@@ -1104,9 +1549,10 @@ gs_change:
23953 2: mfence /* workaround */
23954 SWAPGS
23955 popfq_cfi
23956+ pax_force_retaddr
23957 ret
23958 CFI_ENDPROC
23959-END(native_load_gs_index)
23960+ENDPROC(native_load_gs_index)
23961
23962 _ASM_EXTABLE(gs_change,bad_gs)
23963 .section .fixup,"ax"
23964@@ -1134,9 +1580,10 @@ ENTRY(do_softirq_own_stack)
23965 CFI_DEF_CFA_REGISTER rsp
23966 CFI_ADJUST_CFA_OFFSET -8
23967 decl PER_CPU_VAR(irq_count)
23968+ pax_force_retaddr
23969 ret
23970 CFI_ENDPROC
23971-END(do_softirq_own_stack)
23972+ENDPROC(do_softirq_own_stack)
23973
23974 #ifdef CONFIG_XEN
23975 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
23976@@ -1177,7 +1624,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23977 #endif
23978 jmp error_exit
23979 CFI_ENDPROC
23980-END(xen_do_hypervisor_callback)
23981+ENDPROC(xen_do_hypervisor_callback)
23982
23983 /*
23984 * Hypervisor uses this for application faults while it executes.
23985@@ -1238,7 +1685,7 @@ ENTRY(xen_failsafe_callback)
23986 SAVE_EXTRA_REGS
23987 jmp error_exit
23988 CFI_ENDPROC
23989-END(xen_failsafe_callback)
23990+ENDPROC(xen_failsafe_callback)
23991
23992 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23993 xen_hvm_callback_vector xen_evtchn_do_upcall
23994@@ -1284,9 +1731,39 @@ ENTRY(paranoid_entry)
23995 js 1f /* negative -> in kernel */
23996 SWAPGS
23997 xorl %ebx,%ebx
23998-1: ret
23999+1:
24000+#ifdef CONFIG_PAX_MEMORY_UDEREF
24001+ testb $3, CS+8(%rsp)
24002+ jnz 1f
24003+ pax_enter_kernel
24004+ jmp 2f
24005+1: pax_enter_kernel_user
24006+2:
24007+#else
24008+ pax_enter_kernel
24009+#endif
24010+ pax_force_retaddr
24011+ ret
24012 CFI_ENDPROC
24013-END(paranoid_entry)
24014+ENDPROC(paranoid_entry)
24015+
24016+ENTRY(paranoid_entry_nmi)
24017+ XCPT_FRAME 1 15*8
24018+ cld
24019+ SAVE_C_REGS 8
24020+ SAVE_EXTRA_REGS 8
24021+ movl $1,%ebx
24022+ movl $MSR_GS_BASE,%ecx
24023+ rdmsr
24024+ testl %edx,%edx
24025+ js 1f /* negative -> in kernel */
24026+ SWAPGS
24027+ xorl %ebx,%ebx
24028+1: pax_enter_kernel_nmi
24029+ pax_force_retaddr
24030+ ret
24031+ CFI_ENDPROC
24032+ENDPROC(paranoid_entry_nmi)
24033
24034 /*
24035 * "Paranoid" exit path from exception stack. This is invoked
24036@@ -1303,20 +1780,27 @@ ENTRY(paranoid_exit)
24037 DEFAULT_FRAME
24038 DISABLE_INTERRUPTS(CLBR_NONE)
24039 TRACE_IRQS_OFF_DEBUG
24040- testl %ebx,%ebx /* swapgs needed? */
24041+ testl $1,%ebx /* swapgs needed? */
24042 jnz paranoid_exit_no_swapgs
24043+#ifdef CONFIG_PAX_MEMORY_UDEREF
24044+ pax_exit_kernel_user
24045+#else
24046+ pax_exit_kernel
24047+#endif
24048 TRACE_IRQS_IRETQ
24049 SWAPGS_UNSAFE_STACK
24050 jmp paranoid_exit_restore
24051 paranoid_exit_no_swapgs:
24052+ pax_exit_kernel
24053 TRACE_IRQS_IRETQ_DEBUG
24054 paranoid_exit_restore:
24055 RESTORE_EXTRA_REGS
24056 RESTORE_C_REGS
24057 REMOVE_PT_GPREGS_FROM_STACK 8
24058+ pax_force_retaddr_bts
24059 INTERRUPT_RETURN
24060 CFI_ENDPROC
24061-END(paranoid_exit)
24062+ENDPROC(paranoid_exit)
24063
24064 /*
24065 * Save all registers in pt_regs, and switch gs if needed.
24066@@ -1328,12 +1812,23 @@ ENTRY(error_entry)
24067 SAVE_C_REGS 8
24068 SAVE_EXTRA_REGS 8
24069 xorl %ebx,%ebx
24070- testl $3,CS+8(%rsp)
24071+ testb $3,CS+8(%rsp)
24072 je error_kernelspace
24073 error_swapgs:
24074 SWAPGS
24075 error_sti:
24076+#ifdef CONFIG_PAX_MEMORY_UDEREF
24077+ testb $3, CS+8(%rsp)
24078+ jnz 1f
24079+ pax_enter_kernel
24080+ jmp 2f
24081+1: pax_enter_kernel_user
24082+2:
24083+#else
24084+ pax_enter_kernel
24085+#endif
24086 TRACE_IRQS_OFF
24087+ pax_force_retaddr
24088 ret
24089
24090 /*
24091@@ -1368,7 +1863,7 @@ error_bad_iret:
24092 decl %ebx /* Return to usergs */
24093 jmp error_sti
24094 CFI_ENDPROC
24095-END(error_entry)
24096+ENDPROC(error_entry)
24097
24098
24099 /* On entry, ebx is "no swapgs" flag (1: don't need swapgs, 0: need it) */
24100@@ -1379,7 +1874,7 @@ ENTRY(error_exit)
24101 DISABLE_INTERRUPTS(CLBR_NONE)
24102 TRACE_IRQS_OFF
24103 GET_THREAD_INFO(%rcx)
24104- testl %eax,%eax
24105+ testl $1,%eax
24106 jne retint_kernel
24107 LOCKDEP_SYS_EXIT_IRQ
24108 movl TI_flags(%rcx),%edx
24109@@ -1388,7 +1883,7 @@ ENTRY(error_exit)
24110 jnz retint_careful
24111 jmp retint_swapgs
24112 CFI_ENDPROC
24113-END(error_exit)
24114+ENDPROC(error_exit)
24115
24116 /* Runs on exception stack */
24117 ENTRY(nmi)
24118@@ -1473,6 +1968,12 @@ ENTRY(nmi)
24119 pushq %r14 /* pt_regs->r14 */
24120 pushq %r15 /* pt_regs->r15 */
24121
24122+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24123+ xorl %ebx,%ebx
24124+#endif
24125+
24126+ pax_enter_kernel_nmi
24127+
24128 /*
24129 * At this point we no longer need to worry about stack damage
24130 * due to nesting -- we're on the normal thread stack and we're
24131@@ -1482,12 +1983,19 @@ ENTRY(nmi)
24132 movq $-1, %rsi
24133 call do_nmi
24134
24135+ pax_exit_kernel_nmi
24136+
24137 /*
24138 * Return back to user mode. We must *not* do the normal exit
24139 * work, because we don't want to enable interrupts. Fortunately,
24140 * do_nmi doesn't modify pt_regs.
24141 */
24142 SWAPGS
24143+
24144+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24145+ movq_cfi_restore RBX, rbx
24146+#endif
24147+
24148 jmp restore_c_regs_and_iret
24149
24150 .Lnmi_from_kernel:
24151@@ -1595,8 +2103,7 @@ nested_nmi:
24152 * Modify the "iret" frame to point to repeat_nmi, forcing another
24153 * iteration of NMI handling.
24154 */
24155- leaq -1*8(%rsp), %rdx
24156- movq %rdx, %rsp
24157+ subq $8, %rsp
24158 CFI_ADJUST_CFA_OFFSET 1*8
24159 leaq -10*8(%rsp), %rdx
24160 pushq_cfi $__KERNEL_DS
24161@@ -1614,6 +2121,7 @@ nested_nmi_out:
24162 CFI_RESTORE rdx
24163
24164 /* We are returning to kernel mode, so this cannot result in a fault. */
24165+# pax_force_retaddr_bts
24166 INTERRUPT_RETURN
24167
24168 CFI_RESTORE_STATE
24169@@ -1679,13 +2187,13 @@ end_repeat_nmi:
24170 ALLOC_PT_GPREGS_ON_STACK
24171
24172 /*
24173- * Use paranoid_entry to handle SWAPGS, but no need to use paranoid_exit
24174+ * Use paranoid_entry_nmi to handle SWAPGS, but no need to use paranoid_exit
24175 * as we should not be calling schedule in NMI context.
24176 * Even with normal interrupts enabled. An NMI should not be
24177 * setting NEED_RESCHED or anything that normal interrupts and
24178 * exceptions might do.
24179 */
24180- call paranoid_entry
24181+ call paranoid_entry_nmi
24182 DEFAULT_FRAME 0
24183
24184 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24185@@ -1693,7 +2201,9 @@ end_repeat_nmi:
24186 movq $-1,%rsi
24187 call do_nmi
24188
24189- testl %ebx,%ebx /* swapgs needed? */
24190+ pax_exit_kernel_nmi
24191+
24192+ testl $1,%ebx /* swapgs needed? */
24193 jnz nmi_restore
24194 nmi_swapgs:
24195 SWAPGS_UNSAFE_STACK
24196@@ -1704,6 +2214,8 @@ nmi_restore:
24197 /* Point RSP at the "iret" frame. */
24198 REMOVE_PT_GPREGS_FROM_STACK 6*8
24199
24200+ pax_force_retaddr_bts
24201+
24202 /*
24203 * Clear "NMI executing". Set DF first so that we can easily
24204 * distinguish the remaining code between here and IRET from
24205@@ -1722,12 +2234,12 @@ nmi_restore:
24206 */
24207 INTERRUPT_RETURN
24208 CFI_ENDPROC
24209-END(nmi)
24210+ENDPROC(nmi)
24211
24212 ENTRY(ignore_sysret)
24213 CFI_STARTPROC
24214 mov $-ENOSYS,%eax
24215 sysret
24216 CFI_ENDPROC
24217-END(ignore_sysret)
24218+ENDPROC(ignore_sysret)
24219
24220diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24221index f5d0730..5bce89c 100644
24222--- a/arch/x86/kernel/espfix_64.c
24223+++ b/arch/x86/kernel/espfix_64.c
24224@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24225 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24226 static void *espfix_pages[ESPFIX_MAX_PAGES];
24227
24228-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24229- __aligned(PAGE_SIZE);
24230+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24231
24232 static unsigned int page_random, slot_random;
24233
24234@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24235 void __init init_espfix_bsp(void)
24236 {
24237 pgd_t *pgd_p;
24238+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24239
24240 /* Install the espfix pud into the kernel page directory */
24241- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24242+ pgd_p = &init_level4_pgt[index];
24243 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24244
24245+#ifdef CONFIG_PAX_PER_CPU_PGD
24246+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24247+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24248+#endif
24249+
24250 /* Randomize the locations */
24251 init_espfix_random();
24252
24253@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24254 set_pte(&pte_p[n*PTE_STRIDE], pte);
24255
24256 /* Job is done for this CPU and any CPU which shares this page */
24257- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24258+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24259
24260 unlock_done:
24261 mutex_unlock(&espfix_init_mutex);
24262diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24263index 8b7b0a5..02219db 100644
24264--- a/arch/x86/kernel/ftrace.c
24265+++ b/arch/x86/kernel/ftrace.c
24266@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24267 * kernel identity mapping to modify code.
24268 */
24269 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24270- ip = (unsigned long)__va(__pa_symbol(ip));
24271+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24272
24273 return ip;
24274 }
24275@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24276 {
24277 unsigned char replaced[MCOUNT_INSN_SIZE];
24278
24279+ ip = ktla_ktva(ip);
24280+
24281 /*
24282 * Note: Due to modules and __init, code can
24283 * disappear and change, we need to protect against faulting
24284@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24285 unsigned char old[MCOUNT_INSN_SIZE];
24286 int ret;
24287
24288- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24289+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24290
24291 ftrace_update_func = ip;
24292 /* Make sure the breakpoints see the ftrace_update_func update */
24293@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24294 unsigned char replaced[MCOUNT_INSN_SIZE];
24295 unsigned char brk = BREAKPOINT_INSTRUCTION;
24296
24297- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24298+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24299 return -EFAULT;
24300
24301 /* Make sure it is what we expect it to be */
24302@@ -670,11 +672,11 @@ static unsigned char *ftrace_jmp_replace(unsigned long ip, unsigned long addr)
24303 /* Module allocation simplifies allocating memory for code */
24304 static inline void *alloc_tramp(unsigned long size)
24305 {
24306- return module_alloc(size);
24307+ return module_alloc_exec(size);
24308 }
24309 static inline void tramp_free(void *tramp)
24310 {
24311- module_memfree(tramp);
24312+ module_memfree_exec(tramp);
24313 }
24314 #else
24315 /* Trampolines can only be created if modules are supported */
24316@@ -753,7 +755,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24317 *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
24318
24319 /* Copy ftrace_caller onto the trampoline memory */
24320+ pax_open_kernel();
24321 ret = probe_kernel_read(trampoline, (void *)start_offset, size);
24322+ pax_close_kernel();
24323 if (WARN_ON(ret < 0)) {
24324 tramp_free(trampoline);
24325 return 0;
24326@@ -763,6 +767,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24327
24328 /* The trampoline ends with a jmp to ftrace_return */
24329 jmp = ftrace_jmp_replace(ip, (unsigned long)ftrace_return);
24330+ pax_open_kernel();
24331 memcpy(trampoline + size, jmp, MCOUNT_INSN_SIZE);
24332
24333 /*
24334@@ -775,6 +780,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24335
24336 ptr = (unsigned long *)(trampoline + size + MCOUNT_INSN_SIZE);
24337 *ptr = (unsigned long)ops;
24338+ pax_close_kernel();
24339
24340 op_offset -= start_offset;
24341 memcpy(&op_ptr, trampoline + op_offset, OP_REF_SIZE);
24342@@ -792,7 +798,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24343 op_ptr.offset = offset;
24344
24345 /* put in the new offset to the ftrace_ops */
24346+ pax_open_kernel();
24347 memcpy(trampoline + op_offset, &op_ptr, OP_REF_SIZE);
24348+ pax_close_kernel();
24349
24350 /* ALLOC_TRAMP flags lets us know we created it */
24351 ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
24352diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24353index f129a9a..af8f6da 100644
24354--- a/arch/x86/kernel/head64.c
24355+++ b/arch/x86/kernel/head64.c
24356@@ -68,12 +68,12 @@ again:
24357 pgd = *pgd_p;
24358
24359 /*
24360- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24361- * critical -- __PAGE_OFFSET would point us back into the dynamic
24362+ * The use of __early_va rather than __va here is critical:
24363+ * __va would point us back into the dynamic
24364 * range and we might end up looping forever...
24365 */
24366 if (pgd)
24367- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24368+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24369 else {
24370 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24371 reset_early_page_tables();
24372@@ -83,13 +83,13 @@ again:
24373 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24374 for (i = 0; i < PTRS_PER_PUD; i++)
24375 pud_p[i] = 0;
24376- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24377+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24378 }
24379 pud_p += pud_index(address);
24380 pud = *pud_p;
24381
24382 if (pud)
24383- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24384+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24385 else {
24386 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24387 reset_early_page_tables();
24388@@ -99,7 +99,7 @@ again:
24389 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24390 for (i = 0; i < PTRS_PER_PMD; i++)
24391 pmd_p[i] = 0;
24392- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24393+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24394 }
24395 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24396 pmd_p[pmd_index(address)] = pmd;
24397@@ -163,8 +163,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24398
24399 clear_bss();
24400
24401- clear_page(init_level4_pgt);
24402-
24403 kasan_early_init();
24404
24405 for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
24406diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24407index 7e429c9..7244a52 100644
24408--- a/arch/x86/kernel/head_32.S
24409+++ b/arch/x86/kernel/head_32.S
24410@@ -27,6 +27,12 @@
24411 /* Physical address */
24412 #define pa(X) ((X) - __PAGE_OFFSET)
24413
24414+#ifdef CONFIG_PAX_KERNEXEC
24415+#define ta(X) (X)
24416+#else
24417+#define ta(X) ((X) - __PAGE_OFFSET)
24418+#endif
24419+
24420 /*
24421 * References to members of the new_cpu_data structure.
24422 */
24423@@ -56,11 +62,7 @@
24424 * and small than max_low_pfn, otherwise will waste some page table entries
24425 */
24426
24427-#if PTRS_PER_PMD > 1
24428-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24429-#else
24430-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24431-#endif
24432+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24433
24434 /*
24435 * Number of possible pages in the lowmem region.
24436@@ -86,6 +88,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24437 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24438
24439 /*
24440+ * Real beginning of normal "text" segment
24441+ */
24442+ENTRY(stext)
24443+ENTRY(_stext)
24444+
24445+/*
24446 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24447 * %esi points to the real-mode code as a 32-bit pointer.
24448 * CS and DS must be 4 GB flat segments, but we don't depend on
24449@@ -93,6 +101,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24450 * can.
24451 */
24452 __HEAD
24453+
24454+#ifdef CONFIG_PAX_KERNEXEC
24455+ jmp startup_32
24456+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24457+.fill PAGE_SIZE-5,1,0xcc
24458+#endif
24459+
24460 ENTRY(startup_32)
24461 movl pa(stack_start),%ecx
24462
24463@@ -114,6 +129,59 @@ ENTRY(startup_32)
24464 2:
24465 leal -__PAGE_OFFSET(%ecx),%esp
24466
24467+#ifdef CONFIG_SMP
24468+ movl $pa(cpu_gdt_table),%edi
24469+ movl $__per_cpu_load,%eax
24470+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24471+ rorl $16,%eax
24472+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24473+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24474+ movl $__per_cpu_end - 1,%eax
24475+ subl $__per_cpu_start,%eax
24476+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24477+#endif
24478+
24479+#ifdef CONFIG_PAX_MEMORY_UDEREF
24480+ movl $NR_CPUS,%ecx
24481+ movl $pa(cpu_gdt_table),%edi
24482+1:
24483+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24484+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24485+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24486+ addl $PAGE_SIZE_asm,%edi
24487+ loop 1b
24488+#endif
24489+
24490+#ifdef CONFIG_PAX_KERNEXEC
24491+ movl $pa(boot_gdt),%edi
24492+ movl $__LOAD_PHYSICAL_ADDR,%eax
24493+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24494+ rorl $16,%eax
24495+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24496+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24497+ rorl $16,%eax
24498+
24499+ ljmp $(__BOOT_CS),$1f
24500+1:
24501+
24502+ movl $NR_CPUS,%ecx
24503+ movl $pa(cpu_gdt_table),%edi
24504+ addl $__PAGE_OFFSET,%eax
24505+1:
24506+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24507+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24508+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24509+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24510+ rorl $16,%eax
24511+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24512+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24513+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24514+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24515+ rorl $16,%eax
24516+ addl $PAGE_SIZE_asm,%edi
24517+ loop 1b
24518+#endif
24519+
24520 /*
24521 * Clear BSS first so that there are no surprises...
24522 */
24523@@ -209,8 +277,11 @@ ENTRY(startup_32)
24524 movl %eax, pa(max_pfn_mapped)
24525
24526 /* Do early initialization of the fixmap area */
24527- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24528- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24529+#ifdef CONFIG_COMPAT_VDSO
24530+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24531+#else
24532+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24533+#endif
24534 #else /* Not PAE */
24535
24536 page_pde_offset = (__PAGE_OFFSET >> 20);
24537@@ -240,8 +311,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24538 movl %eax, pa(max_pfn_mapped)
24539
24540 /* Do early initialization of the fixmap area */
24541- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24542- movl %eax,pa(initial_page_table+0xffc)
24543+#ifdef CONFIG_COMPAT_VDSO
24544+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24545+#else
24546+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24547+#endif
24548 #endif
24549
24550 #ifdef CONFIG_PARAVIRT
24551@@ -255,9 +329,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24552 cmpl $num_subarch_entries, %eax
24553 jae bad_subarch
24554
24555- movl pa(subarch_entries)(,%eax,4), %eax
24556- subl $__PAGE_OFFSET, %eax
24557- jmp *%eax
24558+ jmp *pa(subarch_entries)(,%eax,4)
24559
24560 bad_subarch:
24561 WEAK(lguest_entry)
24562@@ -269,10 +341,10 @@ WEAK(xen_entry)
24563 __INITDATA
24564
24565 subarch_entries:
24566- .long default_entry /* normal x86/PC */
24567- .long lguest_entry /* lguest hypervisor */
24568- .long xen_entry /* Xen hypervisor */
24569- .long default_entry /* Moorestown MID */
24570+ .long ta(default_entry) /* normal x86/PC */
24571+ .long ta(lguest_entry) /* lguest hypervisor */
24572+ .long ta(xen_entry) /* Xen hypervisor */
24573+ .long ta(default_entry) /* Moorestown MID */
24574 num_subarch_entries = (. - subarch_entries) / 4
24575 .previous
24576 #else
24577@@ -362,6 +434,7 @@ default_entry:
24578 movl pa(mmu_cr4_features),%eax
24579 movl %eax,%cr4
24580
24581+#ifdef CONFIG_X86_PAE
24582 testb $X86_CR4_PAE, %al # check if PAE is enabled
24583 jz enable_paging
24584
24585@@ -390,6 +463,9 @@ default_entry:
24586 /* Make changes effective */
24587 wrmsr
24588
24589+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24590+#endif
24591+
24592 enable_paging:
24593
24594 /*
24595@@ -457,14 +533,20 @@ is486:
24596 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24597 movl %eax,%ss # after changing gdt.
24598
24599- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24600+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24601 movl %eax,%ds
24602 movl %eax,%es
24603
24604 movl $(__KERNEL_PERCPU), %eax
24605 movl %eax,%fs # set this cpu's percpu
24606
24607+#ifdef CONFIG_CC_STACKPROTECTOR
24608 movl $(__KERNEL_STACK_CANARY),%eax
24609+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24610+ movl $(__USER_DS),%eax
24611+#else
24612+ xorl %eax,%eax
24613+#endif
24614 movl %eax,%gs
24615
24616 xorl %eax,%eax # Clear LDT
24617@@ -521,8 +603,11 @@ setup_once:
24618 * relocation. Manually set base address in stack canary
24619 * segment descriptor.
24620 */
24621- movl $gdt_page,%eax
24622+ movl $cpu_gdt_table,%eax
24623 movl $stack_canary,%ecx
24624+#ifdef CONFIG_SMP
24625+ addl $__per_cpu_load,%ecx
24626+#endif
24627 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24628 shrl $16, %ecx
24629 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24630@@ -559,7 +644,7 @@ early_idt_handler_common:
24631 cmpl $2,(%esp) # X86_TRAP_NMI
24632 je is_nmi # Ignore NMI
24633
24634- cmpl $2,%ss:early_recursion_flag
24635+ cmpl $1,%ss:early_recursion_flag
24636 je hlt_loop
24637 incl %ss:early_recursion_flag
24638
24639@@ -597,8 +682,8 @@ early_idt_handler_common:
24640 pushl (20+6*4)(%esp) /* trapno */
24641 pushl $fault_msg
24642 call printk
24643-#endif
24644 call dump_stack
24645+#endif
24646 hlt_loop:
24647 hlt
24648 jmp hlt_loop
24649@@ -618,8 +703,11 @@ ENDPROC(early_idt_handler_common)
24650 /* This is the default interrupt "handler" :-) */
24651 ALIGN
24652 ignore_int:
24653- cld
24654 #ifdef CONFIG_PRINTK
24655+ cmpl $2,%ss:early_recursion_flag
24656+ je hlt_loop
24657+ incl %ss:early_recursion_flag
24658+ cld
24659 pushl %eax
24660 pushl %ecx
24661 pushl %edx
24662@@ -628,9 +716,6 @@ ignore_int:
24663 movl $(__KERNEL_DS),%eax
24664 movl %eax,%ds
24665 movl %eax,%es
24666- cmpl $2,early_recursion_flag
24667- je hlt_loop
24668- incl early_recursion_flag
24669 pushl 16(%esp)
24670 pushl 24(%esp)
24671 pushl 32(%esp)
24672@@ -664,29 +749,34 @@ ENTRY(setup_once_ref)
24673 /*
24674 * BSS section
24675 */
24676-__PAGE_ALIGNED_BSS
24677- .align PAGE_SIZE
24678 #ifdef CONFIG_X86_PAE
24679+.section .initial_pg_pmd,"a",@progbits
24680 initial_pg_pmd:
24681 .fill 1024*KPMDS,4,0
24682 #else
24683+.section .initial_page_table,"a",@progbits
24684 ENTRY(initial_page_table)
24685 .fill 1024,4,0
24686 #endif
24687+.section .initial_pg_fixmap,"a",@progbits
24688 initial_pg_fixmap:
24689 .fill 1024,4,0
24690+.section .empty_zero_page,"a",@progbits
24691 ENTRY(empty_zero_page)
24692 .fill 4096,1,0
24693+.section .swapper_pg_dir,"a",@progbits
24694 ENTRY(swapper_pg_dir)
24695+#ifdef CONFIG_X86_PAE
24696+ .fill 4,8,0
24697+#else
24698 .fill 1024,4,0
24699+#endif
24700
24701 /*
24702 * This starts the data section.
24703 */
24704 #ifdef CONFIG_X86_PAE
24705-__PAGE_ALIGNED_DATA
24706- /* Page-aligned for the benefit of paravirt? */
24707- .align PAGE_SIZE
24708+.section .initial_page_table,"a",@progbits
24709 ENTRY(initial_page_table)
24710 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24711 # if KPMDS == 3
24712@@ -705,12 +795,20 @@ ENTRY(initial_page_table)
24713 # error "Kernel PMDs should be 1, 2 or 3"
24714 # endif
24715 .align PAGE_SIZE /* needs to be page-sized too */
24716+
24717+#ifdef CONFIG_PAX_PER_CPU_PGD
24718+ENTRY(cpu_pgd)
24719+ .rept 2*NR_CPUS
24720+ .fill 4,8,0
24721+ .endr
24722+#endif
24723+
24724 #endif
24725
24726 .data
24727 .balign 4
24728 ENTRY(stack_start)
24729- .long init_thread_union+THREAD_SIZE
24730+ .long init_thread_union+THREAD_SIZE-8
24731
24732 __INITRODATA
24733 int_msg:
24734@@ -738,7 +836,7 @@ fault_msg:
24735 * segment size, and 32-bit linear address value:
24736 */
24737
24738- .data
24739+.section .rodata,"a",@progbits
24740 .globl boot_gdt_descr
24741 .globl idt_descr
24742
24743@@ -747,7 +845,7 @@ fault_msg:
24744 .word 0 # 32 bit align gdt_desc.address
24745 boot_gdt_descr:
24746 .word __BOOT_DS+7
24747- .long boot_gdt - __PAGE_OFFSET
24748+ .long pa(boot_gdt)
24749
24750 .word 0 # 32-bit align idt_desc.address
24751 idt_descr:
24752@@ -758,7 +856,7 @@ idt_descr:
24753 .word 0 # 32 bit align gdt_desc.address
24754 ENTRY(early_gdt_descr)
24755 .word GDT_ENTRIES*8-1
24756- .long gdt_page /* Overwritten for secondary CPUs */
24757+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24758
24759 /*
24760 * The boot_gdt must mirror the equivalent in setup.S and is
24761@@ -767,5 +865,65 @@ ENTRY(early_gdt_descr)
24762 .align L1_CACHE_BYTES
24763 ENTRY(boot_gdt)
24764 .fill GDT_ENTRY_BOOT_CS,8,0
24765- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24766- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24767+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24768+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24769+
24770+ .align PAGE_SIZE_asm
24771+ENTRY(cpu_gdt_table)
24772+ .rept NR_CPUS
24773+ .quad 0x0000000000000000 /* NULL descriptor */
24774+ .quad 0x0000000000000000 /* 0x0b reserved */
24775+ .quad 0x0000000000000000 /* 0x13 reserved */
24776+ .quad 0x0000000000000000 /* 0x1b reserved */
24777+
24778+#ifdef CONFIG_PAX_KERNEXEC
24779+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24780+#else
24781+ .quad 0x0000000000000000 /* 0x20 unused */
24782+#endif
24783+
24784+ .quad 0x0000000000000000 /* 0x28 unused */
24785+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24786+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24787+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24788+ .quad 0x0000000000000000 /* 0x4b reserved */
24789+ .quad 0x0000000000000000 /* 0x53 reserved */
24790+ .quad 0x0000000000000000 /* 0x5b reserved */
24791+
24792+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24793+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24794+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24795+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24796+
24797+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24798+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24799+
24800+ /*
24801+ * Segments used for calling PnP BIOS have byte granularity.
24802+ * The code segments and data segments have fixed 64k limits,
24803+ * the transfer segment sizes are set at run time.
24804+ */
24805+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24806+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24807+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24808+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24809+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24810+
24811+ /*
24812+ * The APM segments have byte granularity and their bases
24813+ * are set at run time. All have 64k limits.
24814+ */
24815+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24816+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24817+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24818+
24819+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24820+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24821+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24822+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24823+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24824+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24825+
24826+ /* Be sure this is zeroed to avoid false validations in Xen */
24827+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24828+ .endr
24829diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24830index 7e5da2c..761adf1 100644
24831--- a/arch/x86/kernel/head_64.S
24832+++ b/arch/x86/kernel/head_64.S
24833@@ -20,6 +20,8 @@
24834 #include <asm/processor-flags.h>
24835 #include <asm/percpu.h>
24836 #include <asm/nops.h>
24837+#include <asm/cpufeature.h>
24838+#include <asm/alternative-asm.h>
24839
24840 #ifdef CONFIG_PARAVIRT
24841 #include <asm/asm-offsets.h>
24842@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24843 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24844 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24845 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24846+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24847+L3_VMALLOC_START = pud_index(VMALLOC_START)
24848+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24849+L3_VMALLOC_END = pud_index(VMALLOC_END)
24850+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24851+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24852
24853 .text
24854 __HEAD
24855@@ -89,11 +97,26 @@ startup_64:
24856 * Fixup the physical addresses in the page table
24857 */
24858 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24859+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24860+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24861+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24862+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24863+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24864
24865- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24866- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24867+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24868+#ifndef CONFIG_XEN
24869+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24870+#endif
24871
24872+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24873+
24874+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24875+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24876+
24877+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24878+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24879 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24880+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24881
24882 /*
24883 * Set up the identity mapping for the switchover. These
24884@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24885 * after the boot processor executes this code.
24886 */
24887
24888+ orq $-1, %rbp
24889 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24890 1:
24891
24892- /* Enable PAE mode and PGE */
24893- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24894+ /* Enable PAE mode and PSE/PGE */
24895+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24896 movq %rcx, %cr4
24897
24898 /* Setup early boot stage 4 level pagetables. */
24899@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24900 movl $MSR_EFER, %ecx
24901 rdmsr
24902 btsl $_EFER_SCE, %eax /* Enable System Call */
24903- btl $20,%edi /* No Execute supported? */
24904+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24905 jnc 1f
24906 btsl $_EFER_NX, %eax
24907+ cmpq $-1, %rbp
24908+ je 1f
24909 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24910+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24911+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24912+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24913+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24914+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24915+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24916+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24917+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24918+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24919 1: wrmsr /* Make changes effective */
24920
24921 /* Setup cr0 */
24922@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24923 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24924 * address given in m16:64.
24925 */
24926+ pax_set_fptr_mask
24927 movq initial_code(%rip),%rax
24928 pushq $0 # fake return address to stop unwinder
24929 pushq $__KERNEL_CS # set correct cs
24930@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24931 .quad INIT_PER_CPU_VAR(irq_stack_union)
24932
24933 GLOBAL(stack_start)
24934- .quad init_thread_union+THREAD_SIZE-8
24935+ .quad init_thread_union+THREAD_SIZE-16
24936 .word 0
24937 __FINITDATA
24938
24939@@ -393,7 +429,7 @@ early_idt_handler_common:
24940 call dump_stack
24941 #ifdef CONFIG_KALLSYMS
24942 leaq early_idt_ripmsg(%rip),%rdi
24943- movq 40(%rsp),%rsi # %rip again
24944+ movq 88(%rsp),%rsi # %rip again
24945 call __print_symbol
24946 #endif
24947 #endif /* EARLY_PRINTK */
24948@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
24949 early_recursion_flag:
24950 .long 0
24951
24952+ .section .rodata,"a",@progbits
24953 #ifdef CONFIG_EARLY_PRINTK
24954 early_idt_msg:
24955 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24956@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
24957 NEXT_PAGE(early_dynamic_pgts)
24958 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24959
24960- .data
24961+ .section .rodata,"a",@progbits
24962
24963-#ifndef CONFIG_XEN
24964 NEXT_PAGE(init_level4_pgt)
24965- .fill 512,8,0
24966-#else
24967-NEXT_PAGE(init_level4_pgt)
24968- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24969 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24970 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24971+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24972+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24973+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24974+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24975+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24976+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24977 .org init_level4_pgt + L4_START_KERNEL*8, 0
24978 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24979 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24980
24981+#ifdef CONFIG_PAX_PER_CPU_PGD
24982+NEXT_PAGE(cpu_pgd)
24983+ .rept 2*NR_CPUS
24984+ .fill 512,8,0
24985+ .endr
24986+#endif
24987+
24988 NEXT_PAGE(level3_ident_pgt)
24989 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24990+#ifdef CONFIG_XEN
24991 .fill 511, 8, 0
24992+#else
24993+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24994+ .fill 510,8,0
24995+#endif
24996+
24997+NEXT_PAGE(level3_vmalloc_start_pgt)
24998+ .fill 512,8,0
24999+
25000+NEXT_PAGE(level3_vmalloc_end_pgt)
25001+ .fill 512,8,0
25002+
25003+NEXT_PAGE(level3_vmemmap_pgt)
25004+ .fill L3_VMEMMAP_START,8,0
25005+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25006+
25007 NEXT_PAGE(level2_ident_pgt)
25008- /* Since I easily can, map the first 1G.
25009+ /* Since I easily can, map the first 2G.
25010 * Don't set NX because code runs from these pages.
25011 */
25012- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25013-#endif
25014+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25015
25016 NEXT_PAGE(level3_kernel_pgt)
25017 .fill L3_START_KERNEL,8,0
25018@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
25019 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25020 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25021
25022+NEXT_PAGE(level2_vmemmap_pgt)
25023+ .fill 512,8,0
25024+
25025 NEXT_PAGE(level2_kernel_pgt)
25026 /*
25027 * 512 MB kernel mapping. We spend a full page on this pagetable
25028@@ -494,31 +557,69 @@ NEXT_PAGE(level2_kernel_pgt)
25029 KERNEL_IMAGE_SIZE/PMD_SIZE)
25030
25031 NEXT_PAGE(level2_fixmap_pgt)
25032- .fill 506,8,0
25033- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25034- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25035- .fill 5,8,0
25036+ .fill 504,8,0
25037+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
25038+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
25039+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
25040+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25041+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25042+ .fill 4,8,0
25043
25044 NEXT_PAGE(level1_fixmap_pgt)
25045+ .fill 3*512,8,0
25046+
25047+NEXT_PAGE(level1_vsyscall_pgt)
25048 .fill 512,8,0
25049
25050 #undef PMDS
25051
25052- .data
25053+ .align PAGE_SIZE
25054+ENTRY(cpu_gdt_table)
25055+ .rept NR_CPUS
25056+ .quad 0x0000000000000000 /* NULL descriptor */
25057+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25058+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25059+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25060+ .quad 0x00cffb000000ffff /* __USER32_CS */
25061+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25062+ .quad 0x00affb000000ffff /* __USER_CS */
25063+
25064+#ifdef CONFIG_PAX_KERNEXEC
25065+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25066+#else
25067+ .quad 0x0 /* unused */
25068+#endif
25069+
25070+ .quad 0,0 /* TSS */
25071+ .quad 0,0 /* LDT */
25072+ .quad 0,0,0 /* three TLS descriptors */
25073+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25074+ /* asm/segment.h:GDT_ENTRIES must match this */
25075+
25076+#ifdef CONFIG_PAX_MEMORY_UDEREF
25077+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25078+#else
25079+ .quad 0x0 /* unused */
25080+#endif
25081+
25082+ /* zero the remaining page */
25083+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25084+ .endr
25085+
25086 .align 16
25087 .globl early_gdt_descr
25088 early_gdt_descr:
25089 .word GDT_ENTRIES*8-1
25090 early_gdt_descr_base:
25091- .quad INIT_PER_CPU_VAR(gdt_page)
25092+ .quad cpu_gdt_table
25093
25094 ENTRY(phys_base)
25095 /* This must match the first entry in level2_kernel_pgt */
25096 .quad 0x0000000000000000
25097
25098 #include "../../x86/xen/xen-head.S"
25099-
25100- __PAGE_ALIGNED_BSS
25101+
25102+ .section .rodata,"a",@progbits
25103 NEXT_PAGE(empty_zero_page)
25104 .skip PAGE_SIZE
25105
25106diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25107index 05fd74f..c3548b1 100644
25108--- a/arch/x86/kernel/i386_ksyms_32.c
25109+++ b/arch/x86/kernel/i386_ksyms_32.c
25110@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25111 EXPORT_SYMBOL(cmpxchg8b_emu);
25112 #endif
25113
25114+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25115+
25116 /* Networking helper routines. */
25117 EXPORT_SYMBOL(csum_partial_copy_generic);
25118+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25119+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25120
25121 EXPORT_SYMBOL(__get_user_1);
25122 EXPORT_SYMBOL(__get_user_2);
25123@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25124 EXPORT_SYMBOL(___preempt_schedule_context);
25125 #endif
25126 #endif
25127+
25128+#ifdef CONFIG_PAX_KERNEXEC
25129+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25130+#endif
25131+
25132+#ifdef CONFIG_PAX_PER_CPU_PGD
25133+EXPORT_SYMBOL(cpu_pgd);
25134+#endif
25135diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25136index e7cc537..67d7372 100644
25137--- a/arch/x86/kernel/i8259.c
25138+++ b/arch/x86/kernel/i8259.c
25139@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25140 static void make_8259A_irq(unsigned int irq)
25141 {
25142 disable_irq_nosync(irq);
25143- io_apic_irqs &= ~(1<<irq);
25144+ io_apic_irqs &= ~(1UL<<irq);
25145 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25146 enable_irq(irq);
25147 }
25148@@ -208,7 +208,7 @@ spurious_8259A_irq:
25149 "spurious 8259A interrupt: IRQ%d.\n", irq);
25150 spurious_irq_mask |= irqmask;
25151 }
25152- atomic_inc(&irq_err_count);
25153+ atomic_inc_unchecked(&irq_err_count);
25154 /*
25155 * Theoretically we do not have to handle this IRQ,
25156 * but in Linux this does not cause problems and is
25157@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25158 /* (slave's support for AEOI in flat mode is to be investigated) */
25159 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25160
25161+ pax_open_kernel();
25162 if (auto_eoi)
25163 /*
25164 * In AEOI mode we just have to mask the interrupt
25165 * when acking.
25166 */
25167- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25168+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25169 else
25170- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25171+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25172+ pax_close_kernel();
25173
25174 udelay(100); /* wait for 8259A to initialize */
25175
25176diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25177index a979b5b..1d6db75 100644
25178--- a/arch/x86/kernel/io_delay.c
25179+++ b/arch/x86/kernel/io_delay.c
25180@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25181 * Quirk table for systems that misbehave (lock up, etc.) if port
25182 * 0x80 is used:
25183 */
25184-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25185+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25186 {
25187 .callback = dmi_io_delay_0xed_port,
25188 .ident = "Compaq Presario V6000",
25189diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25190index 37dae79..620dd84 100644
25191--- a/arch/x86/kernel/ioport.c
25192+++ b/arch/x86/kernel/ioport.c
25193@@ -6,6 +6,7 @@
25194 #include <linux/sched.h>
25195 #include <linux/kernel.h>
25196 #include <linux/capability.h>
25197+#include <linux/security.h>
25198 #include <linux/errno.h>
25199 #include <linux/types.h>
25200 #include <linux/ioport.h>
25201@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25202 return -EINVAL;
25203 if (turn_on && !capable(CAP_SYS_RAWIO))
25204 return -EPERM;
25205+#ifdef CONFIG_GRKERNSEC_IO
25206+ if (turn_on && grsec_disable_privio) {
25207+ gr_handle_ioperm();
25208+ return -ENODEV;
25209+ }
25210+#endif
25211
25212 /*
25213 * If it's the first ioperm() call in this thread's lifetime, set the
25214@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25215 * because the ->io_bitmap_max value must match the bitmap
25216 * contents:
25217 */
25218- tss = &per_cpu(cpu_tss, get_cpu());
25219+ tss = cpu_tss + get_cpu();
25220
25221 if (turn_on)
25222 bitmap_clear(t->io_bitmap_ptr, from, num);
25223@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25224 if (level > old) {
25225 if (!capable(CAP_SYS_RAWIO))
25226 return -EPERM;
25227+#ifdef CONFIG_GRKERNSEC_IO
25228+ if (grsec_disable_privio) {
25229+ gr_handle_iopl();
25230+ return -ENODEV;
25231+ }
25232+#endif
25233 }
25234 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25235 t->iopl = level << 12;
25236diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25237index e5952c2..11c3a54 100644
25238--- a/arch/x86/kernel/irq.c
25239+++ b/arch/x86/kernel/irq.c
25240@@ -22,7 +22,7 @@
25241 #define CREATE_TRACE_POINTS
25242 #include <asm/trace/irq_vectors.h>
25243
25244-atomic_t irq_err_count;
25245+atomic_unchecked_t irq_err_count;
25246
25247 /* Function pointer for generic interrupt vector handling */
25248 void (*x86_platform_ipi_callback)(void) = NULL;
25249@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25250 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25251 seq_puts(p, " Hypervisor callback interrupts\n");
25252 #endif
25253- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25254+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25255 #if defined(CONFIG_X86_IO_APIC)
25256- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25257+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25258 #endif
25259 return 0;
25260 }
25261@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25262
25263 u64 arch_irq_stat(void)
25264 {
25265- u64 sum = atomic_read(&irq_err_count);
25266+ u64 sum = atomic_read_unchecked(&irq_err_count);
25267 return sum;
25268 }
25269
25270diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25271index f9fd86a..e6cc9ae 100644
25272--- a/arch/x86/kernel/irq_32.c
25273+++ b/arch/x86/kernel/irq_32.c
25274@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25275
25276 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25277
25278+extern void gr_handle_kernel_exploit(void);
25279+
25280 int sysctl_panic_on_stackoverflow __read_mostly;
25281
25282 /* Debugging check for stack overflow: is there less than 1KB free? */
25283@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25284 __asm__ __volatile__("andl %%esp,%0" :
25285 "=r" (sp) : "0" (THREAD_SIZE - 1));
25286
25287- return sp < (sizeof(struct thread_info) + STACK_WARN);
25288+ return sp < STACK_WARN;
25289 }
25290
25291 static void print_stack_overflow(void)
25292 {
25293 printk(KERN_WARNING "low stack detected by irq handler\n");
25294 dump_stack();
25295+ gr_handle_kernel_exploit();
25296 if (sysctl_panic_on_stackoverflow)
25297 panic("low stack detected by irq handler - check messages\n");
25298 }
25299@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25300 static inline int
25301 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25302 {
25303- struct irq_stack *curstk, *irqstk;
25304+ struct irq_stack *irqstk;
25305 u32 *isp, *prev_esp, arg1, arg2;
25306
25307- curstk = (struct irq_stack *) current_stack();
25308 irqstk = __this_cpu_read(hardirq_stack);
25309
25310 /*
25311@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25312 * handler) we can't do that and just have to keep using the
25313 * current stack (which is the irq stack already after all)
25314 */
25315- if (unlikely(curstk == irqstk))
25316+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25317 return 0;
25318
25319- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25320+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25321
25322 /* Save the next esp at the bottom of the stack */
25323 prev_esp = (u32 *)irqstk;
25324 *prev_esp = current_stack_pointer();
25325
25326+#ifdef CONFIG_PAX_MEMORY_UDEREF
25327+ __set_fs(MAKE_MM_SEG(0));
25328+#endif
25329+
25330 if (unlikely(overflow))
25331 call_on_stack(print_stack_overflow, isp);
25332
25333@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25334 : "0" (irq), "1" (desc), "2" (isp),
25335 "D" (desc->handle_irq)
25336 : "memory", "cc", "ecx");
25337+
25338+#ifdef CONFIG_PAX_MEMORY_UDEREF
25339+ __set_fs(current_thread_info()->addr_limit);
25340+#endif
25341+
25342 return 1;
25343 }
25344
25345@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25346 */
25347 void irq_ctx_init(int cpu)
25348 {
25349- struct irq_stack *irqstk;
25350-
25351 if (per_cpu(hardirq_stack, cpu))
25352 return;
25353
25354- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25355- THREADINFO_GFP,
25356- THREAD_SIZE_ORDER));
25357- per_cpu(hardirq_stack, cpu) = irqstk;
25358-
25359- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25360- THREADINFO_GFP,
25361- THREAD_SIZE_ORDER));
25362- per_cpu(softirq_stack, cpu) = irqstk;
25363-
25364- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25365- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25366+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25367+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25368 }
25369
25370 void do_softirq_own_stack(void)
25371 {
25372- struct thread_info *curstk;
25373 struct irq_stack *irqstk;
25374 u32 *isp, *prev_esp;
25375
25376- curstk = current_stack();
25377 irqstk = __this_cpu_read(softirq_stack);
25378
25379 /* build the stack frame on the softirq stack */
25380@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25381 prev_esp = (u32 *)irqstk;
25382 *prev_esp = current_stack_pointer();
25383
25384+#ifdef CONFIG_PAX_MEMORY_UDEREF
25385+ __set_fs(MAKE_MM_SEG(0));
25386+#endif
25387+
25388 call_on_stack(__do_softirq, isp);
25389+
25390+#ifdef CONFIG_PAX_MEMORY_UDEREF
25391+ __set_fs(current_thread_info()->addr_limit);
25392+#endif
25393+
25394 }
25395
25396 bool handle_irq(unsigned irq, struct pt_regs *regs)
25397diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25398index 394e643..824fce8 100644
25399--- a/arch/x86/kernel/irq_64.c
25400+++ b/arch/x86/kernel/irq_64.c
25401@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25402 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25403 EXPORT_PER_CPU_SYMBOL(irq_regs);
25404
25405+extern void gr_handle_kernel_exploit(void);
25406+
25407 int sysctl_panic_on_stackoverflow;
25408
25409 /*
25410@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25411 irq_stack_top, irq_stack_bottom,
25412 estack_top, estack_bottom);
25413
25414+ gr_handle_kernel_exploit();
25415+
25416 if (sysctl_panic_on_stackoverflow)
25417 panic("low stack detected by irq handler - check messages\n");
25418 #endif
25419diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25420index 26d5a55..bf8b49b 100644
25421--- a/arch/x86/kernel/jump_label.c
25422+++ b/arch/x86/kernel/jump_label.c
25423@@ -31,6 +31,8 @@ static void bug_at(unsigned char *ip, int line)
25424 * Something went wrong. Crash the box, as something could be
25425 * corrupting the kernel.
25426 */
25427+ ip = ktla_ktva(ip);
25428+ pr_warning("Unexpected op at %pS [%p] %s:%d\n", ip, ip, __FILE__, line);
25429 pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
25430 ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
25431 BUG();
25432@@ -51,7 +53,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25433 * Jump label is enabled for the first time.
25434 * So we expect a default_nop...
25435 */
25436- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25437+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25438 != 0))
25439 bug_at((void *)entry->code, __LINE__);
25440 } else {
25441@@ -59,7 +61,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25442 * ...otherwise expect an ideal_nop. Otherwise
25443 * something went horribly wrong.
25444 */
25445- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25446+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25447 != 0))
25448 bug_at((void *)entry->code, __LINE__);
25449 }
25450@@ -75,13 +77,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25451 * are converting the default nop to the ideal nop.
25452 */
25453 if (init) {
25454- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25455+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25456 bug_at((void *)entry->code, __LINE__);
25457 } else {
25458 code.jump = 0xe9;
25459 code.offset = entry->target -
25460 (entry->code + JUMP_LABEL_NOP_SIZE);
25461- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25462+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25463 bug_at((void *)entry->code, __LINE__);
25464 }
25465 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25466diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25467index d6178d9..e12482f 100644
25468--- a/arch/x86/kernel/kgdb.c
25469+++ b/arch/x86/kernel/kgdb.c
25470@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25471 bp->attr.bp_addr = breakinfo[breakno].addr;
25472 bp->attr.bp_len = breakinfo[breakno].len;
25473 bp->attr.bp_type = breakinfo[breakno].type;
25474- info->address = breakinfo[breakno].addr;
25475+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25476+ info->address = ktla_ktva(breakinfo[breakno].addr);
25477+ else
25478+ info->address = breakinfo[breakno].addr;
25479 info->len = breakinfo[breakno].len;
25480 info->type = breakinfo[breakno].type;
25481 val = arch_install_hw_breakpoint(bp);
25482@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25483 case 'k':
25484 /* clear the trace bit */
25485 linux_regs->flags &= ~X86_EFLAGS_TF;
25486- atomic_set(&kgdb_cpu_doing_single_step, -1);
25487+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25488
25489 /* set the trace bit if we're stepping */
25490 if (remcomInBuffer[0] == 's') {
25491 linux_regs->flags |= X86_EFLAGS_TF;
25492- atomic_set(&kgdb_cpu_doing_single_step,
25493+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25494 raw_smp_processor_id());
25495 }
25496
25497@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25498
25499 switch (cmd) {
25500 case DIE_DEBUG:
25501- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25502+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25503 if (user_mode(regs))
25504 return single_step_cont(regs, args);
25505 break;
25506@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25507 #endif /* CONFIG_DEBUG_RODATA */
25508
25509 bpt->type = BP_BREAKPOINT;
25510- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25511+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25512 BREAK_INSTR_SIZE);
25513 if (err)
25514 return err;
25515- err = probe_kernel_write((char *)bpt->bpt_addr,
25516+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25517 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25518 #ifdef CONFIG_DEBUG_RODATA
25519 if (!err)
25520@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25521 return -EBUSY;
25522 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25523 BREAK_INSTR_SIZE);
25524- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25525+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25526 if (err)
25527 return err;
25528 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25529@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25530 if (mutex_is_locked(&text_mutex))
25531 goto knl_write;
25532 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25533- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25534+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25535 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25536 goto knl_write;
25537 return err;
25538 knl_write:
25539 #endif /* CONFIG_DEBUG_RODATA */
25540- return probe_kernel_write((char *)bpt->bpt_addr,
25541+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25542 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25543 }
25544
25545diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25546index 1deffe6..4705700 100644
25547--- a/arch/x86/kernel/kprobes/core.c
25548+++ b/arch/x86/kernel/kprobes/core.c
25549@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25550 s32 raddr;
25551 } __packed *insn;
25552
25553- insn = (struct __arch_relative_insn *)from;
25554+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25555+
25556+ pax_open_kernel();
25557 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25558 insn->op = op;
25559+ pax_close_kernel();
25560 }
25561
25562 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25563@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25564 kprobe_opcode_t opcode;
25565 kprobe_opcode_t *orig_opcodes = opcodes;
25566
25567- if (search_exception_tables((unsigned long)opcodes))
25568+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25569 return 0; /* Page fault may occur on this address. */
25570
25571 retry:
25572@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25573 * Fortunately, we know that the original code is the ideal 5-byte
25574 * long NOP.
25575 */
25576- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25577+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25578 if (faddr)
25579 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25580 else
25581 buf[0] = kp->opcode;
25582- return (unsigned long)buf;
25583+ return ktva_ktla((unsigned long)buf);
25584 }
25585
25586 /*
25587@@ -367,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25588 /* Another subsystem puts a breakpoint, failed to recover */
25589 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25590 return 0;
25591+ pax_open_kernel();
25592 memcpy(dest, insn.kaddr, length);
25593+ pax_close_kernel();
25594
25595 #ifdef CONFIG_X86_64
25596 if (insn_rip_relative(&insn)) {
25597@@ -394,7 +399,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25598 return 0;
25599 }
25600 disp = (u8 *) dest + insn_offset_displacement(&insn);
25601+ pax_open_kernel();
25602 *(s32 *) disp = (s32) newdisp;
25603+ pax_close_kernel();
25604 }
25605 #endif
25606 return length;
25607@@ -536,7 +543,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25608 * nor set current_kprobe, because it doesn't use single
25609 * stepping.
25610 */
25611- regs->ip = (unsigned long)p->ainsn.insn;
25612+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25613 preempt_enable_no_resched();
25614 return;
25615 }
25616@@ -553,9 +560,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25617 regs->flags &= ~X86_EFLAGS_IF;
25618 /* single step inline if the instruction is an int3 */
25619 if (p->opcode == BREAKPOINT_INSTRUCTION)
25620- regs->ip = (unsigned long)p->addr;
25621+ regs->ip = ktla_ktva((unsigned long)p->addr);
25622 else
25623- regs->ip = (unsigned long)p->ainsn.insn;
25624+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25625 }
25626 NOKPROBE_SYMBOL(setup_singlestep);
25627
25628@@ -640,7 +647,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25629 setup_singlestep(p, regs, kcb, 0);
25630 return 1;
25631 }
25632- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25633+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25634 /*
25635 * The breakpoint instruction was removed right
25636 * after we hit it. Another cpu has removed
25637@@ -687,6 +694,9 @@ static void __used kretprobe_trampoline_holder(void)
25638 " movq %rax, 152(%rsp)\n"
25639 RESTORE_REGS_STRING
25640 " popfq\n"
25641+#ifdef KERNEXEC_PLUGIN
25642+ " btsq $63,(%rsp)\n"
25643+#endif
25644 #else
25645 " pushf\n"
25646 SAVE_REGS_STRING
25647@@ -827,7 +837,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25648 struct kprobe_ctlblk *kcb)
25649 {
25650 unsigned long *tos = stack_addr(regs);
25651- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25652+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25653 unsigned long orig_ip = (unsigned long)p->addr;
25654 kprobe_opcode_t *insn = p->ainsn.insn;
25655
25656diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25657index 7b3b9d1..e2478b91 100644
25658--- a/arch/x86/kernel/kprobes/opt.c
25659+++ b/arch/x86/kernel/kprobes/opt.c
25660@@ -79,6 +79,7 @@ found:
25661 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25662 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25663 {
25664+ pax_open_kernel();
25665 #ifdef CONFIG_X86_64
25666 *addr++ = 0x48;
25667 *addr++ = 0xbf;
25668@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25669 *addr++ = 0xb8;
25670 #endif
25671 *(unsigned long *)addr = val;
25672+ pax_close_kernel();
25673 }
25674
25675 asm (
25676@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25677 * Verify if the address gap is in 2GB range, because this uses
25678 * a relative jump.
25679 */
25680- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25681+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25682 if (abs(rel) > 0x7fffffff) {
25683 __arch_remove_optimized_kprobe(op, 0);
25684 return -ERANGE;
25685@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25686 op->optinsn.size = ret;
25687
25688 /* Copy arch-dep-instance from template */
25689- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25690+ pax_open_kernel();
25691+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25692+ pax_close_kernel();
25693
25694 /* Set probe information */
25695 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25696
25697 /* Set probe function call */
25698- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25699+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25700
25701 /* Set returning jmp instruction at the tail of out-of-line buffer */
25702- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25703+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25704 (u8 *)op->kp.addr + op->optinsn.size);
25705
25706 flush_icache_range((unsigned long) buf,
25707@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25708 WARN_ON(kprobe_disabled(&op->kp));
25709
25710 /* Backup instructions which will be replaced by jump address */
25711- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25712+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25713 RELATIVE_ADDR_SIZE);
25714
25715 insn_buf[0] = RELATIVEJUMP_OPCODE;
25716@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25717 /* This kprobe is really able to run optimized path. */
25718 op = container_of(p, struct optimized_kprobe, kp);
25719 /* Detour through copied instructions */
25720- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25721+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25722 if (!reenter)
25723 reset_current_kprobe();
25724 preempt_enable_no_resched();
25725diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25726index c2bedae..25e7ab60 100644
25727--- a/arch/x86/kernel/ksysfs.c
25728+++ b/arch/x86/kernel/ksysfs.c
25729@@ -184,7 +184,7 @@ out:
25730
25731 static struct kobj_attribute type_attr = __ATTR_RO(type);
25732
25733-static struct bin_attribute data_attr = {
25734+static bin_attribute_no_const data_attr __read_only = {
25735 .attr = {
25736 .name = "data",
25737 .mode = S_IRUGO,
25738diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25739index c37886d..f43b63d 100644
25740--- a/arch/x86/kernel/ldt.c
25741+++ b/arch/x86/kernel/ldt.c
25742@@ -11,6 +11,7 @@
25743 #include <linux/sched.h>
25744 #include <linux/string.h>
25745 #include <linux/mm.h>
25746+#include <linux/ratelimit.h>
25747 #include <linux/smp.h>
25748 #include <linux/vmalloc.h>
25749 #include <linux/uaccess.h>
25750@@ -20,6 +21,14 @@
25751 #include <asm/mmu_context.h>
25752 #include <asm/syscalls.h>
25753
25754+#ifdef CONFIG_GRKERNSEC
25755+int sysctl_modify_ldt __read_only = 0;
25756+#elif defined(CONFIG_DEFAULT_MODIFY_LDT_SYSCALL)
25757+int sysctl_modify_ldt __read_only = 1;
25758+#else
25759+int sysctl_modify_ldt __read_only = 0;
25760+#endif
25761+
25762 #ifdef CONFIG_SMP
25763 static void flush_ldt(void *current_mm)
25764 {
25765@@ -66,13 +75,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25766 if (reload) {
25767 #ifdef CONFIG_SMP
25768 preempt_disable();
25769- load_LDT(pc);
25770+ load_LDT_nolock(pc);
25771 if (!cpumask_equal(mm_cpumask(current->mm),
25772 cpumask_of(smp_processor_id())))
25773 smp_call_function(flush_ldt, current->mm, 1);
25774 preempt_enable();
25775 #else
25776- load_LDT(pc);
25777+ load_LDT_nolock(pc);
25778 #endif
25779 }
25780 if (oldsize) {
25781@@ -94,7 +103,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25782 return err;
25783
25784 for (i = 0; i < old->size; i++)
25785- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25786+ write_ldt_entry(new->ldt, i, old->ldt + i);
25787 return 0;
25788 }
25789
25790@@ -115,6 +124,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25791 retval = copy_ldt(&mm->context, &old_mm->context);
25792 mutex_unlock(&old_mm->context.lock);
25793 }
25794+
25795+ if (tsk == current) {
25796+ mm->context.vdso = 0;
25797+
25798+#ifdef CONFIG_X86_32
25799+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25800+ mm->context.user_cs_base = 0UL;
25801+ mm->context.user_cs_limit = ~0UL;
25802+
25803+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25804+ cpumask_clear(&mm->context.cpu_user_cs_mask);
25805+#endif
25806+
25807+#endif
25808+#endif
25809+
25810+ }
25811+
25812 return retval;
25813 }
25814
25815@@ -229,6 +256,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25816 }
25817 }
25818
25819+#ifdef CONFIG_PAX_SEGMEXEC
25820+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25821+ error = -EINVAL;
25822+ goto out_unlock;
25823+ }
25824+#endif
25825+
25826 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25827 error = -EINVAL;
25828 goto out_unlock;
25829@@ -254,6 +288,15 @@ asmlinkage int sys_modify_ldt(int func, void __user *ptr,
25830 {
25831 int ret = -ENOSYS;
25832
25833+ if (!sysctl_modify_ldt) {
25834+ printk_ratelimited(KERN_INFO
25835+ "Denied a call to modify_ldt() from %s[%d] (uid: %d)."
25836+ " Adjust sysctl if this was not an exploit attempt.\n",
25837+ current->comm, task_pid_nr(current),
25838+ from_kuid_munged(current_user_ns(), current_uid()));
25839+ return ret;
25840+ }
25841+
25842 switch (func) {
25843 case 0:
25844 ret = read_ldt(ptr, bytecount);
25845diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25846index ff3c3101d..d7c0cd8 100644
25847--- a/arch/x86/kernel/livepatch.c
25848+++ b/arch/x86/kernel/livepatch.c
25849@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25850 int ret, numpages, size = 4;
25851 bool readonly;
25852 unsigned long val;
25853- unsigned long core = (unsigned long)mod->module_core;
25854- unsigned long core_ro_size = mod->core_ro_size;
25855- unsigned long core_size = mod->core_size;
25856+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25857+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25858+ unsigned long core_size_rx = mod->core_size_rx;
25859+ unsigned long core_size_rw = mod->core_size_rw;
25860
25861 switch (type) {
25862 case R_X86_64_NONE:
25863@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25864 return -EINVAL;
25865 }
25866
25867- if (loc < core || loc >= core + core_size)
25868+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25869+ (loc < core_rw || loc >= core_rw + core_size_rw))
25870 /* loc does not point to any symbol inside the module */
25871 return -EINVAL;
25872
25873- if (loc < core + core_ro_size)
25874+ if (loc < core_rx + core_size_rx)
25875 readonly = true;
25876 else
25877 readonly = false;
25878diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25879index 469b23d..5449cfe 100644
25880--- a/arch/x86/kernel/machine_kexec_32.c
25881+++ b/arch/x86/kernel/machine_kexec_32.c
25882@@ -26,7 +26,7 @@
25883 #include <asm/cacheflush.h>
25884 #include <asm/debugreg.h>
25885
25886-static void set_idt(void *newidt, __u16 limit)
25887+static void set_idt(struct desc_struct *newidt, __u16 limit)
25888 {
25889 struct desc_ptr curidt;
25890
25891@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25892 }
25893
25894
25895-static void set_gdt(void *newgdt, __u16 limit)
25896+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25897 {
25898 struct desc_ptr curgdt;
25899
25900@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25901 }
25902
25903 control_page = page_address(image->control_code_page);
25904- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25905+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25906
25907 relocate_kernel_ptr = control_page;
25908 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25909diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25910index 94ea120..4154cea 100644
25911--- a/arch/x86/kernel/mcount_64.S
25912+++ b/arch/x86/kernel/mcount_64.S
25913@@ -7,7 +7,7 @@
25914 #include <linux/linkage.h>
25915 #include <asm/ptrace.h>
25916 #include <asm/ftrace.h>
25917-
25918+#include <asm/alternative-asm.h>
25919
25920 .code64
25921 .section .entry.text, "ax"
25922@@ -148,8 +148,9 @@
25923 #ifdef CONFIG_DYNAMIC_FTRACE
25924
25925 ENTRY(function_hook)
25926+ pax_force_retaddr
25927 retq
25928-END(function_hook)
25929+ENDPROC(function_hook)
25930
25931 ENTRY(ftrace_caller)
25932 /* save_mcount_regs fills in first two parameters */
25933@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25934 #endif
25935
25936 GLOBAL(ftrace_stub)
25937+ pax_force_retaddr
25938 retq
25939-END(ftrace_caller)
25940+ENDPROC(ftrace_caller)
25941
25942 ENTRY(ftrace_regs_caller)
25943 /* Save the current flags before any operations that can change them */
25944@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25945
25946 jmp ftrace_return
25947
25948-END(ftrace_regs_caller)
25949+ENDPROC(ftrace_regs_caller)
25950
25951
25952 #else /* ! CONFIG_DYNAMIC_FTRACE */
25953@@ -272,18 +274,20 @@ fgraph_trace:
25954 #endif
25955
25956 GLOBAL(ftrace_stub)
25957+ pax_force_retaddr
25958 retq
25959
25960 trace:
25961 /* save_mcount_regs fills in first two parameters */
25962 save_mcount_regs
25963
25964+ pax_force_fptr ftrace_trace_function
25965 call *ftrace_trace_function
25966
25967 restore_mcount_regs
25968
25969 jmp fgraph_trace
25970-END(function_hook)
25971+ENDPROC(function_hook)
25972 #endif /* CONFIG_DYNAMIC_FTRACE */
25973 #endif /* CONFIG_FUNCTION_TRACER */
25974
25975@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25976
25977 restore_mcount_regs
25978
25979+ pax_force_retaddr
25980 retq
25981-END(ftrace_graph_caller)
25982+ENDPROC(ftrace_graph_caller)
25983
25984 GLOBAL(return_to_handler)
25985 subq $24, %rsp
25986@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
25987 movq 8(%rsp), %rdx
25988 movq (%rsp), %rax
25989 addq $24, %rsp
25990+ pax_force_fptr %rdi
25991 jmp *%rdi
25992+ENDPROC(return_to_handler)
25993 #endif
25994diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25995index 005c03e..2f440cd 100644
25996--- a/arch/x86/kernel/module.c
25997+++ b/arch/x86/kernel/module.c
25998@@ -75,17 +75,17 @@ static unsigned long int get_module_load_offset(void)
25999 }
26000 #endif
26001
26002-void *module_alloc(unsigned long size)
26003+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26004 {
26005 void *p;
26006
26007- if (PAGE_ALIGN(size) > MODULES_LEN)
26008+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26009 return NULL;
26010
26011 p = __vmalloc_node_range(size, MODULE_ALIGN,
26012 MODULES_VADDR + get_module_load_offset(),
26013- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26014- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
26015+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26016+ prot, 0, NUMA_NO_NODE,
26017 __builtin_return_address(0));
26018 if (p && (kasan_module_alloc(p, size) < 0)) {
26019 vfree(p);
26020@@ -95,6 +95,51 @@ void *module_alloc(unsigned long size)
26021 return p;
26022 }
26023
26024+void *module_alloc(unsigned long size)
26025+{
26026+
26027+#ifdef CONFIG_PAX_KERNEXEC
26028+ return __module_alloc(size, PAGE_KERNEL);
26029+#else
26030+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26031+#endif
26032+
26033+}
26034+
26035+#ifdef CONFIG_PAX_KERNEXEC
26036+#ifdef CONFIG_X86_32
26037+void *module_alloc_exec(unsigned long size)
26038+{
26039+ struct vm_struct *area;
26040+
26041+ if (size == 0)
26042+ return NULL;
26043+
26044+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26045+return area ? area->addr : NULL;
26046+}
26047+EXPORT_SYMBOL(module_alloc_exec);
26048+
26049+void module_memfree_exec(void *module_region)
26050+{
26051+ vunmap(module_region);
26052+}
26053+EXPORT_SYMBOL(module_memfree_exec);
26054+#else
26055+void module_memfree_exec(void *module_region)
26056+{
26057+ module_memfree(module_region);
26058+}
26059+EXPORT_SYMBOL(module_memfree_exec);
26060+
26061+void *module_alloc_exec(unsigned long size)
26062+{
26063+ return __module_alloc(size, PAGE_KERNEL_RX);
26064+}
26065+EXPORT_SYMBOL(module_alloc_exec);
26066+#endif
26067+#endif
26068+
26069 #ifdef CONFIG_X86_32
26070 int apply_relocate(Elf32_Shdr *sechdrs,
26071 const char *strtab,
26072@@ -105,14 +150,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26073 unsigned int i;
26074 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26075 Elf32_Sym *sym;
26076- uint32_t *location;
26077+ uint32_t *plocation, location;
26078
26079 DEBUGP("Applying relocate section %u to %u\n",
26080 relsec, sechdrs[relsec].sh_info);
26081 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26082 /* This is where to make the change */
26083- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26084- + rel[i].r_offset;
26085+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26086+ location = (uint32_t)plocation;
26087+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26088+ plocation = ktla_ktva((void *)plocation);
26089 /* This is the symbol it is referring to. Note that all
26090 undefined symbols have been resolved. */
26091 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26092@@ -121,11 +168,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26093 switch (ELF32_R_TYPE(rel[i].r_info)) {
26094 case R_386_32:
26095 /* We add the value into the location given */
26096- *location += sym->st_value;
26097+ pax_open_kernel();
26098+ *plocation += sym->st_value;
26099+ pax_close_kernel();
26100 break;
26101 case R_386_PC32:
26102 /* Add the value, subtract its position */
26103- *location += sym->st_value - (uint32_t)location;
26104+ pax_open_kernel();
26105+ *plocation += sym->st_value - location;
26106+ pax_close_kernel();
26107 break;
26108 default:
26109 pr_err("%s: Unknown relocation: %u\n",
26110@@ -170,21 +221,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26111 case R_X86_64_NONE:
26112 break;
26113 case R_X86_64_64:
26114+ pax_open_kernel();
26115 *(u64 *)loc = val;
26116+ pax_close_kernel();
26117 break;
26118 case R_X86_64_32:
26119+ pax_open_kernel();
26120 *(u32 *)loc = val;
26121+ pax_close_kernel();
26122 if (val != *(u32 *)loc)
26123 goto overflow;
26124 break;
26125 case R_X86_64_32S:
26126+ pax_open_kernel();
26127 *(s32 *)loc = val;
26128+ pax_close_kernel();
26129 if ((s64)val != *(s32 *)loc)
26130 goto overflow;
26131 break;
26132 case R_X86_64_PC32:
26133 val -= (u64)loc;
26134+ pax_open_kernel();
26135 *(u32 *)loc = val;
26136+ pax_close_kernel();
26137+
26138 #if 0
26139 if ((s64)val != *(s32 *)loc)
26140 goto overflow;
26141diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26142index 113e707..0a690e1 100644
26143--- a/arch/x86/kernel/msr.c
26144+++ b/arch/x86/kernel/msr.c
26145@@ -39,6 +39,7 @@
26146 #include <linux/notifier.h>
26147 #include <linux/uaccess.h>
26148 #include <linux/gfp.h>
26149+#include <linux/grsecurity.h>
26150
26151 #include <asm/processor.h>
26152 #include <asm/msr.h>
26153@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26154 int err = 0;
26155 ssize_t bytes = 0;
26156
26157+#ifdef CONFIG_GRKERNSEC_KMEM
26158+ gr_handle_msr_write();
26159+ return -EPERM;
26160+#endif
26161+
26162 if (count % 8)
26163 return -EINVAL; /* Invalid chunk size */
26164
26165@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26166 err = -EBADF;
26167 break;
26168 }
26169+#ifdef CONFIG_GRKERNSEC_KMEM
26170+ gr_handle_msr_write();
26171+ return -EPERM;
26172+#endif
26173 if (copy_from_user(&regs, uregs, sizeof regs)) {
26174 err = -EFAULT;
26175 break;
26176@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26177 return notifier_from_errno(err);
26178 }
26179
26180-static struct notifier_block __refdata msr_class_cpu_notifier = {
26181+static struct notifier_block msr_class_cpu_notifier = {
26182 .notifier_call = msr_class_cpu_callback,
26183 };
26184
26185diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26186index d05bd2e..f690edd 100644
26187--- a/arch/x86/kernel/nmi.c
26188+++ b/arch/x86/kernel/nmi.c
26189@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26190
26191 static void nmi_max_handler(struct irq_work *w)
26192 {
26193- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26194+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26195 int remainder_ns, decimal_msecs;
26196- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26197+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26198
26199 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26200 decimal_msecs = remainder_ns / 1000;
26201
26202 printk_ratelimited(KERN_INFO
26203 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26204- a->handler, whole_msecs, decimal_msecs);
26205+ n->action->handler, whole_msecs, decimal_msecs);
26206 }
26207
26208 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26209@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26210 delta = sched_clock() - delta;
26211 trace_nmi_handler(a->handler, (int)delta, thishandled);
26212
26213- if (delta < nmi_longest_ns || delta < a->max_duration)
26214+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26215 continue;
26216
26217- a->max_duration = delta;
26218- irq_work_queue(&a->irq_work);
26219+ a->work->max_duration = delta;
26220+ irq_work_queue(&a->work->irq_work);
26221 }
26222
26223 rcu_read_unlock();
26224@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26225 }
26226 NOKPROBE_SYMBOL(nmi_handle);
26227
26228-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26229+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26230 {
26231 struct nmi_desc *desc = nmi_to_desc(type);
26232 unsigned long flags;
26233@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26234 if (!action->handler)
26235 return -EINVAL;
26236
26237- init_irq_work(&action->irq_work, nmi_max_handler);
26238+ action->work->action = action;
26239+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26240
26241 spin_lock_irqsave(&desc->lock, flags);
26242
26243@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26244 * event confuses some handlers (kdump uses this flag)
26245 */
26246 if (action->flags & NMI_FLAG_FIRST)
26247- list_add_rcu(&action->list, &desc->head);
26248+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26249 else
26250- list_add_tail_rcu(&action->list, &desc->head);
26251+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26252
26253 spin_unlock_irqrestore(&desc->lock, flags);
26254 return 0;
26255@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26256 if (!strcmp(n->name, name)) {
26257 WARN(in_nmi(),
26258 "Trying to free NMI (%s) from NMI context!\n", n->name);
26259- list_del_rcu(&n->list);
26260+ pax_list_del_rcu((struct list_head *)&n->list);
26261 break;
26262 }
26263 }
26264@@ -481,6 +482,17 @@ static DEFINE_PER_CPU(int, update_debug_stack);
26265 dotraplinkage notrace void
26266 do_nmi(struct pt_regs *regs, long error_code)
26267 {
26268+
26269+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26270+ if (!user_mode(regs)) {
26271+ unsigned long cs = regs->cs & 0xFFFF;
26272+ unsigned long ip = ktva_ktla(regs->ip);
26273+
26274+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26275+ regs->ip = ip;
26276+ }
26277+#endif
26278+
26279 if (this_cpu_read(nmi_state) != NMI_NOT_RUNNING) {
26280 this_cpu_write(nmi_state, NMI_LATCHED);
26281 return;
26282diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26283index 6d9582e..f746287 100644
26284--- a/arch/x86/kernel/nmi_selftest.c
26285+++ b/arch/x86/kernel/nmi_selftest.c
26286@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26287 {
26288 /* trap all the unknown NMIs we may generate */
26289 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26290- __initdata);
26291+ __initconst);
26292 }
26293
26294 static void __init cleanup_nmi_testsuite(void)
26295@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26296 unsigned long timeout;
26297
26298 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26299- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26300+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26301 nmi_fail = FAILURE;
26302 return;
26303 }
26304diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26305index bbb6c73..24a58ef 100644
26306--- a/arch/x86/kernel/paravirt-spinlocks.c
26307+++ b/arch/x86/kernel/paravirt-spinlocks.c
26308@@ -8,7 +8,7 @@
26309
26310 #include <asm/paravirt.h>
26311
26312-struct pv_lock_ops pv_lock_ops = {
26313+struct pv_lock_ops pv_lock_ops __read_only = {
26314 #ifdef CONFIG_SMP
26315 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26316 .unlock_kick = paravirt_nop,
26317diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26318index c614dd4..9ad659e 100644
26319--- a/arch/x86/kernel/paravirt.c
26320+++ b/arch/x86/kernel/paravirt.c
26321@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26322 {
26323 return x;
26324 }
26325+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26326+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26327+#endif
26328
26329 void __init default_banner(void)
26330 {
26331@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26332
26333 if (opfunc == NULL)
26334 /* If there's no function, patch it with a ud2a (BUG) */
26335- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26336- else if (opfunc == _paravirt_nop)
26337+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26338+ else if (opfunc == (void *)_paravirt_nop)
26339 /* If the operation is a nop, then nop the callsite */
26340 ret = paravirt_patch_nop();
26341
26342 /* identity functions just return their single argument */
26343- else if (opfunc == _paravirt_ident_32)
26344+ else if (opfunc == (void *)_paravirt_ident_32)
26345 ret = paravirt_patch_ident_32(insnbuf, len);
26346- else if (opfunc == _paravirt_ident_64)
26347+ else if (opfunc == (void *)_paravirt_ident_64)
26348 ret = paravirt_patch_ident_64(insnbuf, len);
26349+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26350+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26351+ ret = paravirt_patch_ident_64(insnbuf, len);
26352+#endif
26353
26354 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26355 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26356@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26357 if (insn_len > len || start == NULL)
26358 insn_len = len;
26359 else
26360- memcpy(insnbuf, start, insn_len);
26361+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26362
26363 return insn_len;
26364 }
26365@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26366 return this_cpu_read(paravirt_lazy_mode);
26367 }
26368
26369-struct pv_info pv_info = {
26370+struct pv_info pv_info __read_only = {
26371 .name = "bare hardware",
26372 .paravirt_enabled = 0,
26373 .kernel_rpl = 0,
26374@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26375 #endif
26376 };
26377
26378-struct pv_init_ops pv_init_ops = {
26379+struct pv_init_ops pv_init_ops __read_only = {
26380 .patch = native_patch,
26381 };
26382
26383-struct pv_time_ops pv_time_ops = {
26384+struct pv_time_ops pv_time_ops __read_only = {
26385 .sched_clock = native_sched_clock,
26386 .steal_clock = native_steal_clock,
26387 };
26388
26389-__visible struct pv_irq_ops pv_irq_ops = {
26390+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26391 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26392 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26393 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26394@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26395 #endif
26396 };
26397
26398-__visible struct pv_cpu_ops pv_cpu_ops = {
26399+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26400 .cpuid = native_cpuid,
26401 .get_debugreg = native_get_debugreg,
26402 .set_debugreg = native_set_debugreg,
26403@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26404 NOKPROBE_SYMBOL(native_set_debugreg);
26405 NOKPROBE_SYMBOL(native_load_idt);
26406
26407-struct pv_apic_ops pv_apic_ops = {
26408+struct pv_apic_ops pv_apic_ops __read_only= {
26409 #ifdef CONFIG_X86_LOCAL_APIC
26410 .startup_ipi_hook = paravirt_nop,
26411 #endif
26412 };
26413
26414-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26415+#ifdef CONFIG_X86_32
26416+#ifdef CONFIG_X86_PAE
26417+/* 64-bit pagetable entries */
26418+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26419+#else
26420 /* 32-bit pagetable entries */
26421 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26422+#endif
26423 #else
26424 /* 64-bit pagetable entries */
26425 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26426 #endif
26427
26428-struct pv_mmu_ops pv_mmu_ops = {
26429+struct pv_mmu_ops pv_mmu_ops __read_only = {
26430
26431 .read_cr2 = native_read_cr2,
26432 .write_cr2 = native_write_cr2,
26433@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26434 .make_pud = PTE_IDENT,
26435
26436 .set_pgd = native_set_pgd,
26437+ .set_pgd_batched = native_set_pgd_batched,
26438 #endif
26439 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
26440
26441@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26442 },
26443
26444 .set_fixmap = native_set_fixmap,
26445+
26446+#ifdef CONFIG_PAX_KERNEXEC
26447+ .pax_open_kernel = native_pax_open_kernel,
26448+ .pax_close_kernel = native_pax_close_kernel,
26449+#endif
26450+
26451 };
26452
26453 EXPORT_SYMBOL_GPL(pv_time_ops);
26454diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26455index a1da673..b6f5831 100644
26456--- a/arch/x86/kernel/paravirt_patch_64.c
26457+++ b/arch/x86/kernel/paravirt_patch_64.c
26458@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26459 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26460 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26461 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26462+
26463+#ifndef CONFIG_PAX_MEMORY_UDEREF
26464 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26465+#endif
26466+
26467 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26468 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26469
26470@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26471 PATCH_SITE(pv_mmu_ops, read_cr3);
26472 PATCH_SITE(pv_mmu_ops, write_cr3);
26473 PATCH_SITE(pv_cpu_ops, clts);
26474+
26475+#ifndef CONFIG_PAX_MEMORY_UDEREF
26476 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26477+#endif
26478+
26479 PATCH_SITE(pv_cpu_ops, wbinvd);
26480
26481 patch_site:
26482diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26483index 0497f71..7186c0d 100644
26484--- a/arch/x86/kernel/pci-calgary_64.c
26485+++ b/arch/x86/kernel/pci-calgary_64.c
26486@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26487 tce_space = be64_to_cpu(readq(target));
26488 tce_space = tce_space & TAR_SW_BITS;
26489
26490- tce_space = tce_space & (~specified_table_size);
26491+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26492 info->tce_space = (u64 *)__va(tce_space);
26493 }
26494 }
26495diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26496index 35ccf75..7a15747 100644
26497--- a/arch/x86/kernel/pci-iommu_table.c
26498+++ b/arch/x86/kernel/pci-iommu_table.c
26499@@ -2,7 +2,7 @@
26500 #include <asm/iommu_table.h>
26501 #include <linux/string.h>
26502 #include <linux/kallsyms.h>
26503-
26504+#include <linux/sched.h>
26505
26506 #define DEBUG 1
26507
26508diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26509index 77dd0ad..9ec4723 100644
26510--- a/arch/x86/kernel/pci-swiotlb.c
26511+++ b/arch/x86/kernel/pci-swiotlb.c
26512@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26513 struct dma_attrs *attrs)
26514 {
26515 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26516- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26517+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26518 else
26519 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26520 }
26521diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26522index 9717437..44bc9aa 100644
26523--- a/arch/x86/kernel/process.c
26524+++ b/arch/x86/kernel/process.c
26525@@ -38,7 +38,8 @@
26526 * section. Since TSS's are completely CPU-local, we want them
26527 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26528 */
26529-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26530+struct tss_struct cpu_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = {
26531+ [0 ... NR_CPUS-1] = {
26532 .x86_tss = {
26533 .sp0 = TOP_OF_INIT_STACK,
26534 #ifdef CONFIG_X86_32
26535@@ -56,6 +57,7 @@ __visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26536 */
26537 .io_bitmap = { [0 ... IO_BITMAP_LONGS] = ~0 },
26538 #endif
26539+}
26540 };
26541 EXPORT_PER_CPU_SYMBOL(cpu_tss);
26542
26543@@ -115,7 +117,7 @@ void arch_task_cache_init(void)
26544 task_xstate_cachep =
26545 kmem_cache_create("task_xstate", xstate_size,
26546 __alignof__(union thread_xstate),
26547- SLAB_PANIC | SLAB_NOTRACK, NULL);
26548+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26549 setup_xstate_comp();
26550 }
26551
26552@@ -129,7 +131,7 @@ void exit_thread(void)
26553 unsigned long *bp = t->io_bitmap_ptr;
26554
26555 if (bp) {
26556- struct tss_struct *tss = &per_cpu(cpu_tss, get_cpu());
26557+ struct tss_struct *tss = cpu_tss + get_cpu();
26558
26559 t->io_bitmap_ptr = NULL;
26560 clear_thread_flag(TIF_IO_BITMAP);
26561@@ -149,6 +151,9 @@ void flush_thread(void)
26562 {
26563 struct task_struct *tsk = current;
26564
26565+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26566+ loadsegment(gs, 0);
26567+#endif
26568 flush_ptrace_hw_breakpoint(tsk);
26569 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26570
26571@@ -302,7 +307,7 @@ static void __exit_idle(void)
26572 void exit_idle(void)
26573 {
26574 /* idle loop has pid 0 */
26575- if (current->pid)
26576+ if (task_pid_nr(current))
26577 return;
26578 __exit_idle();
26579 }
26580@@ -355,7 +360,7 @@ bool xen_set_default_idle(void)
26581 return ret;
26582 }
26583 #endif
26584-void stop_this_cpu(void *dummy)
26585+__noreturn void stop_this_cpu(void *dummy)
26586 {
26587 local_irq_disable();
26588 /*
26589@@ -533,16 +538,43 @@ static int __init idle_setup(char *str)
26590 }
26591 early_param("idle", idle_setup);
26592
26593-unsigned long arch_align_stack(unsigned long sp)
26594-{
26595- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26596- sp -= get_random_int() % 8192;
26597- return sp & ~0xf;
26598-}
26599-
26600 unsigned long arch_randomize_brk(struct mm_struct *mm)
26601 {
26602 unsigned long range_end = mm->brk + 0x02000000;
26603 return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26604 }
26605
26606+#ifdef CONFIG_PAX_RANDKSTACK
26607+void pax_randomize_kstack(struct pt_regs *regs)
26608+{
26609+ struct thread_struct *thread = &current->thread;
26610+ unsigned long time;
26611+
26612+ if (!randomize_va_space)
26613+ return;
26614+
26615+ if (v8086_mode(regs))
26616+ return;
26617+
26618+ rdtscl(time);
26619+
26620+ /* P4 seems to return a 0 LSB, ignore it */
26621+#ifdef CONFIG_MPENTIUM4
26622+ time &= 0x3EUL;
26623+ time <<= 2;
26624+#elif defined(CONFIG_X86_64)
26625+ time &= 0xFUL;
26626+ time <<= 4;
26627+#else
26628+ time &= 0x1FUL;
26629+ time <<= 3;
26630+#endif
26631+
26632+ thread->sp0 ^= time;
26633+ load_sp0(cpu_tss + smp_processor_id(), thread);
26634+
26635+#ifdef CONFIG_X86_64
26636+ this_cpu_write(kernel_stack, thread->sp0);
26637+#endif
26638+}
26639+#endif
26640diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26641index 8ed2106..1345704 100644
26642--- a/arch/x86/kernel/process_32.c
26643+++ b/arch/x86/kernel/process_32.c
26644@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26645 unsigned long thread_saved_pc(struct task_struct *tsk)
26646 {
26647 return ((unsigned long *)tsk->thread.sp)[3];
26648+//XXX return tsk->thread.eip;
26649 }
26650
26651 void __show_regs(struct pt_regs *regs, int all)
26652@@ -76,16 +77,15 @@ void __show_regs(struct pt_regs *regs, int all)
26653 if (user_mode(regs)) {
26654 sp = regs->sp;
26655 ss = regs->ss & 0xffff;
26656- gs = get_user_gs(regs);
26657 } else {
26658 sp = kernel_stack_pointer(regs);
26659 savesegment(ss, ss);
26660- savesegment(gs, gs);
26661 }
26662+ gs = get_user_gs(regs);
26663
26664 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26665 (u16)regs->cs, regs->ip, regs->flags,
26666- smp_processor_id());
26667+ raw_smp_processor_id());
26668 print_symbol("EIP is at %s\n", regs->ip);
26669
26670 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26671@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26672 int copy_thread(unsigned long clone_flags, unsigned long sp,
26673 unsigned long arg, struct task_struct *p)
26674 {
26675- struct pt_regs *childregs = task_pt_regs(p);
26676+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26677 struct task_struct *tsk;
26678 int err;
26679
26680 p->thread.sp = (unsigned long) childregs;
26681 p->thread.sp0 = (unsigned long) (childregs+1);
26682+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26683 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26684
26685 if (unlikely(p->flags & PF_KTHREAD)) {
26686 /* kernel thread */
26687 memset(childregs, 0, sizeof(struct pt_regs));
26688 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26689- task_user_gs(p) = __KERNEL_STACK_CANARY;
26690- childregs->ds = __USER_DS;
26691- childregs->es = __USER_DS;
26692+ savesegment(gs, childregs->gs);
26693+ childregs->ds = __KERNEL_DS;
26694+ childregs->es = __KERNEL_DS;
26695 childregs->fs = __KERNEL_PERCPU;
26696 childregs->bx = sp; /* function */
26697 childregs->bp = arg;
26698@@ -244,7 +245,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26699 struct thread_struct *prev = &prev_p->thread,
26700 *next = &next_p->thread;
26701 int cpu = smp_processor_id();
26702- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
26703+ struct tss_struct *tss = cpu_tss + cpu;
26704 fpu_switch_t fpu;
26705
26706 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26707@@ -263,6 +264,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26708 */
26709 lazy_save_gs(prev->gs);
26710
26711+#ifdef CONFIG_PAX_MEMORY_UDEREF
26712+ __set_fs(task_thread_info(next_p)->addr_limit);
26713+#endif
26714+
26715 /*
26716 * Load the per-thread Thread-Local Storage descriptor.
26717 */
26718@@ -306,12 +311,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26719 * current_thread_info().
26720 */
26721 load_sp0(tss, next);
26722- this_cpu_write(kernel_stack,
26723- (unsigned long)task_stack_page(next_p) +
26724- THREAD_SIZE);
26725- this_cpu_write(cpu_current_top_of_stack,
26726- (unsigned long)task_stack_page(next_p) +
26727- THREAD_SIZE);
26728+ this_cpu_write(current_task, next_p);
26729+ this_cpu_write(current_tinfo, &next_p->tinfo);
26730+ this_cpu_write(kernel_stack, next->sp0);
26731+ this_cpu_write(cpu_current_top_of_stack, next->sp0);
26732
26733 /*
26734 * Restore %gs if needed (which is common)
26735@@ -321,8 +324,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26736
26737 switch_fpu_finish(next_p, fpu);
26738
26739- this_cpu_write(current_task, next_p);
26740-
26741 return prev_p;
26742 }
26743
26744@@ -352,4 +353,3 @@ unsigned long get_wchan(struct task_struct *p)
26745 } while (count++ < 16);
26746 return 0;
26747 }
26748-
26749diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26750index ddfdbf7..625417c 100644
26751--- a/arch/x86/kernel/process_64.c
26752+++ b/arch/x86/kernel/process_64.c
26753@@ -158,9 +158,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26754 struct pt_regs *childregs;
26755 struct task_struct *me = current;
26756
26757- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26758+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26759 childregs = task_pt_regs(p);
26760 p->thread.sp = (unsigned long) childregs;
26761+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26762 set_tsk_thread_flag(p, TIF_FORK);
26763 p->thread.io_bitmap_ptr = NULL;
26764
26765@@ -170,6 +171,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26766 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26767 savesegment(es, p->thread.es);
26768 savesegment(ds, p->thread.ds);
26769+ savesegment(ss, p->thread.ss);
26770+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26771 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26772
26773 if (unlikely(p->flags & PF_KTHREAD)) {
26774@@ -275,7 +278,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26775 struct thread_struct *prev = &prev_p->thread;
26776 struct thread_struct *next = &next_p->thread;
26777 int cpu = smp_processor_id();
26778- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
26779+ struct tss_struct *tss = cpu_tss + cpu;
26780 unsigned fsindex, gsindex;
26781 fpu_switch_t fpu;
26782
26783@@ -326,6 +329,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26784 if (unlikely(next->ds | prev->ds))
26785 loadsegment(ds, next->ds);
26786
26787+ savesegment(ss, prev->ss);
26788+ if (unlikely(next->ss != prev->ss))
26789+ loadsegment(ss, next->ss);
26790+
26791 /*
26792 * Switch FS and GS.
26793 *
26794@@ -397,6 +404,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26795 * Switch the PDA and FPU contexts.
26796 */
26797 this_cpu_write(current_task, next_p);
26798+ this_cpu_write(current_tinfo, &next_p->tinfo);
26799
26800 /*
26801 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26802@@ -409,8 +417,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26803 /* Reload esp0 and ss1. This changes current_thread_info(). */
26804 load_sp0(tss, next);
26805
26806- this_cpu_write(kernel_stack,
26807- (unsigned long)task_stack_page(next_p) + THREAD_SIZE);
26808+ this_cpu_write(kernel_stack, next->sp0);
26809
26810 /*
26811 * Now maybe reload the debug registers and handle I/O bitmaps
26812@@ -508,12 +515,11 @@ unsigned long get_wchan(struct task_struct *p)
26813 if (!p || p == current || p->state == TASK_RUNNING)
26814 return 0;
26815 stack = (unsigned long)task_stack_page(p);
26816- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26817+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26818 return 0;
26819 fp = *(u64 *)(p->thread.sp);
26820 do {
26821- if (fp < (unsigned long)stack ||
26822- fp >= (unsigned long)stack+THREAD_SIZE)
26823+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26824 return 0;
26825 ip = *(u64 *)(fp+8);
26826 if (!in_sched_functions(ip))
26827diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26828index a7bc794..094ee8e 100644
26829--- a/arch/x86/kernel/ptrace.c
26830+++ b/arch/x86/kernel/ptrace.c
26831@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26832 unsigned long sp = (unsigned long)&regs->sp;
26833 u32 *prev_esp;
26834
26835- if (context == (sp & ~(THREAD_SIZE - 1)))
26836+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26837 return sp;
26838
26839- prev_esp = (u32 *)(context);
26840+ prev_esp = *(u32 **)(context);
26841 if (prev_esp)
26842 return (unsigned long)prev_esp;
26843
26844@@ -446,6 +446,20 @@ static int putreg(struct task_struct *child,
26845 if (child->thread.gs != value)
26846 return do_arch_prctl(child, ARCH_SET_GS, value);
26847 return 0;
26848+
26849+ case offsetof(struct user_regs_struct,ip):
26850+ /*
26851+ * Protect against any attempt to set ip to an
26852+ * impossible address. There are dragons lurking if the
26853+ * address is noncanonical. (This explicitly allows
26854+ * setting ip to TASK_SIZE_MAX, because user code can do
26855+ * that all by itself by running off the end of its
26856+ * address space.
26857+ */
26858+ if (value > TASK_SIZE_MAX)
26859+ return -EIO;
26860+ break;
26861+
26862 #endif
26863 }
26864
26865@@ -582,7 +596,7 @@ static void ptrace_triggered(struct perf_event *bp,
26866 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26867 {
26868 int i;
26869- int dr7 = 0;
26870+ unsigned long dr7 = 0;
26871 struct arch_hw_breakpoint *info;
26872
26873 for (i = 0; i < HBP_NUM; i++) {
26874@@ -816,7 +830,7 @@ long arch_ptrace(struct task_struct *child, long request,
26875 unsigned long addr, unsigned long data)
26876 {
26877 int ret;
26878- unsigned long __user *datap = (unsigned long __user *)data;
26879+ unsigned long __user *datap = (__force unsigned long __user *)data;
26880
26881 switch (request) {
26882 /* read the word at location addr in the USER area. */
26883@@ -901,14 +915,14 @@ long arch_ptrace(struct task_struct *child, long request,
26884 if ((int) addr < 0)
26885 return -EIO;
26886 ret = do_get_thread_area(child, addr,
26887- (struct user_desc __user *)data);
26888+ (__force struct user_desc __user *) data);
26889 break;
26890
26891 case PTRACE_SET_THREAD_AREA:
26892 if ((int) addr < 0)
26893 return -EIO;
26894 ret = do_set_thread_area(child, addr,
26895- (struct user_desc __user *)data, 0);
26896+ (__force struct user_desc __user *) data, 0);
26897 break;
26898 #endif
26899
26900@@ -1286,7 +1300,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26901
26902 #ifdef CONFIG_X86_64
26903
26904-static struct user_regset x86_64_regsets[] __read_mostly = {
26905+static user_regset_no_const x86_64_regsets[] __read_only = {
26906 [REGSET_GENERAL] = {
26907 .core_note_type = NT_PRSTATUS,
26908 .n = sizeof(struct user_regs_struct) / sizeof(long),
26909@@ -1327,7 +1341,7 @@ static const struct user_regset_view user_x86_64_view = {
26910 #endif /* CONFIG_X86_64 */
26911
26912 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26913-static struct user_regset x86_32_regsets[] __read_mostly = {
26914+static user_regset_no_const x86_32_regsets[] __read_only = {
26915 [REGSET_GENERAL] = {
26916 .core_note_type = NT_PRSTATUS,
26917 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26918@@ -1380,7 +1394,7 @@ static const struct user_regset_view user_x86_32_view = {
26919 */
26920 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26921
26922-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26923+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26924 {
26925 #ifdef CONFIG_X86_64
26926 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26927@@ -1415,7 +1429,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26928 memset(info, 0, sizeof(*info));
26929 info->si_signo = SIGTRAP;
26930 info->si_code = si_code;
26931- info->si_addr = user_mode(regs) ? (void __user *)regs->ip : NULL;
26932+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26933 }
26934
26935 void user_single_step_siginfo(struct task_struct *tsk,
26936@@ -1449,6 +1463,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26937 }
26938 }
26939
26940+#ifdef CONFIG_GRKERNSEC_SETXID
26941+extern void gr_delayed_cred_worker(void);
26942+#endif
26943+
26944 /*
26945 * We can return 0 to resume the syscall or anything else to go to phase
26946 * 2. If we resume the syscall, we need to put something appropriate in
26947@@ -1556,6 +1574,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26948
26949 BUG_ON(regs != task_pt_regs(current));
26950
26951+#ifdef CONFIG_GRKERNSEC_SETXID
26952+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26953+ gr_delayed_cred_worker();
26954+#endif
26955+
26956 /*
26957 * If we stepped into a sysenter/syscall insn, it trapped in
26958 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26959@@ -1614,6 +1637,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26960 */
26961 user_exit();
26962
26963+#ifdef CONFIG_GRKERNSEC_SETXID
26964+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26965+ gr_delayed_cred_worker();
26966+#endif
26967+
26968 audit_syscall_exit(regs);
26969
26970 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26971diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26972index 2f355d2..e75ed0a 100644
26973--- a/arch/x86/kernel/pvclock.c
26974+++ b/arch/x86/kernel/pvclock.c
26975@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26976 reset_hung_task_detector();
26977 }
26978
26979-static atomic64_t last_value = ATOMIC64_INIT(0);
26980+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26981
26982 void pvclock_resume(void)
26983 {
26984- atomic64_set(&last_value, 0);
26985+ atomic64_set_unchecked(&last_value, 0);
26986 }
26987
26988 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26989@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26990 * updating at the same time, and one of them could be slightly behind,
26991 * making the assumption that last_value always go forward fail to hold.
26992 */
26993- last = atomic64_read(&last_value);
26994+ last = atomic64_read_unchecked(&last_value);
26995 do {
26996 if (ret < last)
26997 return last;
26998- last = atomic64_cmpxchg(&last_value, last, ret);
26999+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27000 } while (unlikely(last != ret));
27001
27002 return ret;
27003diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27004index 86db4bc..a50a54a 100644
27005--- a/arch/x86/kernel/reboot.c
27006+++ b/arch/x86/kernel/reboot.c
27007@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27008
27009 void __noreturn machine_real_restart(unsigned int type)
27010 {
27011+
27012+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27013+ struct desc_struct *gdt;
27014+#endif
27015+
27016 local_irq_disable();
27017
27018 /*
27019@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27020
27021 /* Jump to the identity-mapped low memory code */
27022 #ifdef CONFIG_X86_32
27023- asm volatile("jmpl *%0" : :
27024+
27025+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27026+ gdt = get_cpu_gdt_table(smp_processor_id());
27027+ pax_open_kernel();
27028+#ifdef CONFIG_PAX_MEMORY_UDEREF
27029+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27030+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27031+ loadsegment(ds, __KERNEL_DS);
27032+ loadsegment(es, __KERNEL_DS);
27033+ loadsegment(ss, __KERNEL_DS);
27034+#endif
27035+#ifdef CONFIG_PAX_KERNEXEC
27036+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27037+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27038+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27039+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27040+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27041+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27042+#endif
27043+ pax_close_kernel();
27044+#endif
27045+
27046+ asm volatile("ljmpl *%0" : :
27047 "rm" (real_mode_header->machine_real_restart_asm),
27048 "a" (type));
27049 #else
27050@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27051 /*
27052 * This is a single dmi_table handling all reboot quirks.
27053 */
27054-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27055+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27056
27057 /* Acer */
27058 { /* Handle reboot issue on Acer Aspire one */
27059@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27060 * This means that this function can never return, it can misbehave
27061 * by not rebooting properly and hanging.
27062 */
27063-static void native_machine_emergency_restart(void)
27064+static void __noreturn native_machine_emergency_restart(void)
27065 {
27066 int i;
27067 int attempt = 0;
27068@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27069 #endif
27070 }
27071
27072-static void __machine_emergency_restart(int emergency)
27073+static void __noreturn __machine_emergency_restart(int emergency)
27074 {
27075 reboot_emergency = emergency;
27076 machine_ops.emergency_restart();
27077 }
27078
27079-static void native_machine_restart(char *__unused)
27080+static void __noreturn native_machine_restart(char *__unused)
27081 {
27082 pr_notice("machine restart\n");
27083
27084@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27085 __machine_emergency_restart(0);
27086 }
27087
27088-static void native_machine_halt(void)
27089+static void __noreturn native_machine_halt(void)
27090 {
27091 /* Stop other cpus and apics */
27092 machine_shutdown();
27093@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27094 stop_this_cpu(NULL);
27095 }
27096
27097-static void native_machine_power_off(void)
27098+static void __noreturn native_machine_power_off(void)
27099 {
27100 if (pm_power_off) {
27101 if (!reboot_force)
27102@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27103 }
27104 /* A fallback in case there is no PM info available */
27105 tboot_shutdown(TB_SHUTDOWN_HALT);
27106+ unreachable();
27107 }
27108
27109-struct machine_ops machine_ops = {
27110+struct machine_ops machine_ops __read_only = {
27111 .power_off = native_machine_power_off,
27112 .shutdown = native_machine_shutdown,
27113 .emergency_restart = native_machine_emergency_restart,
27114diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27115index c8e41e9..64049ef 100644
27116--- a/arch/x86/kernel/reboot_fixups_32.c
27117+++ b/arch/x86/kernel/reboot_fixups_32.c
27118@@ -57,7 +57,7 @@ struct device_fixup {
27119 unsigned int vendor;
27120 unsigned int device;
27121 void (*reboot_fixup)(struct pci_dev *);
27122-};
27123+} __do_const;
27124
27125 /*
27126 * PCI ids solely used for fixups_table go here
27127diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27128index 98111b3..73ca125 100644
27129--- a/arch/x86/kernel/relocate_kernel_64.S
27130+++ b/arch/x86/kernel/relocate_kernel_64.S
27131@@ -96,8 +96,7 @@ relocate_kernel:
27132
27133 /* jump to identity mapped page */
27134 addq $(identity_mapped - relocate_kernel), %r8
27135- pushq %r8
27136- ret
27137+ jmp *%r8
27138
27139 identity_mapped:
27140 /* set return address to 0 if not preserving context */
27141diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27142index d74ac33..6d14941 100644
27143--- a/arch/x86/kernel/setup.c
27144+++ b/arch/x86/kernel/setup.c
27145@@ -111,6 +111,7 @@
27146 #include <asm/mce.h>
27147 #include <asm/alternative.h>
27148 #include <asm/prom.h>
27149+#include <asm/boot.h>
27150
27151 /*
27152 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27153@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27154 #endif
27155
27156
27157-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27158-__visible unsigned long mmu_cr4_features;
27159+#ifdef CONFIG_X86_64
27160+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27161+#elif defined(CONFIG_X86_PAE)
27162+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27163 #else
27164-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27165+__visible unsigned long mmu_cr4_features __read_only;
27166 #endif
27167
27168 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27169@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27170 * area (640->1Mb) as ram even though it is not.
27171 * take them out.
27172 */
27173- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27174+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27175
27176 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27177 }
27178@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27179 /* called before trim_bios_range() to spare extra sanitize */
27180 static void __init e820_add_kernel_range(void)
27181 {
27182- u64 start = __pa_symbol(_text);
27183+ u64 start = __pa_symbol(ktla_ktva(_text));
27184 u64 size = __pa_symbol(_end) - start;
27185
27186 /*
27187@@ -860,8 +863,8 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27188
27189 void __init setup_arch(char **cmdline_p)
27190 {
27191- memblock_reserve(__pa_symbol(_text),
27192- (unsigned long)__bss_stop - (unsigned long)_text);
27193+ memblock_reserve(__pa_symbol(ktla_ktva((unsigned long)_text)),
27194+ (unsigned long)__bss_stop - ktla_ktva((unsigned long)_text));
27195
27196 early_reserve_initrd();
27197
27198@@ -959,16 +962,16 @@ void __init setup_arch(char **cmdline_p)
27199
27200 if (!boot_params.hdr.root_flags)
27201 root_mountflags &= ~MS_RDONLY;
27202- init_mm.start_code = (unsigned long) _text;
27203- init_mm.end_code = (unsigned long) _etext;
27204+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27205+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27206 init_mm.end_data = (unsigned long) _edata;
27207 init_mm.brk = _brk_end;
27208
27209 mpx_mm_init(&init_mm);
27210
27211- code_resource.start = __pa_symbol(_text);
27212- code_resource.end = __pa_symbol(_etext)-1;
27213- data_resource.start = __pa_symbol(_etext);
27214+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27215+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27216+ data_resource.start = __pa_symbol(_sdata);
27217 data_resource.end = __pa_symbol(_edata)-1;
27218 bss_resource.start = __pa_symbol(__bss_start);
27219 bss_resource.end = __pa_symbol(__bss_stop)-1;
27220diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27221index e4fcb87..9c06c55 100644
27222--- a/arch/x86/kernel/setup_percpu.c
27223+++ b/arch/x86/kernel/setup_percpu.c
27224@@ -21,19 +21,17 @@
27225 #include <asm/cpu.h>
27226 #include <asm/stackprotector.h>
27227
27228-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27229+#ifdef CONFIG_SMP
27230+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27231 EXPORT_PER_CPU_SYMBOL(cpu_number);
27232+#endif
27233
27234-#ifdef CONFIG_X86_64
27235 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27236-#else
27237-#define BOOT_PERCPU_OFFSET 0
27238-#endif
27239
27240 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27241 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27242
27243-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27244+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27245 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27246 };
27247 EXPORT_SYMBOL(__per_cpu_offset);
27248@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27249 {
27250 #ifdef CONFIG_NEED_MULTIPLE_NODES
27251 pg_data_t *last = NULL;
27252- unsigned int cpu;
27253+ int cpu;
27254
27255 for_each_possible_cpu(cpu) {
27256 int node = early_cpu_to_node(cpu);
27257@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27258 {
27259 #ifdef CONFIG_X86_32
27260 struct desc_struct gdt;
27261+ unsigned long base = per_cpu_offset(cpu);
27262
27263- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27264- 0x2 | DESCTYPE_S, 0x8);
27265- gdt.s = 1;
27266+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27267+ 0x83 | DESCTYPE_S, 0xC);
27268 write_gdt_entry(get_cpu_gdt_table(cpu),
27269 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27270 #endif
27271@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27272 /* alrighty, percpu areas up and running */
27273 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27274 for_each_possible_cpu(cpu) {
27275+#ifdef CONFIG_CC_STACKPROTECTOR
27276+#ifdef CONFIG_X86_32
27277+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27278+#endif
27279+#endif
27280 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27281 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27282 per_cpu(cpu_number, cpu) = cpu;
27283@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27284 */
27285 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27286 #endif
27287+#ifdef CONFIG_CC_STACKPROTECTOR
27288+#ifdef CONFIG_X86_32
27289+ if (!cpu)
27290+ per_cpu(stack_canary.canary, cpu) = canary;
27291+#endif
27292+#endif
27293 /*
27294 * Up to this point, the boot CPU has been using .init.data
27295 * area. Reload any changed state for the boot CPU.
27296diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27297index e0fd5f47..b551e66 100644
27298--- a/arch/x86/kernel/signal.c
27299+++ b/arch/x86/kernel/signal.c
27300@@ -189,7 +189,7 @@ static unsigned long align_sigframe(unsigned long sp)
27301 * Align the stack pointer according to the i386 ABI,
27302 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27303 */
27304- sp = ((sp + 4) & -16ul) - 4;
27305+ sp = ((sp - 12) & -16ul) - 4;
27306 #else /* !CONFIG_X86_32 */
27307 sp = round_down(sp, 16) - 8;
27308 #endif
27309@@ -297,10 +297,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27310 }
27311
27312 if (current->mm->context.vdso)
27313- restorer = current->mm->context.vdso +
27314- selected_vdso32->sym___kernel_sigreturn;
27315+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27316 else
27317- restorer = &frame->retcode;
27318+ restorer = (void __user *)&frame->retcode;
27319 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27320 restorer = ksig->ka.sa.sa_restorer;
27321
27322@@ -314,7 +313,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27323 * reasons and because gdb uses it as a signature to notice
27324 * signal handler stack frames.
27325 */
27326- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27327+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27328
27329 if (err)
27330 return -EFAULT;
27331@@ -361,8 +360,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27332 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27333
27334 /* Set up to return from userspace. */
27335- restorer = current->mm->context.vdso +
27336- selected_vdso32->sym___kernel_rt_sigreturn;
27337+ if (current->mm->context.vdso)
27338+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27339+ else
27340+ restorer = (void __user *)&frame->retcode;
27341 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27342 restorer = ksig->ka.sa.sa_restorer;
27343 put_user_ex(restorer, &frame->pretcode);
27344@@ -374,7 +375,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27345 * reasons and because gdb uses it as a signature to notice
27346 * signal handler stack frames.
27347 */
27348- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27349+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27350 } put_user_catch(err);
27351
27352 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27353@@ -594,7 +595,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27354 {
27355 int usig = ksig->sig;
27356 sigset_t *set = sigmask_to_save();
27357- compat_sigset_t *cset = (compat_sigset_t *) set;
27358+ sigset_t sigcopy;
27359+ compat_sigset_t *cset;
27360+
27361+ sigcopy = *set;
27362+
27363+ cset = (compat_sigset_t *) &sigcopy;
27364
27365 /* Set up the stack frame */
27366 if (is_ia32_frame()) {
27367@@ -605,7 +611,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27368 } else if (is_x32_frame()) {
27369 return x32_setup_rt_frame(ksig, cset, regs);
27370 } else {
27371- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27372+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27373 }
27374 }
27375
27376diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27377index be8e1bd..a3d93fa 100644
27378--- a/arch/x86/kernel/smp.c
27379+++ b/arch/x86/kernel/smp.c
27380@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27381
27382 __setup("nonmi_ipi", nonmi_ipi_setup);
27383
27384-struct smp_ops smp_ops = {
27385+struct smp_ops smp_ops __read_only = {
27386 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27387 .smp_prepare_cpus = native_smp_prepare_cpus,
27388 .smp_cpus_done = native_smp_cpus_done,
27389diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27390index 50e547e..d59d06a 100644
27391--- a/arch/x86/kernel/smpboot.c
27392+++ b/arch/x86/kernel/smpboot.c
27393@@ -226,14 +226,17 @@ static void notrace start_secondary(void *unused)
27394
27395 enable_start_cpu0 = 0;
27396
27397-#ifdef CONFIG_X86_32
27398+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27399+ barrier();
27400+
27401 /* switch away from the initial page table */
27402+#ifdef CONFIG_PAX_PER_CPU_PGD
27403+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27404+#else
27405 load_cr3(swapper_pg_dir);
27406+#endif
27407 __flush_tlb_all();
27408-#endif
27409
27410- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27411- barrier();
27412 /*
27413 * Check TSC synchronization with the BP:
27414 */
27415@@ -782,18 +785,17 @@ void common_cpu_up(unsigned int cpu, struct task_struct *idle)
27416 alternatives_enable_smp();
27417
27418 per_cpu(current_task, cpu) = idle;
27419+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27420
27421 #ifdef CONFIG_X86_32
27422 /* Stack for startup_32 can be just as for start_secondary onwards */
27423 irq_ctx_init(cpu);
27424- per_cpu(cpu_current_top_of_stack, cpu) =
27425- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27426+ per_cpu(cpu_current_top_of_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27427 #else
27428 clear_tsk_thread_flag(idle, TIF_FORK);
27429 initial_gs = per_cpu_offset(cpu);
27430 #endif
27431- per_cpu(kernel_stack, cpu) =
27432- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27433+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27434 }
27435
27436 /*
27437@@ -814,9 +816,11 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27438 unsigned long timeout;
27439
27440 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27441- (THREAD_SIZE + task_stack_page(idle))) - 1);
27442+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27443
27444+ pax_open_kernel();
27445 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27446+ pax_close_kernel();
27447 initial_code = (unsigned long)start_secondary;
27448 stack_start = idle->thread.sp;
27449
27450@@ -961,6 +965,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27451
27452 common_cpu_up(cpu, tidle);
27453
27454+#ifdef CONFIG_PAX_PER_CPU_PGD
27455+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27456+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27457+ KERNEL_PGD_PTRS);
27458+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27459+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27460+ KERNEL_PGD_PTRS);
27461+#endif
27462+
27463 err = do_boot_cpu(apicid, cpu, tidle);
27464 if (err) {
27465 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27466diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27467index 9b4d51d..5d28b58 100644
27468--- a/arch/x86/kernel/step.c
27469+++ b/arch/x86/kernel/step.c
27470@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27471 struct desc_struct *desc;
27472 unsigned long base;
27473
27474- seg &= ~7UL;
27475+ seg >>= 3;
27476
27477 mutex_lock(&child->mm->context.lock);
27478- if (unlikely((seg >> 3) >= child->mm->context.size))
27479+ if (unlikely(seg >= child->mm->context.size))
27480 addr = -1L; /* bogus selector, access would fault */
27481 else {
27482 desc = child->mm->context.ldt + seg;
27483@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27484 addr += base;
27485 }
27486 mutex_unlock(&child->mm->context.lock);
27487- }
27488+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27489+ addr = ktla_ktva(addr);
27490
27491 return addr;
27492 }
27493@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27494 unsigned char opcode[15];
27495 unsigned long addr = convert_ip_to_linear(child, regs);
27496
27497+ if (addr == -EINVAL)
27498+ return 0;
27499+
27500 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27501 for (i = 0; i < copied; i++) {
27502 switch (opcode[i]) {
27503diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27504new file mode 100644
27505index 0000000..5877189
27506--- /dev/null
27507+++ b/arch/x86/kernel/sys_i386_32.c
27508@@ -0,0 +1,189 @@
27509+/*
27510+ * This file contains various random system calls that
27511+ * have a non-standard calling sequence on the Linux/i386
27512+ * platform.
27513+ */
27514+
27515+#include <linux/errno.h>
27516+#include <linux/sched.h>
27517+#include <linux/mm.h>
27518+#include <linux/fs.h>
27519+#include <linux/smp.h>
27520+#include <linux/sem.h>
27521+#include <linux/msg.h>
27522+#include <linux/shm.h>
27523+#include <linux/stat.h>
27524+#include <linux/syscalls.h>
27525+#include <linux/mman.h>
27526+#include <linux/file.h>
27527+#include <linux/utsname.h>
27528+#include <linux/ipc.h>
27529+#include <linux/elf.h>
27530+
27531+#include <linux/uaccess.h>
27532+#include <linux/unistd.h>
27533+
27534+#include <asm/syscalls.h>
27535+
27536+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27537+{
27538+ unsigned long pax_task_size = TASK_SIZE;
27539+
27540+#ifdef CONFIG_PAX_SEGMEXEC
27541+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27542+ pax_task_size = SEGMEXEC_TASK_SIZE;
27543+#endif
27544+
27545+ if (flags & MAP_FIXED)
27546+ if (len > pax_task_size || addr > pax_task_size - len)
27547+ return -EINVAL;
27548+
27549+ return 0;
27550+}
27551+
27552+/*
27553+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27554+ */
27555+static unsigned long get_align_mask(void)
27556+{
27557+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27558+ return 0;
27559+
27560+ if (!(current->flags & PF_RANDOMIZE))
27561+ return 0;
27562+
27563+ return va_align.mask;
27564+}
27565+
27566+unsigned long
27567+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27568+ unsigned long len, unsigned long pgoff, unsigned long flags)
27569+{
27570+ struct mm_struct *mm = current->mm;
27571+ struct vm_area_struct *vma;
27572+ unsigned long pax_task_size = TASK_SIZE;
27573+ struct vm_unmapped_area_info info;
27574+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27575+
27576+#ifdef CONFIG_PAX_SEGMEXEC
27577+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27578+ pax_task_size = SEGMEXEC_TASK_SIZE;
27579+#endif
27580+
27581+ pax_task_size -= PAGE_SIZE;
27582+
27583+ if (len > pax_task_size)
27584+ return -ENOMEM;
27585+
27586+ if (flags & MAP_FIXED)
27587+ return addr;
27588+
27589+#ifdef CONFIG_PAX_RANDMMAP
27590+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27591+#endif
27592+
27593+ if (addr) {
27594+ addr = PAGE_ALIGN(addr);
27595+ if (pax_task_size - len >= addr) {
27596+ vma = find_vma(mm, addr);
27597+ if (check_heap_stack_gap(vma, addr, len, offset))
27598+ return addr;
27599+ }
27600+ }
27601+
27602+ info.flags = 0;
27603+ info.length = len;
27604+ info.align_mask = filp ? get_align_mask() : 0;
27605+ info.align_offset = pgoff << PAGE_SHIFT;
27606+ info.threadstack_offset = offset;
27607+
27608+#ifdef CONFIG_PAX_PAGEEXEC
27609+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27610+ info.low_limit = 0x00110000UL;
27611+ info.high_limit = mm->start_code;
27612+
27613+#ifdef CONFIG_PAX_RANDMMAP
27614+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27615+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27616+#endif
27617+
27618+ if (info.low_limit < info.high_limit) {
27619+ addr = vm_unmapped_area(&info);
27620+ if (!IS_ERR_VALUE(addr))
27621+ return addr;
27622+ }
27623+ } else
27624+#endif
27625+
27626+ info.low_limit = mm->mmap_base;
27627+ info.high_limit = pax_task_size;
27628+
27629+ return vm_unmapped_area(&info);
27630+}
27631+
27632+unsigned long
27633+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27634+ const unsigned long len, const unsigned long pgoff,
27635+ const unsigned long flags)
27636+{
27637+ struct vm_area_struct *vma;
27638+ struct mm_struct *mm = current->mm;
27639+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27640+ struct vm_unmapped_area_info info;
27641+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27642+
27643+#ifdef CONFIG_PAX_SEGMEXEC
27644+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27645+ pax_task_size = SEGMEXEC_TASK_SIZE;
27646+#endif
27647+
27648+ pax_task_size -= PAGE_SIZE;
27649+
27650+ /* requested length too big for entire address space */
27651+ if (len > pax_task_size)
27652+ return -ENOMEM;
27653+
27654+ if (flags & MAP_FIXED)
27655+ return addr;
27656+
27657+#ifdef CONFIG_PAX_PAGEEXEC
27658+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27659+ goto bottomup;
27660+#endif
27661+
27662+#ifdef CONFIG_PAX_RANDMMAP
27663+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27664+#endif
27665+
27666+ /* requesting a specific address */
27667+ if (addr) {
27668+ addr = PAGE_ALIGN(addr);
27669+ if (pax_task_size - len >= addr) {
27670+ vma = find_vma(mm, addr);
27671+ if (check_heap_stack_gap(vma, addr, len, offset))
27672+ return addr;
27673+ }
27674+ }
27675+
27676+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27677+ info.length = len;
27678+ info.low_limit = PAGE_SIZE;
27679+ info.high_limit = mm->mmap_base;
27680+ info.align_mask = filp ? get_align_mask() : 0;
27681+ info.align_offset = pgoff << PAGE_SHIFT;
27682+ info.threadstack_offset = offset;
27683+
27684+ addr = vm_unmapped_area(&info);
27685+ if (!(addr & ~PAGE_MASK))
27686+ return addr;
27687+ VM_BUG_ON(addr != -ENOMEM);
27688+
27689+bottomup:
27690+ /*
27691+ * A failed mmap() very likely causes application failure,
27692+ * so fall back to the bottom-up function here. This scenario
27693+ * can happen with large stack limits and large mmap()
27694+ * allocations.
27695+ */
27696+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27697+}
27698diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27699index 10e0272..b4bb9a7 100644
27700--- a/arch/x86/kernel/sys_x86_64.c
27701+++ b/arch/x86/kernel/sys_x86_64.c
27702@@ -97,8 +97,8 @@ out:
27703 return error;
27704 }
27705
27706-static void find_start_end(unsigned long flags, unsigned long *begin,
27707- unsigned long *end)
27708+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27709+ unsigned long *begin, unsigned long *end)
27710 {
27711 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27712 unsigned long new_begin;
27713@@ -117,7 +117,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27714 *begin = new_begin;
27715 }
27716 } else {
27717- *begin = current->mm->mmap_legacy_base;
27718+ *begin = mm->mmap_legacy_base;
27719 *end = TASK_SIZE;
27720 }
27721 }
27722@@ -130,20 +130,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27723 struct vm_area_struct *vma;
27724 struct vm_unmapped_area_info info;
27725 unsigned long begin, end;
27726+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27727
27728 if (flags & MAP_FIXED)
27729 return addr;
27730
27731- find_start_end(flags, &begin, &end);
27732+ find_start_end(mm, flags, &begin, &end);
27733
27734 if (len > end)
27735 return -ENOMEM;
27736
27737+#ifdef CONFIG_PAX_RANDMMAP
27738+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27739+#endif
27740+
27741 if (addr) {
27742 addr = PAGE_ALIGN(addr);
27743 vma = find_vma(mm, addr);
27744- if (end - len >= addr &&
27745- (!vma || addr + len <= vma->vm_start))
27746+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27747 return addr;
27748 }
27749
27750@@ -157,6 +161,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27751 info.align_mask = get_align_mask();
27752 info.align_offset += get_align_bits();
27753 }
27754+ info.threadstack_offset = offset;
27755 return vm_unmapped_area(&info);
27756 }
27757
27758@@ -169,6 +174,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27759 struct mm_struct *mm = current->mm;
27760 unsigned long addr = addr0;
27761 struct vm_unmapped_area_info info;
27762+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27763
27764 /* requested length too big for entire address space */
27765 if (len > TASK_SIZE)
27766@@ -181,12 +187,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27767 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27768 goto bottomup;
27769
27770+#ifdef CONFIG_PAX_RANDMMAP
27771+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27772+#endif
27773+
27774 /* requesting a specific address */
27775 if (addr) {
27776 addr = PAGE_ALIGN(addr);
27777 vma = find_vma(mm, addr);
27778- if (TASK_SIZE - len >= addr &&
27779- (!vma || addr + len <= vma->vm_start))
27780+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27781 return addr;
27782 }
27783
27784@@ -200,6 +209,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27785 info.align_mask = get_align_mask();
27786 info.align_offset += get_align_bits();
27787 }
27788+ info.threadstack_offset = offset;
27789 addr = vm_unmapped_area(&info);
27790 if (!(addr & ~PAGE_MASK))
27791 return addr;
27792diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27793index 91a4496..42fc304 100644
27794--- a/arch/x86/kernel/tboot.c
27795+++ b/arch/x86/kernel/tboot.c
27796@@ -44,6 +44,7 @@
27797 #include <asm/setup.h>
27798 #include <asm/e820.h>
27799 #include <asm/io.h>
27800+#include <asm/tlbflush.h>
27801
27802 #include "../realmode/rm/wakeup.h"
27803
27804@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27805
27806 void tboot_shutdown(u32 shutdown_type)
27807 {
27808- void (*shutdown)(void);
27809+ void (* __noreturn shutdown)(void);
27810
27811 if (!tboot_enabled())
27812 return;
27813@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27814 tboot->shutdown_type = shutdown_type;
27815
27816 switch_to_tboot_pt();
27817+ cr4_clear_bits(X86_CR4_PCIDE);
27818
27819- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27820+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27821 shutdown();
27822
27823 /* should not reach here */
27824@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27825 return -ENODEV;
27826 }
27827
27828-static atomic_t ap_wfs_count;
27829+static atomic_unchecked_t ap_wfs_count;
27830
27831 static int tboot_wait_for_aps(int num_aps)
27832 {
27833@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27834 {
27835 switch (action) {
27836 case CPU_DYING:
27837- atomic_inc(&ap_wfs_count);
27838+ atomic_inc_unchecked(&ap_wfs_count);
27839 if (num_online_cpus() == 1)
27840- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27841+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27842 return NOTIFY_BAD;
27843 break;
27844 }
27845@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27846
27847 tboot_create_trampoline();
27848
27849- atomic_set(&ap_wfs_count, 0);
27850+ atomic_set_unchecked(&ap_wfs_count, 0);
27851 register_hotcpu_notifier(&tboot_cpu_notifier);
27852
27853 #ifdef CONFIG_DEBUG_FS
27854diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27855index d39c091..1df4349 100644
27856--- a/arch/x86/kernel/time.c
27857+++ b/arch/x86/kernel/time.c
27858@@ -32,7 +32,7 @@ unsigned long profile_pc(struct pt_regs *regs)
27859
27860 if (!user_mode(regs) && in_lock_functions(pc)) {
27861 #ifdef CONFIG_FRAME_POINTER
27862- return *(unsigned long *)(regs->bp + sizeof(long));
27863+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27864 #else
27865 unsigned long *sp =
27866 (unsigned long *)kernel_stack_pointer(regs);
27867@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27868 * or above a saved flags. Eflags has bits 22-31 zero,
27869 * kernel addresses don't.
27870 */
27871+
27872+#ifdef CONFIG_PAX_KERNEXEC
27873+ return ktla_ktva(sp[0]);
27874+#else
27875 if (sp[0] >> 22)
27876 return sp[0];
27877 if (sp[1] >> 22)
27878 return sp[1];
27879 #endif
27880+
27881+#endif
27882 }
27883 return pc;
27884 }
27885diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27886index 7fc5e84..c6e445a 100644
27887--- a/arch/x86/kernel/tls.c
27888+++ b/arch/x86/kernel/tls.c
27889@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27890 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27891 return -EINVAL;
27892
27893+#ifdef CONFIG_PAX_SEGMEXEC
27894+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27895+ return -EINVAL;
27896+#endif
27897+
27898 set_tls_desc(p, idx, &info, 1);
27899
27900 return 0;
27901@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27902
27903 if (kbuf)
27904 info = kbuf;
27905- else if (__copy_from_user(infobuf, ubuf, count))
27906+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27907 return -EFAULT;
27908 else
27909 info = infobuf;
27910diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27911index 1c113db..287b42e 100644
27912--- a/arch/x86/kernel/tracepoint.c
27913+++ b/arch/x86/kernel/tracepoint.c
27914@@ -9,11 +9,11 @@
27915 #include <linux/atomic.h>
27916
27917 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27918-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27919+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27920 (unsigned long) trace_idt_table };
27921
27922 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27923-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27924+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27925
27926 static int trace_irq_vector_refcount;
27927 static DEFINE_MUTEX(irq_vector_mutex);
27928diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27929index 324ab52..0cfd2d05 100644
27930--- a/arch/x86/kernel/traps.c
27931+++ b/arch/x86/kernel/traps.c
27932@@ -68,7 +68,7 @@
27933 #include <asm/proto.h>
27934
27935 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27936-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27937+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27938 #else
27939 #include <asm/processor-flags.h>
27940 #include <asm/setup.h>
27941@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27942 #endif
27943
27944 /* Must be page-aligned because the real IDT is used in a fixmap. */
27945-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27946+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27947
27948 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27949 EXPORT_SYMBOL_GPL(used_vectors);
27950@@ -174,7 +174,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
27951 * will catch asm bugs and any attempt to use ist_preempt_enable
27952 * from double_fault.
27953 */
27954- BUG_ON((unsigned long)(current_top_of_stack() -
27955+ BUG_ON((unsigned long)(current_top_of_stack(smp_processor_id()) -
27956 current_stack_pointer()) >= THREAD_SIZE);
27957
27958 preempt_count_sub(HARDIRQ_OFFSET);
27959@@ -191,7 +191,7 @@ void ist_end_non_atomic(void)
27960 }
27961
27962 static nokprobe_inline int
27963-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27964+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27965 struct pt_regs *regs, long error_code)
27966 {
27967 if (v8086_mode(regs)) {
27968@@ -211,8 +211,20 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27969 if (!fixup_exception(regs)) {
27970 tsk->thread.error_code = error_code;
27971 tsk->thread.trap_nr = trapnr;
27972+
27973+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27974+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27975+ str = "PAX: suspicious stack segment fault";
27976+#endif
27977+
27978 die(str, regs, error_code);
27979 }
27980+
27981+#ifdef CONFIG_PAX_REFCOUNT
27982+ if (trapnr == X86_TRAP_OF)
27983+ pax_report_refcount_overflow(regs);
27984+#endif
27985+
27986 return 0;
27987 }
27988
27989@@ -251,7 +263,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27990 }
27991
27992 static void
27993-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27994+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27995 long error_code, siginfo_t *info)
27996 {
27997 struct task_struct *tsk = current;
27998@@ -275,7 +287,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27999 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28000 printk_ratelimit()) {
28001 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28002- tsk->comm, tsk->pid, str,
28003+ tsk->comm, task_pid_nr(tsk), str,
28004 regs->ip, regs->sp, error_code);
28005 print_vma_addr(" in ", regs->ip);
28006 pr_cont("\n");
28007@@ -357,6 +369,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28008 tsk->thread.error_code = error_code;
28009 tsk->thread.trap_nr = X86_TRAP_DF;
28010
28011+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28012+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28013+ die("grsec: kernel stack overflow detected", regs, error_code);
28014+#endif
28015+
28016 #ifdef CONFIG_DOUBLEFAULT
28017 df_debug(regs, error_code);
28018 #endif
28019@@ -475,11 +492,35 @@ do_general_protection(struct pt_regs *regs, long error_code)
28020 tsk->thread.error_code = error_code;
28021 tsk->thread.trap_nr = X86_TRAP_GP;
28022 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28023- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28024+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28025+
28026+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28027+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28028+ die("PAX: suspicious general protection fault", regs, error_code);
28029+ else
28030+#endif
28031+
28032 die("general protection fault", regs, error_code);
28033+ }
28034 goto exit;
28035 }
28036
28037+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28038+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28039+ struct mm_struct *mm = tsk->mm;
28040+ unsigned long limit;
28041+
28042+ down_write(&mm->mmap_sem);
28043+ limit = mm->context.user_cs_limit;
28044+ if (limit < TASK_SIZE) {
28045+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28046+ up_write(&mm->mmap_sem);
28047+ return;
28048+ }
28049+ up_write(&mm->mmap_sem);
28050+ }
28051+#endif
28052+
28053 tsk->thread.error_code = error_code;
28054 tsk->thread.trap_nr = X86_TRAP_GP;
28055
28056@@ -578,6 +619,9 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28057 container_of(task_pt_regs(current),
28058 struct bad_iret_stack, regs);
28059
28060+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28061+ new_stack = s;
28062+
28063 /* Copy the IRET target to the new stack. */
28064 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28065
28066diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28067index 5054497..139f8f8 100644
28068--- a/arch/x86/kernel/tsc.c
28069+++ b/arch/x86/kernel/tsc.c
28070@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28071 */
28072 smp_wmb();
28073
28074- ACCESS_ONCE(c2n->head) = data;
28075+ ACCESS_ONCE_RW(c2n->head) = data;
28076 }
28077
28078 /*
28079diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28080index 0b81ad6..fff670e 100644
28081--- a/arch/x86/kernel/uprobes.c
28082+++ b/arch/x86/kernel/uprobes.c
28083@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28084
28085 if (nleft != rasize) {
28086 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28087- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28088+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28089
28090 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28091 }
28092diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28093index b9242ba..50c5edd 100644
28094--- a/arch/x86/kernel/verify_cpu.S
28095+++ b/arch/x86/kernel/verify_cpu.S
28096@@ -20,6 +20,7 @@
28097 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28098 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28099 * arch/x86/kernel/head_32.S: processor startup
28100+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28101 *
28102 * verify_cpu, returns the status of longmode and SSE in register %eax.
28103 * 0: Success 1: Failure
28104diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28105index fc9db6e..2c5865d 100644
28106--- a/arch/x86/kernel/vm86_32.c
28107+++ b/arch/x86/kernel/vm86_32.c
28108@@ -44,6 +44,7 @@
28109 #include <linux/ptrace.h>
28110 #include <linux/audit.h>
28111 #include <linux/stddef.h>
28112+#include <linux/grsecurity.h>
28113
28114 #include <asm/uaccess.h>
28115 #include <asm/io.h>
28116@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28117 do_exit(SIGSEGV);
28118 }
28119
28120- tss = &per_cpu(cpu_tss, get_cpu());
28121+ tss = cpu_tss + get_cpu();
28122 current->thread.sp0 = current->thread.saved_sp0;
28123 current->thread.sysenter_cs = __KERNEL_CS;
28124 load_sp0(tss, &current->thread);
28125@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28126
28127 if (tsk->thread.saved_sp0)
28128 return -EPERM;
28129+
28130+#ifdef CONFIG_GRKERNSEC_VM86
28131+ if (!capable(CAP_SYS_RAWIO)) {
28132+ gr_handle_vm86();
28133+ return -EPERM;
28134+ }
28135+#endif
28136+
28137 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28138 offsetof(struct kernel_vm86_struct, vm86plus) -
28139 sizeof(info.regs));
28140@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28141 int tmp;
28142 struct vm86plus_struct __user *v86;
28143
28144+#ifdef CONFIG_GRKERNSEC_VM86
28145+ if (!capable(CAP_SYS_RAWIO)) {
28146+ gr_handle_vm86();
28147+ return -EPERM;
28148+ }
28149+#endif
28150+
28151 tsk = current;
28152 switch (cmd) {
28153 case VM86_REQUEST_IRQ:
28154@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28155 tsk->thread.saved_fs = info->regs32->fs;
28156 tsk->thread.saved_gs = get_user_gs(info->regs32);
28157
28158- tss = &per_cpu(cpu_tss, get_cpu());
28159+ tss = cpu_tss + get_cpu();
28160 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28161 if (cpu_has_sep)
28162 tsk->thread.sysenter_cs = 0;
28163@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28164 goto cannot_handle;
28165 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28166 goto cannot_handle;
28167- intr_ptr = (unsigned long __user *) (i << 2);
28168+ intr_ptr = (__force unsigned long __user *) (i << 2);
28169 if (get_user(segoffs, intr_ptr))
28170 goto cannot_handle;
28171 if ((segoffs >> 16) == BIOSSEG)
28172diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28173index 00bf300..129df8e 100644
28174--- a/arch/x86/kernel/vmlinux.lds.S
28175+++ b/arch/x86/kernel/vmlinux.lds.S
28176@@ -26,6 +26,13 @@
28177 #include <asm/page_types.h>
28178 #include <asm/cache.h>
28179 #include <asm/boot.h>
28180+#include <asm/segment.h>
28181+
28182+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28183+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28184+#else
28185+#define __KERNEL_TEXT_OFFSET 0
28186+#endif
28187
28188 #undef i386 /* in case the preprocessor is a 32bit one */
28189
28190@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28191
28192 PHDRS {
28193 text PT_LOAD FLAGS(5); /* R_E */
28194+#ifdef CONFIG_X86_32
28195+ module PT_LOAD FLAGS(5); /* R_E */
28196+#endif
28197+#ifdef CONFIG_XEN
28198+ rodata PT_LOAD FLAGS(5); /* R_E */
28199+#else
28200+ rodata PT_LOAD FLAGS(4); /* R__ */
28201+#endif
28202 data PT_LOAD FLAGS(6); /* RW_ */
28203-#ifdef CONFIG_X86_64
28204+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28205 #ifdef CONFIG_SMP
28206 percpu PT_LOAD FLAGS(6); /* RW_ */
28207 #endif
28208+ text.init PT_LOAD FLAGS(5); /* R_E */
28209+ text.exit PT_LOAD FLAGS(5); /* R_E */
28210 init PT_LOAD FLAGS(7); /* RWE */
28211-#endif
28212 note PT_NOTE FLAGS(0); /* ___ */
28213 }
28214
28215 SECTIONS
28216 {
28217 #ifdef CONFIG_X86_32
28218- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28219- phys_startup_32 = startup_32 - LOAD_OFFSET;
28220+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28221 #else
28222- . = __START_KERNEL;
28223- phys_startup_64 = startup_64 - LOAD_OFFSET;
28224+ . = __START_KERNEL;
28225 #endif
28226
28227 /* Text and read-only data */
28228- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28229- _text = .;
28230+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28231 /* bootstrapping code */
28232+#ifdef CONFIG_X86_32
28233+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28234+#else
28235+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28236+#endif
28237+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28238+ _text = .;
28239 HEAD_TEXT
28240 . = ALIGN(8);
28241 _stext = .;
28242@@ -104,13 +124,47 @@ SECTIONS
28243 IRQENTRY_TEXT
28244 *(.fixup)
28245 *(.gnu.warning)
28246- /* End of text section */
28247- _etext = .;
28248 } :text = 0x9090
28249
28250- NOTES :text :note
28251+ . += __KERNEL_TEXT_OFFSET;
28252
28253- EXCEPTION_TABLE(16) :text = 0x9090
28254+#ifdef CONFIG_X86_32
28255+ . = ALIGN(PAGE_SIZE);
28256+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28257+
28258+#ifdef CONFIG_PAX_KERNEXEC
28259+ MODULES_EXEC_VADDR = .;
28260+ BYTE(0)
28261+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28262+ . = ALIGN(HPAGE_SIZE) - 1;
28263+ MODULES_EXEC_END = .;
28264+#endif
28265+
28266+ } :module
28267+#endif
28268+
28269+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28270+ /* End of text section */
28271+ BYTE(0)
28272+ _etext = . - __KERNEL_TEXT_OFFSET;
28273+ }
28274+
28275+#ifdef CONFIG_X86_32
28276+ . = ALIGN(PAGE_SIZE);
28277+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28278+ . = ALIGN(PAGE_SIZE);
28279+ *(.empty_zero_page)
28280+ *(.initial_pg_fixmap)
28281+ *(.initial_pg_pmd)
28282+ *(.initial_page_table)
28283+ *(.swapper_pg_dir)
28284+ } :rodata
28285+#endif
28286+
28287+ . = ALIGN(PAGE_SIZE);
28288+ NOTES :rodata :note
28289+
28290+ EXCEPTION_TABLE(16) :rodata
28291
28292 #if defined(CONFIG_DEBUG_RODATA)
28293 /* .text should occupy whole number of pages */
28294@@ -122,16 +176,20 @@ SECTIONS
28295
28296 /* Data */
28297 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28298+
28299+#ifdef CONFIG_PAX_KERNEXEC
28300+ . = ALIGN(HPAGE_SIZE);
28301+#else
28302+ . = ALIGN(PAGE_SIZE);
28303+#endif
28304+
28305 /* Start of data section */
28306 _sdata = .;
28307
28308 /* init_task */
28309 INIT_TASK_DATA(THREAD_SIZE)
28310
28311-#ifdef CONFIG_X86_32
28312- /* 32 bit has nosave before _edata */
28313 NOSAVE_DATA
28314-#endif
28315
28316 PAGE_ALIGNED_DATA(PAGE_SIZE)
28317
28318@@ -174,12 +232,19 @@ SECTIONS
28319 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28320
28321 /* Init code and data - will be freed after init */
28322- . = ALIGN(PAGE_SIZE);
28323 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28324+ BYTE(0)
28325+
28326+#ifdef CONFIG_PAX_KERNEXEC
28327+ . = ALIGN(HPAGE_SIZE);
28328+#else
28329+ . = ALIGN(PAGE_SIZE);
28330+#endif
28331+
28332 __init_begin = .; /* paired with __init_end */
28333- }
28334+ } :init.begin
28335
28336-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28337+#ifdef CONFIG_SMP
28338 /*
28339 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28340 * output PHDR, so the next output section - .init.text - should
28341@@ -190,12 +255,27 @@ SECTIONS
28342 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28343 #endif
28344
28345- INIT_TEXT_SECTION(PAGE_SIZE)
28346-#ifdef CONFIG_X86_64
28347- :init
28348-#endif
28349+ . = ALIGN(PAGE_SIZE);
28350+ init_begin = .;
28351+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28352+ VMLINUX_SYMBOL(_sinittext) = .;
28353+ INIT_TEXT
28354+ . = ALIGN(PAGE_SIZE);
28355+ } :text.init
28356
28357- INIT_DATA_SECTION(16)
28358+ /*
28359+ * .exit.text is discard at runtime, not link time, to deal with
28360+ * references from .altinstructions and .eh_frame
28361+ */
28362+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28363+ EXIT_TEXT
28364+ VMLINUX_SYMBOL(_einittext) = .;
28365+ . = ALIGN(16);
28366+ } :text.exit
28367+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28368+
28369+ . = ALIGN(PAGE_SIZE);
28370+ INIT_DATA_SECTION(16) :init
28371
28372 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28373 __x86_cpu_dev_start = .;
28374@@ -266,19 +346,12 @@ SECTIONS
28375 }
28376
28377 . = ALIGN(8);
28378- /*
28379- * .exit.text is discard at runtime, not link time, to deal with
28380- * references from .altinstructions and .eh_frame
28381- */
28382- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28383- EXIT_TEXT
28384- }
28385
28386 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28387 EXIT_DATA
28388 }
28389
28390-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28391+#ifndef CONFIG_SMP
28392 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28393 #endif
28394
28395@@ -297,16 +370,10 @@ SECTIONS
28396 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28397 __smp_locks = .;
28398 *(.smp_locks)
28399- . = ALIGN(PAGE_SIZE);
28400 __smp_locks_end = .;
28401+ . = ALIGN(PAGE_SIZE);
28402 }
28403
28404-#ifdef CONFIG_X86_64
28405- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28406- NOSAVE_DATA
28407- }
28408-#endif
28409-
28410 /* BSS */
28411 . = ALIGN(PAGE_SIZE);
28412 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28413@@ -322,6 +389,7 @@ SECTIONS
28414 __brk_base = .;
28415 . += 64 * 1024; /* 64k alignment slop space */
28416 *(.brk_reservation) /* areas brk users have reserved */
28417+ . = ALIGN(HPAGE_SIZE);
28418 __brk_limit = .;
28419 }
28420
28421@@ -348,13 +416,12 @@ SECTIONS
28422 * for the boot processor.
28423 */
28424 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28425-INIT_PER_CPU(gdt_page);
28426 INIT_PER_CPU(irq_stack_union);
28427
28428 /*
28429 * Build-time check on the image size:
28430 */
28431-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28432+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28433 "kernel image bigger than KERNEL_IMAGE_SIZE");
28434
28435 #ifdef CONFIG_SMP
28436diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28437index 2dcc6ff..082dc7a 100644
28438--- a/arch/x86/kernel/vsyscall_64.c
28439+++ b/arch/x86/kernel/vsyscall_64.c
28440@@ -38,15 +38,13 @@
28441 #define CREATE_TRACE_POINTS
28442 #include "vsyscall_trace.h"
28443
28444-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28445+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28446
28447 static int __init vsyscall_setup(char *str)
28448 {
28449 if (str) {
28450 if (!strcmp("emulate", str))
28451 vsyscall_mode = EMULATE;
28452- else if (!strcmp("native", str))
28453- vsyscall_mode = NATIVE;
28454 else if (!strcmp("none", str))
28455 vsyscall_mode = NONE;
28456 else
28457@@ -264,8 +262,7 @@ do_ret:
28458 return true;
28459
28460 sigsegv:
28461- force_sig(SIGSEGV, current);
28462- return true;
28463+ do_group_exit(SIGKILL);
28464 }
28465
28466 /*
28467@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28468 static struct vm_area_struct gate_vma = {
28469 .vm_start = VSYSCALL_ADDR,
28470 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28471- .vm_page_prot = PAGE_READONLY_EXEC,
28472- .vm_flags = VM_READ | VM_EXEC,
28473+ .vm_page_prot = PAGE_READONLY,
28474+ .vm_flags = VM_READ,
28475 .vm_ops = &gate_vma_ops,
28476 };
28477
28478@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28479 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28480
28481 if (vsyscall_mode != NONE)
28482- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28483- vsyscall_mode == NATIVE
28484- ? PAGE_KERNEL_VSYSCALL
28485- : PAGE_KERNEL_VVAR);
28486+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28487
28488 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28489 (unsigned long)VSYSCALL_ADDR);
28490diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28491index 37d8fa4..66e319a 100644
28492--- a/arch/x86/kernel/x8664_ksyms_64.c
28493+++ b/arch/x86/kernel/x8664_ksyms_64.c
28494@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28495 EXPORT_SYMBOL(copy_user_generic_unrolled);
28496 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28497 EXPORT_SYMBOL(__copy_user_nocache);
28498-EXPORT_SYMBOL(_copy_from_user);
28499-EXPORT_SYMBOL(_copy_to_user);
28500
28501 EXPORT_SYMBOL(copy_page);
28502 EXPORT_SYMBOL(clear_page);
28503@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28504 EXPORT_SYMBOL(___preempt_schedule_context);
28505 #endif
28506 #endif
28507+
28508+#ifdef CONFIG_PAX_PER_CPU_PGD
28509+EXPORT_SYMBOL(cpu_pgd);
28510+#endif
28511diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28512index 234b072..b7ab191 100644
28513--- a/arch/x86/kernel/x86_init.c
28514+++ b/arch/x86/kernel/x86_init.c
28515@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28516 static void default_nmi_init(void) { };
28517 static int default_i8042_detect(void) { return 1; };
28518
28519-struct x86_platform_ops x86_platform = {
28520+struct x86_platform_ops x86_platform __read_only = {
28521 .calibrate_tsc = native_calibrate_tsc,
28522 .get_wallclock = mach_get_cmos_time,
28523 .set_wallclock = mach_set_rtc_mmss,
28524@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28525 EXPORT_SYMBOL_GPL(x86_platform);
28526
28527 #if defined(CONFIG_PCI_MSI)
28528-struct x86_msi_ops x86_msi = {
28529+struct x86_msi_ops x86_msi __read_only = {
28530 .setup_msi_irqs = native_setup_msi_irqs,
28531 .compose_msi_msg = native_compose_msi_msg,
28532 .teardown_msi_irq = native_teardown_msi_irq,
28533@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28534 }
28535 #endif
28536
28537-struct x86_io_apic_ops x86_io_apic_ops = {
28538+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28539 .init = native_io_apic_init_mappings,
28540 .read = native_io_apic_read,
28541 .write = native_io_apic_write,
28542diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28543index 87a815b..727dbe6 100644
28544--- a/arch/x86/kernel/xsave.c
28545+++ b/arch/x86/kernel/xsave.c
28546@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28547
28548 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28549 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28550- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28551+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28552
28553 if (!use_xsave())
28554 return err;
28555
28556- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28557+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28558
28559 /*
28560 * Read the xstate_bv which we copied (directly from the cpu or
28561 * from the state in task struct) to the user buffers.
28562 */
28563- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28564+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28565
28566 /*
28567 * For legacy compatible, we always set FP/SSE bits in the bit
28568@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28569 */
28570 xstate_bv |= XSTATE_FPSSE;
28571
28572- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28573+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28574
28575 return err;
28576 }
28577@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28578 {
28579 int err;
28580
28581+ buf = (struct xsave_struct __user *)____m(buf);
28582 if (use_xsave())
28583 err = xsave_user(buf);
28584 else if (use_fxsr())
28585@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28586 */
28587 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28588 {
28589+ buf = (void __user *)____m(buf);
28590 if (use_xsave()) {
28591 if ((unsigned long)buf % 64 || fx_only) {
28592 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28593diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28594index 1d08ad3..c6a4faf 100644
28595--- a/arch/x86/kvm/cpuid.c
28596+++ b/arch/x86/kvm/cpuid.c
28597@@ -204,15 +204,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28598 struct kvm_cpuid2 *cpuid,
28599 struct kvm_cpuid_entry2 __user *entries)
28600 {
28601- int r;
28602+ int r, i;
28603
28604 r = -E2BIG;
28605 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28606 goto out;
28607 r = -EFAULT;
28608- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28609- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28610+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28611 goto out;
28612+ for (i = 0; i < cpuid->nent; ++i) {
28613+ struct kvm_cpuid_entry2 cpuid_entry;
28614+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28615+ goto out;
28616+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28617+ }
28618 vcpu->arch.cpuid_nent = cpuid->nent;
28619 kvm_apic_set_version(vcpu);
28620 kvm_x86_ops->cpuid_update(vcpu);
28621@@ -225,15 +230,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28622 struct kvm_cpuid2 *cpuid,
28623 struct kvm_cpuid_entry2 __user *entries)
28624 {
28625- int r;
28626+ int r, i;
28627
28628 r = -E2BIG;
28629 if (cpuid->nent < vcpu->arch.cpuid_nent)
28630 goto out;
28631 r = -EFAULT;
28632- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28633- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28634+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28635 goto out;
28636+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28637+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28638+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28639+ goto out;
28640+ }
28641 return 0;
28642
28643 out:
28644diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28645index 630bcb0..a7f6d9e 100644
28646--- a/arch/x86/kvm/emulate.c
28647+++ b/arch/x86/kvm/emulate.c
28648@@ -3569,7 +3569,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28649 int cr = ctxt->modrm_reg;
28650 u64 efer = 0;
28651
28652- static u64 cr_reserved_bits[] = {
28653+ static const u64 cr_reserved_bits[] = {
28654 0xffffffff00000000ULL,
28655 0, 0, 0, /* CR3 checked later */
28656 CR4_RESERVED_BITS,
28657diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28658index 67d07e0..10769d5 100644
28659--- a/arch/x86/kvm/lapic.c
28660+++ b/arch/x86/kvm/lapic.c
28661@@ -56,7 +56,7 @@
28662 #define APIC_BUS_CYCLE_NS 1
28663
28664 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28665-#define apic_debug(fmt, arg...)
28666+#define apic_debug(fmt, arg...) do {} while (0)
28667
28668 #define APIC_LVT_NUM 6
28669 /* 14 is the version for Xeon and Pentium 8.4.8*/
28670diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28671index 6e6d115..43fecbf 100644
28672--- a/arch/x86/kvm/paging_tmpl.h
28673+++ b/arch/x86/kvm/paging_tmpl.h
28674@@ -343,7 +343,7 @@ retry_walk:
28675 if (unlikely(kvm_is_error_hva(host_addr)))
28676 goto error;
28677
28678- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28679+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28680 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28681 goto error;
28682 walker->ptep_user[walker->level - 1] = ptep_user;
28683diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28684index 4911bf1..e7d3ed2 100644
28685--- a/arch/x86/kvm/svm.c
28686+++ b/arch/x86/kvm/svm.c
28687@@ -3577,7 +3577,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28688 int cpu = raw_smp_processor_id();
28689
28690 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28691+
28692+ pax_open_kernel();
28693 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28694+ pax_close_kernel();
28695+
28696 load_TR_desc();
28697 }
28698
28699@@ -3973,6 +3977,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28700 #endif
28701 #endif
28702
28703+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28704+ __set_fs(current_thread_info()->addr_limit);
28705+#endif
28706+
28707 reload_tss(vcpu);
28708
28709 local_irq_disable();
28710diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28711index 2d73807..84a0e59 100644
28712--- a/arch/x86/kvm/vmx.c
28713+++ b/arch/x86/kvm/vmx.c
28714@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28715 #endif
28716 }
28717
28718-static void vmcs_clear_bits(unsigned long field, u32 mask)
28719+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28720 {
28721 vmcs_writel(field, vmcs_readl(field) & ~mask);
28722 }
28723
28724-static void vmcs_set_bits(unsigned long field, u32 mask)
28725+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28726 {
28727 vmcs_writel(field, vmcs_readl(field) | mask);
28728 }
28729@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28730 struct desc_struct *descs;
28731
28732 descs = (void *)gdt->address;
28733+
28734+ pax_open_kernel();
28735 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28736+ pax_close_kernel();
28737+
28738 load_TR_desc();
28739 }
28740
28741@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28742 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28743 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28744
28745+#ifdef CONFIG_PAX_PER_CPU_PGD
28746+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28747+#endif
28748+
28749 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28750 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28751 vmx->loaded_vmcs->cpu = cpu;
28752@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28753 * reads and returns guest's timestamp counter "register"
28754 * guest_tsc = host_tsc + tsc_offset -- 21.3
28755 */
28756-static u64 guest_read_tsc(void)
28757+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28758 {
28759 u64 host_tsc, tsc_offset;
28760
28761@@ -4467,7 +4475,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28762 unsigned long cr4;
28763
28764 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28765+
28766+#ifndef CONFIG_PAX_PER_CPU_PGD
28767 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28768+#endif
28769
28770 /* Save the most likely value for this task's CR4 in the VMCS. */
28771 cr4 = cr4_read_shadow();
28772@@ -4494,7 +4505,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28773 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28774 vmx->host_idt_base = dt.address;
28775
28776- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28777+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28778
28779 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28780 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28781@@ -6107,11 +6118,17 @@ static __init int hardware_setup(void)
28782 * page upon invalidation. No need to do anything if not
28783 * using the APIC_ACCESS_ADDR VMCS field.
28784 */
28785- if (!flexpriority_enabled)
28786- kvm_x86_ops->set_apic_access_page_addr = NULL;
28787+ if (!flexpriority_enabled) {
28788+ pax_open_kernel();
28789+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28790+ pax_close_kernel();
28791+ }
28792
28793- if (!cpu_has_vmx_tpr_shadow())
28794- kvm_x86_ops->update_cr8_intercept = NULL;
28795+ if (!cpu_has_vmx_tpr_shadow()) {
28796+ pax_open_kernel();
28797+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28798+ pax_close_kernel();
28799+ }
28800
28801 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28802 kvm_disable_largepages();
28803@@ -6122,14 +6139,16 @@ static __init int hardware_setup(void)
28804 if (!cpu_has_vmx_apicv())
28805 enable_apicv = 0;
28806
28807+ pax_open_kernel();
28808 if (enable_apicv)
28809- kvm_x86_ops->update_cr8_intercept = NULL;
28810+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28811 else {
28812- kvm_x86_ops->hwapic_irr_update = NULL;
28813- kvm_x86_ops->hwapic_isr_update = NULL;
28814- kvm_x86_ops->deliver_posted_interrupt = NULL;
28815- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28816+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28817+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28818+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28819+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28820 }
28821+ pax_close_kernel();
28822
28823 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28824 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28825@@ -6182,10 +6201,12 @@ static __init int hardware_setup(void)
28826 enable_pml = 0;
28827
28828 if (!enable_pml) {
28829- kvm_x86_ops->slot_enable_log_dirty = NULL;
28830- kvm_x86_ops->slot_disable_log_dirty = NULL;
28831- kvm_x86_ops->flush_log_dirty = NULL;
28832- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28833+ pax_open_kernel();
28834+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28835+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28836+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28837+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28838+ pax_close_kernel();
28839 }
28840
28841 return alloc_kvm_area();
28842@@ -8230,6 +8251,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28843 "jmp 2f \n\t"
28844 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28845 "2: "
28846+
28847+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28848+ "ljmp %[cs],$3f\n\t"
28849+ "3: "
28850+#endif
28851+
28852 /* Save guest registers, load host registers, keep flags */
28853 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28854 "pop %0 \n\t"
28855@@ -8282,6 +8309,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28856 #endif
28857 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28858 [wordsize]"i"(sizeof(ulong))
28859+
28860+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28861+ ,[cs]"i"(__KERNEL_CS)
28862+#endif
28863+
28864 : "cc", "memory"
28865 #ifdef CONFIG_X86_64
28866 , "rax", "rbx", "rdi", "rsi"
28867@@ -8295,7 +8327,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28868 if (debugctlmsr)
28869 update_debugctlmsr(debugctlmsr);
28870
28871-#ifndef CONFIG_X86_64
28872+#ifdef CONFIG_X86_32
28873 /*
28874 * The sysexit path does not restore ds/es, so we must set them to
28875 * a reasonable value ourselves.
28876@@ -8304,8 +8336,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28877 * may be executed in interrupt context, which saves and restore segments
28878 * around it, nullifying its effect.
28879 */
28880- loadsegment(ds, __USER_DS);
28881- loadsegment(es, __USER_DS);
28882+ loadsegment(ds, __KERNEL_DS);
28883+ loadsegment(es, __KERNEL_DS);
28884+ loadsegment(ss, __KERNEL_DS);
28885+
28886+#ifdef CONFIG_PAX_KERNEXEC
28887+ loadsegment(fs, __KERNEL_PERCPU);
28888+#endif
28889+
28890+#ifdef CONFIG_PAX_MEMORY_UDEREF
28891+ __set_fs(current_thread_info()->addr_limit);
28892+#endif
28893+
28894 #endif
28895
28896 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28897diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28898index ea306ad..669f42d 100644
28899--- a/arch/x86/kvm/x86.c
28900+++ b/arch/x86/kvm/x86.c
28901@@ -1929,8 +1929,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28902 {
28903 struct kvm *kvm = vcpu->kvm;
28904 int lm = is_long_mode(vcpu);
28905- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28906- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28907+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28908+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28909 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28910 : kvm->arch.xen_hvm_config.blob_size_32;
28911 u32 page_num = data & ~PAGE_MASK;
28912@@ -2867,6 +2867,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28913 if (n < msr_list.nmsrs)
28914 goto out;
28915 r = -EFAULT;
28916+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28917+ goto out;
28918 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28919 num_msrs_to_save * sizeof(u32)))
28920 goto out;
28921@@ -5784,7 +5786,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28922 };
28923 #endif
28924
28925-int kvm_arch_init(void *opaque)
28926+int kvm_arch_init(const void *opaque)
28927 {
28928 int r;
28929 struct kvm_x86_ops *ops = opaque;
28930diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28931index 8f9a133..3c7694b 100644
28932--- a/arch/x86/lguest/boot.c
28933+++ b/arch/x86/lguest/boot.c
28934@@ -1341,9 +1341,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28935 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28936 * Launcher to reboot us.
28937 */
28938-static void lguest_restart(char *reason)
28939+static __noreturn void lguest_restart(char *reason)
28940 {
28941 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28942+ BUG();
28943 }
28944
28945 /*G:050
28946diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28947index 00933d5..3a64af9 100644
28948--- a/arch/x86/lib/atomic64_386_32.S
28949+++ b/arch/x86/lib/atomic64_386_32.S
28950@@ -48,6 +48,10 @@ BEGIN(read)
28951 movl (v), %eax
28952 movl 4(v), %edx
28953 RET_ENDP
28954+BEGIN(read_unchecked)
28955+ movl (v), %eax
28956+ movl 4(v), %edx
28957+RET_ENDP
28958 #undef v
28959
28960 #define v %esi
28961@@ -55,6 +59,10 @@ BEGIN(set)
28962 movl %ebx, (v)
28963 movl %ecx, 4(v)
28964 RET_ENDP
28965+BEGIN(set_unchecked)
28966+ movl %ebx, (v)
28967+ movl %ecx, 4(v)
28968+RET_ENDP
28969 #undef v
28970
28971 #define v %esi
28972@@ -70,6 +78,20 @@ RET_ENDP
28973 BEGIN(add)
28974 addl %eax, (v)
28975 adcl %edx, 4(v)
28976+
28977+#ifdef CONFIG_PAX_REFCOUNT
28978+ jno 0f
28979+ subl %eax, (v)
28980+ sbbl %edx, 4(v)
28981+ int $4
28982+0:
28983+ _ASM_EXTABLE(0b, 0b)
28984+#endif
28985+
28986+RET_ENDP
28987+BEGIN(add_unchecked)
28988+ addl %eax, (v)
28989+ adcl %edx, 4(v)
28990 RET_ENDP
28991 #undef v
28992
28993@@ -77,6 +99,24 @@ RET_ENDP
28994 BEGIN(add_return)
28995 addl (v), %eax
28996 adcl 4(v), %edx
28997+
28998+#ifdef CONFIG_PAX_REFCOUNT
28999+ into
29000+1234:
29001+ _ASM_EXTABLE(1234b, 2f)
29002+#endif
29003+
29004+ movl %eax, (v)
29005+ movl %edx, 4(v)
29006+
29007+#ifdef CONFIG_PAX_REFCOUNT
29008+2:
29009+#endif
29010+
29011+RET_ENDP
29012+BEGIN(add_return_unchecked)
29013+ addl (v), %eax
29014+ adcl 4(v), %edx
29015 movl %eax, (v)
29016 movl %edx, 4(v)
29017 RET_ENDP
29018@@ -86,6 +126,20 @@ RET_ENDP
29019 BEGIN(sub)
29020 subl %eax, (v)
29021 sbbl %edx, 4(v)
29022+
29023+#ifdef CONFIG_PAX_REFCOUNT
29024+ jno 0f
29025+ addl %eax, (v)
29026+ adcl %edx, 4(v)
29027+ int $4
29028+0:
29029+ _ASM_EXTABLE(0b, 0b)
29030+#endif
29031+
29032+RET_ENDP
29033+BEGIN(sub_unchecked)
29034+ subl %eax, (v)
29035+ sbbl %edx, 4(v)
29036 RET_ENDP
29037 #undef v
29038
29039@@ -96,6 +150,27 @@ BEGIN(sub_return)
29040 sbbl $0, %edx
29041 addl (v), %eax
29042 adcl 4(v), %edx
29043+
29044+#ifdef CONFIG_PAX_REFCOUNT
29045+ into
29046+1234:
29047+ _ASM_EXTABLE(1234b, 2f)
29048+#endif
29049+
29050+ movl %eax, (v)
29051+ movl %edx, 4(v)
29052+
29053+#ifdef CONFIG_PAX_REFCOUNT
29054+2:
29055+#endif
29056+
29057+RET_ENDP
29058+BEGIN(sub_return_unchecked)
29059+ negl %edx
29060+ negl %eax
29061+ sbbl $0, %edx
29062+ addl (v), %eax
29063+ adcl 4(v), %edx
29064 movl %eax, (v)
29065 movl %edx, 4(v)
29066 RET_ENDP
29067@@ -105,6 +180,20 @@ RET_ENDP
29068 BEGIN(inc)
29069 addl $1, (v)
29070 adcl $0, 4(v)
29071+
29072+#ifdef CONFIG_PAX_REFCOUNT
29073+ jno 0f
29074+ subl $1, (v)
29075+ sbbl $0, 4(v)
29076+ int $4
29077+0:
29078+ _ASM_EXTABLE(0b, 0b)
29079+#endif
29080+
29081+RET_ENDP
29082+BEGIN(inc_unchecked)
29083+ addl $1, (v)
29084+ adcl $0, 4(v)
29085 RET_ENDP
29086 #undef v
29087
29088@@ -114,6 +203,26 @@ BEGIN(inc_return)
29089 movl 4(v), %edx
29090 addl $1, %eax
29091 adcl $0, %edx
29092+
29093+#ifdef CONFIG_PAX_REFCOUNT
29094+ into
29095+1234:
29096+ _ASM_EXTABLE(1234b, 2f)
29097+#endif
29098+
29099+ movl %eax, (v)
29100+ movl %edx, 4(v)
29101+
29102+#ifdef CONFIG_PAX_REFCOUNT
29103+2:
29104+#endif
29105+
29106+RET_ENDP
29107+BEGIN(inc_return_unchecked)
29108+ movl (v), %eax
29109+ movl 4(v), %edx
29110+ addl $1, %eax
29111+ adcl $0, %edx
29112 movl %eax, (v)
29113 movl %edx, 4(v)
29114 RET_ENDP
29115@@ -123,6 +232,20 @@ RET_ENDP
29116 BEGIN(dec)
29117 subl $1, (v)
29118 sbbl $0, 4(v)
29119+
29120+#ifdef CONFIG_PAX_REFCOUNT
29121+ jno 0f
29122+ addl $1, (v)
29123+ adcl $0, 4(v)
29124+ int $4
29125+0:
29126+ _ASM_EXTABLE(0b, 0b)
29127+#endif
29128+
29129+RET_ENDP
29130+BEGIN(dec_unchecked)
29131+ subl $1, (v)
29132+ sbbl $0, 4(v)
29133 RET_ENDP
29134 #undef v
29135
29136@@ -132,6 +255,26 @@ BEGIN(dec_return)
29137 movl 4(v), %edx
29138 subl $1, %eax
29139 sbbl $0, %edx
29140+
29141+#ifdef CONFIG_PAX_REFCOUNT
29142+ into
29143+1234:
29144+ _ASM_EXTABLE(1234b, 2f)
29145+#endif
29146+
29147+ movl %eax, (v)
29148+ movl %edx, 4(v)
29149+
29150+#ifdef CONFIG_PAX_REFCOUNT
29151+2:
29152+#endif
29153+
29154+RET_ENDP
29155+BEGIN(dec_return_unchecked)
29156+ movl (v), %eax
29157+ movl 4(v), %edx
29158+ subl $1, %eax
29159+ sbbl $0, %edx
29160 movl %eax, (v)
29161 movl %edx, 4(v)
29162 RET_ENDP
29163@@ -143,6 +286,13 @@ BEGIN(add_unless)
29164 adcl %edx, %edi
29165 addl (v), %eax
29166 adcl 4(v), %edx
29167+
29168+#ifdef CONFIG_PAX_REFCOUNT
29169+ into
29170+1234:
29171+ _ASM_EXTABLE(1234b, 2f)
29172+#endif
29173+
29174 cmpl %eax, %ecx
29175 je 3f
29176 1:
29177@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29178 1:
29179 addl $1, %eax
29180 adcl $0, %edx
29181+
29182+#ifdef CONFIG_PAX_REFCOUNT
29183+ into
29184+1234:
29185+ _ASM_EXTABLE(1234b, 2f)
29186+#endif
29187+
29188 movl %eax, (v)
29189 movl %edx, 4(v)
29190 movl $1, %eax
29191@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29192 movl 4(v), %edx
29193 subl $1, %eax
29194 sbbl $0, %edx
29195+
29196+#ifdef CONFIG_PAX_REFCOUNT
29197+ into
29198+1234:
29199+ _ASM_EXTABLE(1234b, 1f)
29200+#endif
29201+
29202 js 1f
29203 movl %eax, (v)
29204 movl %edx, 4(v)
29205diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29206index 082a851..6a963bc 100644
29207--- a/arch/x86/lib/atomic64_cx8_32.S
29208+++ b/arch/x86/lib/atomic64_cx8_32.S
29209@@ -25,10 +25,20 @@ ENTRY(atomic64_read_cx8)
29210 CFI_STARTPROC
29211
29212 read64 %ecx
29213+ pax_force_retaddr
29214 ret
29215 CFI_ENDPROC
29216 ENDPROC(atomic64_read_cx8)
29217
29218+ENTRY(atomic64_read_unchecked_cx8)
29219+ CFI_STARTPROC
29220+
29221+ read64 %ecx
29222+ pax_force_retaddr
29223+ ret
29224+ CFI_ENDPROC
29225+ENDPROC(atomic64_read_unchecked_cx8)
29226+
29227 ENTRY(atomic64_set_cx8)
29228 CFI_STARTPROC
29229
29230@@ -38,10 +48,25 @@ ENTRY(atomic64_set_cx8)
29231 cmpxchg8b (%esi)
29232 jne 1b
29233
29234+ pax_force_retaddr
29235 ret
29236 CFI_ENDPROC
29237 ENDPROC(atomic64_set_cx8)
29238
29239+ENTRY(atomic64_set_unchecked_cx8)
29240+ CFI_STARTPROC
29241+
29242+1:
29243+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29244+ * are atomic on 586 and newer */
29245+ cmpxchg8b (%esi)
29246+ jne 1b
29247+
29248+ pax_force_retaddr
29249+ ret
29250+ CFI_ENDPROC
29251+ENDPROC(atomic64_set_unchecked_cx8)
29252+
29253 ENTRY(atomic64_xchg_cx8)
29254 CFI_STARTPROC
29255
29256@@ -50,12 +75,13 @@ ENTRY(atomic64_xchg_cx8)
29257 cmpxchg8b (%esi)
29258 jne 1b
29259
29260+ pax_force_retaddr
29261 ret
29262 CFI_ENDPROC
29263 ENDPROC(atomic64_xchg_cx8)
29264
29265-.macro addsub_return func ins insc
29266-ENTRY(atomic64_\func\()_return_cx8)
29267+.macro addsub_return func ins insc unchecked=""
29268+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29269 CFI_STARTPROC
29270 pushl_cfi_reg ebp
29271 pushl_cfi_reg ebx
29272@@ -72,27 +98,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29273 movl %edx, %ecx
29274 \ins\()l %esi, %ebx
29275 \insc\()l %edi, %ecx
29276+
29277+.ifb \unchecked
29278+#ifdef CONFIG_PAX_REFCOUNT
29279+ into
29280+2:
29281+ _ASM_EXTABLE(2b, 3f)
29282+#endif
29283+.endif
29284+
29285 LOCK_PREFIX
29286 cmpxchg8b (%ebp)
29287 jne 1b
29288-
29289-10:
29290 movl %ebx, %eax
29291 movl %ecx, %edx
29292+
29293+.ifb \unchecked
29294+#ifdef CONFIG_PAX_REFCOUNT
29295+3:
29296+#endif
29297+.endif
29298+
29299 popl_cfi_reg edi
29300 popl_cfi_reg esi
29301 popl_cfi_reg ebx
29302 popl_cfi_reg ebp
29303+ pax_force_retaddr
29304 ret
29305 CFI_ENDPROC
29306-ENDPROC(atomic64_\func\()_return_cx8)
29307+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29308 .endm
29309
29310 addsub_return add add adc
29311 addsub_return sub sub sbb
29312+addsub_return add add adc _unchecked
29313+addsub_return sub sub sbb _unchecked
29314
29315-.macro incdec_return func ins insc
29316-ENTRY(atomic64_\func\()_return_cx8)
29317+.macro incdec_return func ins insc unchecked=""
29318+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29319 CFI_STARTPROC
29320 pushl_cfi_reg ebx
29321
29322@@ -102,21 +145,38 @@ ENTRY(atomic64_\func\()_return_cx8)
29323 movl %edx, %ecx
29324 \ins\()l $1, %ebx
29325 \insc\()l $0, %ecx
29326+
29327+.ifb \unchecked
29328+#ifdef CONFIG_PAX_REFCOUNT
29329+ into
29330+2:
29331+ _ASM_EXTABLE(2b, 3f)
29332+#endif
29333+.endif
29334+
29335 LOCK_PREFIX
29336 cmpxchg8b (%esi)
29337 jne 1b
29338-
29339-10:
29340 movl %ebx, %eax
29341 movl %ecx, %edx
29342+
29343+.ifb \unchecked
29344+#ifdef CONFIG_PAX_REFCOUNT
29345+3:
29346+#endif
29347+.endif
29348+
29349 popl_cfi_reg ebx
29350+ pax_force_retaddr
29351 ret
29352 CFI_ENDPROC
29353-ENDPROC(atomic64_\func\()_return_cx8)
29354+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29355 .endm
29356
29357 incdec_return inc add adc
29358 incdec_return dec sub sbb
29359+incdec_return inc add adc _unchecked
29360+incdec_return dec sub sbb _unchecked
29361
29362 ENTRY(atomic64_dec_if_positive_cx8)
29363 CFI_STARTPROC
29364@@ -128,6 +188,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29365 movl %edx, %ecx
29366 subl $1, %ebx
29367 sbb $0, %ecx
29368+
29369+#ifdef CONFIG_PAX_REFCOUNT
29370+ into
29371+1234:
29372+ _ASM_EXTABLE(1234b, 2f)
29373+#endif
29374+
29375 js 2f
29376 LOCK_PREFIX
29377 cmpxchg8b (%esi)
29378@@ -137,6 +204,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29379 movl %ebx, %eax
29380 movl %ecx, %edx
29381 popl_cfi_reg ebx
29382+ pax_force_retaddr
29383 ret
29384 CFI_ENDPROC
29385 ENDPROC(atomic64_dec_if_positive_cx8)
29386@@ -161,6 +229,13 @@ ENTRY(atomic64_add_unless_cx8)
29387 movl %edx, %ecx
29388 addl %ebp, %ebx
29389 adcl %edi, %ecx
29390+
29391+#ifdef CONFIG_PAX_REFCOUNT
29392+ into
29393+1234:
29394+ _ASM_EXTABLE(1234b, 3f)
29395+#endif
29396+
29397 LOCK_PREFIX
29398 cmpxchg8b (%esi)
29399 jne 1b
29400@@ -171,6 +246,7 @@ ENTRY(atomic64_add_unless_cx8)
29401 CFI_ADJUST_CFA_OFFSET -8
29402 popl_cfi_reg ebx
29403 popl_cfi_reg ebp
29404+ pax_force_retaddr
29405 ret
29406 4:
29407 cmpl %edx, 4(%esp)
29408@@ -193,6 +269,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29409 xorl %ecx, %ecx
29410 addl $1, %ebx
29411 adcl %edx, %ecx
29412+
29413+#ifdef CONFIG_PAX_REFCOUNT
29414+ into
29415+1234:
29416+ _ASM_EXTABLE(1234b, 3f)
29417+#endif
29418+
29419 LOCK_PREFIX
29420 cmpxchg8b (%esi)
29421 jne 1b
29422@@ -200,6 +283,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29423 movl $1, %eax
29424 3:
29425 popl_cfi_reg ebx
29426+ pax_force_retaddr
29427 ret
29428 CFI_ENDPROC
29429 ENDPROC(atomic64_inc_not_zero_cx8)
29430diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29431index 9bc944a..e52be6c 100644
29432--- a/arch/x86/lib/checksum_32.S
29433+++ b/arch/x86/lib/checksum_32.S
29434@@ -29,7 +29,8 @@
29435 #include <asm/dwarf2.h>
29436 #include <asm/errno.h>
29437 #include <asm/asm.h>
29438-
29439+#include <asm/segment.h>
29440+
29441 /*
29442 * computes a partial checksum, e.g. for TCP/UDP fragments
29443 */
29444@@ -285,9 +286,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29445
29446 #define ARGBASE 16
29447 #define FP 12
29448-
29449-ENTRY(csum_partial_copy_generic)
29450+
29451+ENTRY(csum_partial_copy_generic_to_user)
29452 CFI_STARTPROC
29453+
29454+#ifdef CONFIG_PAX_MEMORY_UDEREF
29455+ pushl_cfi %gs
29456+ popl_cfi %es
29457+ jmp csum_partial_copy_generic
29458+#endif
29459+
29460+ENTRY(csum_partial_copy_generic_from_user)
29461+
29462+#ifdef CONFIG_PAX_MEMORY_UDEREF
29463+ pushl_cfi %gs
29464+ popl_cfi %ds
29465+#endif
29466+
29467+ENTRY(csum_partial_copy_generic)
29468 subl $4,%esp
29469 CFI_ADJUST_CFA_OFFSET 4
29470 pushl_cfi_reg edi
29471@@ -306,7 +322,7 @@ ENTRY(csum_partial_copy_generic)
29472 jmp 4f
29473 SRC(1: movw (%esi), %bx )
29474 addl $2, %esi
29475-DST( movw %bx, (%edi) )
29476+DST( movw %bx, %es:(%edi) )
29477 addl $2, %edi
29478 addw %bx, %ax
29479 adcl $0, %eax
29480@@ -318,30 +334,30 @@ DST( movw %bx, (%edi) )
29481 SRC(1: movl (%esi), %ebx )
29482 SRC( movl 4(%esi), %edx )
29483 adcl %ebx, %eax
29484-DST( movl %ebx, (%edi) )
29485+DST( movl %ebx, %es:(%edi) )
29486 adcl %edx, %eax
29487-DST( movl %edx, 4(%edi) )
29488+DST( movl %edx, %es:4(%edi) )
29489
29490 SRC( movl 8(%esi), %ebx )
29491 SRC( movl 12(%esi), %edx )
29492 adcl %ebx, %eax
29493-DST( movl %ebx, 8(%edi) )
29494+DST( movl %ebx, %es:8(%edi) )
29495 adcl %edx, %eax
29496-DST( movl %edx, 12(%edi) )
29497+DST( movl %edx, %es:12(%edi) )
29498
29499 SRC( movl 16(%esi), %ebx )
29500 SRC( movl 20(%esi), %edx )
29501 adcl %ebx, %eax
29502-DST( movl %ebx, 16(%edi) )
29503+DST( movl %ebx, %es:16(%edi) )
29504 adcl %edx, %eax
29505-DST( movl %edx, 20(%edi) )
29506+DST( movl %edx, %es:20(%edi) )
29507
29508 SRC( movl 24(%esi), %ebx )
29509 SRC( movl 28(%esi), %edx )
29510 adcl %ebx, %eax
29511-DST( movl %ebx, 24(%edi) )
29512+DST( movl %ebx, %es:24(%edi) )
29513 adcl %edx, %eax
29514-DST( movl %edx, 28(%edi) )
29515+DST( movl %edx, %es:28(%edi) )
29516
29517 lea 32(%esi), %esi
29518 lea 32(%edi), %edi
29519@@ -355,7 +371,7 @@ DST( movl %edx, 28(%edi) )
29520 shrl $2, %edx # This clears CF
29521 SRC(3: movl (%esi), %ebx )
29522 adcl %ebx, %eax
29523-DST( movl %ebx, (%edi) )
29524+DST( movl %ebx, %es:(%edi) )
29525 lea 4(%esi), %esi
29526 lea 4(%edi), %edi
29527 dec %edx
29528@@ -367,12 +383,12 @@ DST( movl %ebx, (%edi) )
29529 jb 5f
29530 SRC( movw (%esi), %cx )
29531 leal 2(%esi), %esi
29532-DST( movw %cx, (%edi) )
29533+DST( movw %cx, %es:(%edi) )
29534 leal 2(%edi), %edi
29535 je 6f
29536 shll $16,%ecx
29537 SRC(5: movb (%esi), %cl )
29538-DST( movb %cl, (%edi) )
29539+DST( movb %cl, %es:(%edi) )
29540 6: addl %ecx, %eax
29541 adcl $0, %eax
29542 7:
29543@@ -383,7 +399,7 @@ DST( movb %cl, (%edi) )
29544
29545 6001:
29546 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29547- movl $-EFAULT, (%ebx)
29548+ movl $-EFAULT, %ss:(%ebx)
29549
29550 # zero the complete destination - computing the rest
29551 # is too much work
29552@@ -396,37 +412,58 @@ DST( movb %cl, (%edi) )
29553
29554 6002:
29555 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29556- movl $-EFAULT,(%ebx)
29557+ movl $-EFAULT,%ss:(%ebx)
29558 jmp 5000b
29559
29560 .previous
29561
29562+ pushl_cfi %ss
29563+ popl_cfi %ds
29564+ pushl_cfi %ss
29565+ popl_cfi %es
29566 popl_cfi_reg ebx
29567 popl_cfi_reg esi
29568 popl_cfi_reg edi
29569 popl_cfi %ecx # equivalent to addl $4,%esp
29570 ret
29571 CFI_ENDPROC
29572-ENDPROC(csum_partial_copy_generic)
29573+ENDPROC(csum_partial_copy_generic_to_user)
29574
29575 #else
29576
29577 /* Version for PentiumII/PPro */
29578
29579 #define ROUND1(x) \
29580+ nop; nop; nop; \
29581 SRC(movl x(%esi), %ebx ) ; \
29582 addl %ebx, %eax ; \
29583- DST(movl %ebx, x(%edi) ) ;
29584+ DST(movl %ebx, %es:x(%edi)) ;
29585
29586 #define ROUND(x) \
29587+ nop; nop; nop; \
29588 SRC(movl x(%esi), %ebx ) ; \
29589 adcl %ebx, %eax ; \
29590- DST(movl %ebx, x(%edi) ) ;
29591+ DST(movl %ebx, %es:x(%edi)) ;
29592
29593 #define ARGBASE 12
29594-
29595-ENTRY(csum_partial_copy_generic)
29596+
29597+ENTRY(csum_partial_copy_generic_to_user)
29598 CFI_STARTPROC
29599+
29600+#ifdef CONFIG_PAX_MEMORY_UDEREF
29601+ pushl_cfi %gs
29602+ popl_cfi %es
29603+ jmp csum_partial_copy_generic
29604+#endif
29605+
29606+ENTRY(csum_partial_copy_generic_from_user)
29607+
29608+#ifdef CONFIG_PAX_MEMORY_UDEREF
29609+ pushl_cfi %gs
29610+ popl_cfi %ds
29611+#endif
29612+
29613+ENTRY(csum_partial_copy_generic)
29614 pushl_cfi_reg ebx
29615 pushl_cfi_reg edi
29616 pushl_cfi_reg esi
29617@@ -444,7 +481,7 @@ ENTRY(csum_partial_copy_generic)
29618 subl %ebx, %edi
29619 lea -1(%esi),%edx
29620 andl $-32,%edx
29621- lea 3f(%ebx,%ebx), %ebx
29622+ lea 3f(%ebx,%ebx,2), %ebx
29623 testl %esi, %esi
29624 jmp *%ebx
29625 1: addl $64,%esi
29626@@ -465,19 +502,19 @@ ENTRY(csum_partial_copy_generic)
29627 jb 5f
29628 SRC( movw (%esi), %dx )
29629 leal 2(%esi), %esi
29630-DST( movw %dx, (%edi) )
29631+DST( movw %dx, %es:(%edi) )
29632 leal 2(%edi), %edi
29633 je 6f
29634 shll $16,%edx
29635 5:
29636 SRC( movb (%esi), %dl )
29637-DST( movb %dl, (%edi) )
29638+DST( movb %dl, %es:(%edi) )
29639 6: addl %edx, %eax
29640 adcl $0, %eax
29641 7:
29642 .section .fixup, "ax"
29643 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29644- movl $-EFAULT, (%ebx)
29645+ movl $-EFAULT, %ss:(%ebx)
29646 # zero the complete destination (computing the rest is too much work)
29647 movl ARGBASE+8(%esp),%edi # dst
29648 movl ARGBASE+12(%esp),%ecx # len
29649@@ -485,16 +522,23 @@ DST( movb %dl, (%edi) )
29650 rep; stosb
29651 jmp 7b
29652 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29653- movl $-EFAULT, (%ebx)
29654+ movl $-EFAULT, %ss:(%ebx)
29655 jmp 7b
29656 .previous
29657
29658+#ifdef CONFIG_PAX_MEMORY_UDEREF
29659+ pushl_cfi %ss
29660+ popl_cfi %ds
29661+ pushl_cfi %ss
29662+ popl_cfi %es
29663+#endif
29664+
29665 popl_cfi_reg esi
29666 popl_cfi_reg edi
29667 popl_cfi_reg ebx
29668 ret
29669 CFI_ENDPROC
29670-ENDPROC(csum_partial_copy_generic)
29671+ENDPROC(csum_partial_copy_generic_to_user)
29672
29673 #undef ROUND
29674 #undef ROUND1
29675diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29676index e67e579..4782449 100644
29677--- a/arch/x86/lib/clear_page_64.S
29678+++ b/arch/x86/lib/clear_page_64.S
29679@@ -23,6 +23,7 @@ ENTRY(clear_page)
29680 movl $4096/8,%ecx
29681 xorl %eax,%eax
29682 rep stosq
29683+ pax_force_retaddr
29684 ret
29685 CFI_ENDPROC
29686 ENDPROC(clear_page)
29687@@ -47,6 +48,7 @@ ENTRY(clear_page_orig)
29688 leaq 64(%rdi),%rdi
29689 jnz .Lloop
29690 nop
29691+ pax_force_retaddr
29692 ret
29693 CFI_ENDPROC
29694 ENDPROC(clear_page_orig)
29695@@ -56,6 +58,7 @@ ENTRY(clear_page_c_e)
29696 movl $4096,%ecx
29697 xorl %eax,%eax
29698 rep stosb
29699+ pax_force_retaddr
29700 ret
29701 CFI_ENDPROC
29702 ENDPROC(clear_page_c_e)
29703diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29704index 40a1725..5d12ac4 100644
29705--- a/arch/x86/lib/cmpxchg16b_emu.S
29706+++ b/arch/x86/lib/cmpxchg16b_emu.S
29707@@ -8,6 +8,7 @@
29708 #include <linux/linkage.h>
29709 #include <asm/dwarf2.h>
29710 #include <asm/percpu.h>
29711+#include <asm/alternative-asm.h>
29712
29713 .text
29714
29715@@ -46,12 +47,14 @@ CFI_STARTPROC
29716 CFI_REMEMBER_STATE
29717 popfq_cfi
29718 mov $1, %al
29719+ pax_force_retaddr
29720 ret
29721
29722 CFI_RESTORE_STATE
29723 .Lnot_same:
29724 popfq_cfi
29725 xor %al,%al
29726+ pax_force_retaddr
29727 ret
29728
29729 CFI_ENDPROC
29730diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29731index 8239dbc..e714d2a 100644
29732--- a/arch/x86/lib/copy_page_64.S
29733+++ b/arch/x86/lib/copy_page_64.S
29734@@ -17,6 +17,7 @@ ENTRY(copy_page)
29735 ALTERNATIVE "jmp copy_page_regs", "", X86_FEATURE_REP_GOOD
29736 movl $4096/8, %ecx
29737 rep movsq
29738+ pax_force_retaddr
29739 ret
29740 CFI_ENDPROC
29741 ENDPROC(copy_page)
29742@@ -27,8 +28,8 @@ ENTRY(copy_page_regs)
29743 CFI_ADJUST_CFA_OFFSET 2*8
29744 movq %rbx, (%rsp)
29745 CFI_REL_OFFSET rbx, 0
29746- movq %r12, 1*8(%rsp)
29747- CFI_REL_OFFSET r12, 1*8
29748+ movq %r13, 1*8(%rsp)
29749+ CFI_REL_OFFSET r13, 1*8
29750
29751 movl $(4096/64)-5, %ecx
29752 .p2align 4
29753@@ -41,7 +42,7 @@ ENTRY(copy_page_regs)
29754 movq 0x8*4(%rsi), %r9
29755 movq 0x8*5(%rsi), %r10
29756 movq 0x8*6(%rsi), %r11
29757- movq 0x8*7(%rsi), %r12
29758+ movq 0x8*7(%rsi), %r13
29759
29760 prefetcht0 5*64(%rsi)
29761
29762@@ -52,7 +53,7 @@ ENTRY(copy_page_regs)
29763 movq %r9, 0x8*4(%rdi)
29764 movq %r10, 0x8*5(%rdi)
29765 movq %r11, 0x8*6(%rdi)
29766- movq %r12, 0x8*7(%rdi)
29767+ movq %r13, 0x8*7(%rdi)
29768
29769 leaq 64 (%rsi), %rsi
29770 leaq 64 (%rdi), %rdi
29771@@ -71,7 +72,7 @@ ENTRY(copy_page_regs)
29772 movq 0x8*4(%rsi), %r9
29773 movq 0x8*5(%rsi), %r10
29774 movq 0x8*6(%rsi), %r11
29775- movq 0x8*7(%rsi), %r12
29776+ movq 0x8*7(%rsi), %r13
29777
29778 movq %rax, 0x8*0(%rdi)
29779 movq %rbx, 0x8*1(%rdi)
29780@@ -80,7 +81,7 @@ ENTRY(copy_page_regs)
29781 movq %r9, 0x8*4(%rdi)
29782 movq %r10, 0x8*5(%rdi)
29783 movq %r11, 0x8*6(%rdi)
29784- movq %r12, 0x8*7(%rdi)
29785+ movq %r13, 0x8*7(%rdi)
29786
29787 leaq 64(%rdi), %rdi
29788 leaq 64(%rsi), %rsi
29789@@ -88,10 +89,11 @@ ENTRY(copy_page_regs)
29790
29791 movq (%rsp), %rbx
29792 CFI_RESTORE rbx
29793- movq 1*8(%rsp), %r12
29794- CFI_RESTORE r12
29795+ movq 1*8(%rsp), %r13
29796+ CFI_RESTORE r13
29797 addq $2*8, %rsp
29798 CFI_ADJUST_CFA_OFFSET -2*8
29799+ pax_force_retaddr
29800 ret
29801 CFI_ENDPROC
29802 ENDPROC(copy_page_regs)
29803diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29804index fa997df..060ab18 100644
29805--- a/arch/x86/lib/copy_user_64.S
29806+++ b/arch/x86/lib/copy_user_64.S
29807@@ -15,6 +15,7 @@
29808 #include <asm/alternative-asm.h>
29809 #include <asm/asm.h>
29810 #include <asm/smap.h>
29811+#include <asm/pgtable.h>
29812
29813 .macro ALIGN_DESTINATION
29814 /* check for bad alignment of destination */
29815@@ -40,56 +41,6 @@
29816 _ASM_EXTABLE(101b,103b)
29817 .endm
29818
29819-/* Standard copy_to_user with segment limit checking */
29820-ENTRY(_copy_to_user)
29821- CFI_STARTPROC
29822- GET_THREAD_INFO(%rax)
29823- movq %rdi,%rcx
29824- addq %rdx,%rcx
29825- jc bad_to_user
29826- cmpq TI_addr_limit(%rax),%rcx
29827- ja bad_to_user
29828- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
29829- "jmp copy_user_generic_string", \
29830- X86_FEATURE_REP_GOOD, \
29831- "jmp copy_user_enhanced_fast_string", \
29832- X86_FEATURE_ERMS
29833- CFI_ENDPROC
29834-ENDPROC(_copy_to_user)
29835-
29836-/* Standard copy_from_user with segment limit checking */
29837-ENTRY(_copy_from_user)
29838- CFI_STARTPROC
29839- GET_THREAD_INFO(%rax)
29840- movq %rsi,%rcx
29841- addq %rdx,%rcx
29842- jc bad_from_user
29843- cmpq TI_addr_limit(%rax),%rcx
29844- ja bad_from_user
29845- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
29846- "jmp copy_user_generic_string", \
29847- X86_FEATURE_REP_GOOD, \
29848- "jmp copy_user_enhanced_fast_string", \
29849- X86_FEATURE_ERMS
29850- CFI_ENDPROC
29851-ENDPROC(_copy_from_user)
29852-
29853- .section .fixup,"ax"
29854- /* must zero dest */
29855-ENTRY(bad_from_user)
29856-bad_from_user:
29857- CFI_STARTPROC
29858- movl %edx,%ecx
29859- xorl %eax,%eax
29860- rep
29861- stosb
29862-bad_to_user:
29863- movl %edx,%eax
29864- ret
29865- CFI_ENDPROC
29866-ENDPROC(bad_from_user)
29867- .previous
29868-
29869 /*
29870 * copy_user_generic_unrolled - memory copy with exception handling.
29871 * This version is for CPUs like P4 that don't have efficient micro
29872@@ -105,6 +56,7 @@ ENDPROC(bad_from_user)
29873 */
29874 ENTRY(copy_user_generic_unrolled)
29875 CFI_STARTPROC
29876+ ASM_PAX_OPEN_USERLAND
29877 ASM_STAC
29878 cmpl $8,%edx
29879 jb 20f /* less then 8 bytes, go to byte copy loop */
29880@@ -154,6 +106,8 @@ ENTRY(copy_user_generic_unrolled)
29881 jnz 21b
29882 23: xor %eax,%eax
29883 ASM_CLAC
29884+ ASM_PAX_CLOSE_USERLAND
29885+ pax_force_retaddr
29886 ret
29887
29888 .section .fixup,"ax"
29889@@ -209,6 +163,7 @@ ENDPROC(copy_user_generic_unrolled)
29890 */
29891 ENTRY(copy_user_generic_string)
29892 CFI_STARTPROC
29893+ ASM_PAX_OPEN_USERLAND
29894 ASM_STAC
29895 cmpl $8,%edx
29896 jb 2f /* less than 8 bytes, go to byte copy loop */
29897@@ -223,6 +178,8 @@ ENTRY(copy_user_generic_string)
29898 movsb
29899 xorl %eax,%eax
29900 ASM_CLAC
29901+ ASM_PAX_CLOSE_USERLAND
29902+ pax_force_retaddr
29903 ret
29904
29905 .section .fixup,"ax"
29906@@ -250,12 +207,15 @@ ENDPROC(copy_user_generic_string)
29907 */
29908 ENTRY(copy_user_enhanced_fast_string)
29909 CFI_STARTPROC
29910+ ASM_PAX_OPEN_USERLAND
29911 ASM_STAC
29912 movl %edx,%ecx
29913 1: rep
29914 movsb
29915 xorl %eax,%eax
29916 ASM_CLAC
29917+ ASM_PAX_CLOSE_USERLAND
29918+ pax_force_retaddr
29919 ret
29920
29921 .section .fixup,"ax"
29922diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29923index 6a4f43c..c70fb52 100644
29924--- a/arch/x86/lib/copy_user_nocache_64.S
29925+++ b/arch/x86/lib/copy_user_nocache_64.S
29926@@ -8,6 +8,7 @@
29927
29928 #include <linux/linkage.h>
29929 #include <asm/dwarf2.h>
29930+#include <asm/alternative-asm.h>
29931
29932 #define FIX_ALIGNMENT 1
29933
29934@@ -16,6 +17,7 @@
29935 #include <asm/thread_info.h>
29936 #include <asm/asm.h>
29937 #include <asm/smap.h>
29938+#include <asm/pgtable.h>
29939
29940 .macro ALIGN_DESTINATION
29941 #ifdef FIX_ALIGNMENT
29942@@ -49,6 +51,16 @@
29943 */
29944 ENTRY(__copy_user_nocache)
29945 CFI_STARTPROC
29946+
29947+#ifdef CONFIG_PAX_MEMORY_UDEREF
29948+ mov pax_user_shadow_base,%rcx
29949+ cmp %rcx,%rsi
29950+ jae 1f
29951+ add %rcx,%rsi
29952+1:
29953+#endif
29954+
29955+ ASM_PAX_OPEN_USERLAND
29956 ASM_STAC
29957 cmpl $8,%edx
29958 jb 20f /* less then 8 bytes, go to byte copy loop */
29959@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29960 jnz 21b
29961 23: xorl %eax,%eax
29962 ASM_CLAC
29963+ ASM_PAX_CLOSE_USERLAND
29964 sfence
29965+ pax_force_retaddr
29966 ret
29967
29968 .section .fixup,"ax"
29969diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29970index 9734182..dbee61c 100644
29971--- a/arch/x86/lib/csum-copy_64.S
29972+++ b/arch/x86/lib/csum-copy_64.S
29973@@ -9,6 +9,7 @@
29974 #include <asm/dwarf2.h>
29975 #include <asm/errno.h>
29976 #include <asm/asm.h>
29977+#include <asm/alternative-asm.h>
29978
29979 /*
29980 * Checksum copy with exception handling.
29981@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
29982 CFI_ADJUST_CFA_OFFSET 7*8
29983 movq %rbx, 2*8(%rsp)
29984 CFI_REL_OFFSET rbx, 2*8
29985- movq %r12, 3*8(%rsp)
29986- CFI_REL_OFFSET r12, 3*8
29987+ movq %r15, 3*8(%rsp)
29988+ CFI_REL_OFFSET r15, 3*8
29989 movq %r14, 4*8(%rsp)
29990 CFI_REL_OFFSET r14, 4*8
29991 movq %r13, 5*8(%rsp)
29992@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
29993 movl %edx, %ecx
29994
29995 xorl %r9d, %r9d
29996- movq %rcx, %r12
29997+ movq %rcx, %r15
29998
29999- shrq $6, %r12
30000+ shrq $6, %r15
30001 jz .Lhandle_tail /* < 64 */
30002
30003 clc
30004
30005 /* main loop. clear in 64 byte blocks */
30006 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30007- /* r11: temp3, rdx: temp4, r12 loopcnt */
30008+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30009 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30010 .p2align 4
30011 .Lloop:
30012@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30013 adcq %r14, %rax
30014 adcq %r13, %rax
30015
30016- decl %r12d
30017+ decl %r15d
30018
30019 dest
30020 movq %rbx, (%rsi)
30021@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30022 .Lende:
30023 movq 2*8(%rsp), %rbx
30024 CFI_RESTORE rbx
30025- movq 3*8(%rsp), %r12
30026- CFI_RESTORE r12
30027+ movq 3*8(%rsp), %r15
30028+ CFI_RESTORE r15
30029 movq 4*8(%rsp), %r14
30030 CFI_RESTORE r14
30031 movq 5*8(%rsp), %r13
30032@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30033 CFI_RESTORE rbp
30034 addq $7*8, %rsp
30035 CFI_ADJUST_CFA_OFFSET -7*8
30036+ pax_force_retaddr
30037 ret
30038 CFI_RESTORE_STATE
30039
30040diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30041index 1318f75..44c30fd 100644
30042--- a/arch/x86/lib/csum-wrappers_64.c
30043+++ b/arch/x86/lib/csum-wrappers_64.c
30044@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30045 len -= 2;
30046 }
30047 }
30048+ pax_open_userland();
30049 stac();
30050- isum = csum_partial_copy_generic((__force const void *)src,
30051+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30052 dst, len, isum, errp, NULL);
30053 clac();
30054+ pax_close_userland();
30055 if (unlikely(*errp))
30056 goto out_err;
30057
30058@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30059 }
30060
30061 *errp = 0;
30062+ pax_open_userland();
30063 stac();
30064- ret = csum_partial_copy_generic(src, (void __force *)dst,
30065+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30066 len, isum, NULL, errp);
30067 clac();
30068+ pax_close_userland();
30069 return ret;
30070 }
30071 EXPORT_SYMBOL(csum_partial_copy_to_user);
30072diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30073index a451235..a74bfa3 100644
30074--- a/arch/x86/lib/getuser.S
30075+++ b/arch/x86/lib/getuser.S
30076@@ -33,17 +33,40 @@
30077 #include <asm/thread_info.h>
30078 #include <asm/asm.h>
30079 #include <asm/smap.h>
30080+#include <asm/segment.h>
30081+#include <asm/pgtable.h>
30082+#include <asm/alternative-asm.h>
30083+
30084+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30085+#define __copyuser_seg gs;
30086+#else
30087+#define __copyuser_seg
30088+#endif
30089
30090 .text
30091 ENTRY(__get_user_1)
30092 CFI_STARTPROC
30093+
30094+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30095 GET_THREAD_INFO(%_ASM_DX)
30096 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30097 jae bad_get_user
30098+
30099+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30100+ mov pax_user_shadow_base,%_ASM_DX
30101+ cmp %_ASM_DX,%_ASM_AX
30102+ jae 1234f
30103+ add %_ASM_DX,%_ASM_AX
30104+1234:
30105+#endif
30106+
30107+#endif
30108+
30109 ASM_STAC
30110-1: movzbl (%_ASM_AX),%edx
30111+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30112 xor %eax,%eax
30113 ASM_CLAC
30114+ pax_force_retaddr
30115 ret
30116 CFI_ENDPROC
30117 ENDPROC(__get_user_1)
30118@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30119 ENTRY(__get_user_2)
30120 CFI_STARTPROC
30121 add $1,%_ASM_AX
30122+
30123+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30124 jc bad_get_user
30125 GET_THREAD_INFO(%_ASM_DX)
30126 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30127 jae bad_get_user
30128+
30129+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30130+ mov pax_user_shadow_base,%_ASM_DX
30131+ cmp %_ASM_DX,%_ASM_AX
30132+ jae 1234f
30133+ add %_ASM_DX,%_ASM_AX
30134+1234:
30135+#endif
30136+
30137+#endif
30138+
30139 ASM_STAC
30140-2: movzwl -1(%_ASM_AX),%edx
30141+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30142 xor %eax,%eax
30143 ASM_CLAC
30144+ pax_force_retaddr
30145 ret
30146 CFI_ENDPROC
30147 ENDPROC(__get_user_2)
30148@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30149 ENTRY(__get_user_4)
30150 CFI_STARTPROC
30151 add $3,%_ASM_AX
30152+
30153+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30154 jc bad_get_user
30155 GET_THREAD_INFO(%_ASM_DX)
30156 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30157 jae bad_get_user
30158+
30159+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30160+ mov pax_user_shadow_base,%_ASM_DX
30161+ cmp %_ASM_DX,%_ASM_AX
30162+ jae 1234f
30163+ add %_ASM_DX,%_ASM_AX
30164+1234:
30165+#endif
30166+
30167+#endif
30168+
30169 ASM_STAC
30170-3: movl -3(%_ASM_AX),%edx
30171+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30172 xor %eax,%eax
30173 ASM_CLAC
30174+ pax_force_retaddr
30175 ret
30176 CFI_ENDPROC
30177 ENDPROC(__get_user_4)
30178@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30179 GET_THREAD_INFO(%_ASM_DX)
30180 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30181 jae bad_get_user
30182+
30183+#ifdef CONFIG_PAX_MEMORY_UDEREF
30184+ mov pax_user_shadow_base,%_ASM_DX
30185+ cmp %_ASM_DX,%_ASM_AX
30186+ jae 1234f
30187+ add %_ASM_DX,%_ASM_AX
30188+1234:
30189+#endif
30190+
30191 ASM_STAC
30192 4: movq -7(%_ASM_AX),%rdx
30193 xor %eax,%eax
30194 ASM_CLAC
30195+ pax_force_retaddr
30196 ret
30197 #else
30198 add $7,%_ASM_AX
30199@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30200 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30201 jae bad_get_user_8
30202 ASM_STAC
30203-4: movl -7(%_ASM_AX),%edx
30204-5: movl -3(%_ASM_AX),%ecx
30205+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30206+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30207 xor %eax,%eax
30208 ASM_CLAC
30209+ pax_force_retaddr
30210 ret
30211 #endif
30212 CFI_ENDPROC
30213@@ -113,6 +175,7 @@ bad_get_user:
30214 xor %edx,%edx
30215 mov $(-EFAULT),%_ASM_AX
30216 ASM_CLAC
30217+ pax_force_retaddr
30218 ret
30219 CFI_ENDPROC
30220 END(bad_get_user)
30221@@ -124,6 +187,7 @@ bad_get_user_8:
30222 xor %ecx,%ecx
30223 mov $(-EFAULT),%_ASM_AX
30224 ASM_CLAC
30225+ pax_force_retaddr
30226 ret
30227 CFI_ENDPROC
30228 END(bad_get_user_8)
30229diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30230index 8f72b33..a43d9969 100644
30231--- a/arch/x86/lib/insn.c
30232+++ b/arch/x86/lib/insn.c
30233@@ -20,8 +20,10 @@
30234
30235 #ifdef __KERNEL__
30236 #include <linux/string.h>
30237+#include <asm/pgtable_types.h>
30238 #else
30239 #include <string.h>
30240+#define ktla_ktva(addr) addr
30241 #endif
30242 #include <asm/inat.h>
30243 #include <asm/insn.h>
30244@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30245 buf_len = MAX_INSN_SIZE;
30246
30247 memset(insn, 0, sizeof(*insn));
30248- insn->kaddr = kaddr;
30249- insn->end_kaddr = kaddr + buf_len;
30250- insn->next_byte = kaddr;
30251+ insn->kaddr = ktla_ktva(kaddr);
30252+ insn->end_kaddr = insn->kaddr + buf_len;
30253+ insn->next_byte = insn->kaddr;
30254 insn->x86_64 = x86_64 ? 1 : 0;
30255 insn->opnd_bytes = 4;
30256 if (x86_64)
30257diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30258index 05a95e7..326f2fa 100644
30259--- a/arch/x86/lib/iomap_copy_64.S
30260+++ b/arch/x86/lib/iomap_copy_64.S
30261@@ -17,6 +17,7 @@
30262
30263 #include <linux/linkage.h>
30264 #include <asm/dwarf2.h>
30265+#include <asm/alternative-asm.h>
30266
30267 /*
30268 * override generic version in lib/iomap_copy.c
30269@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30270 CFI_STARTPROC
30271 movl %edx,%ecx
30272 rep movsd
30273+ pax_force_retaddr
30274 ret
30275 CFI_ENDPROC
30276 ENDPROC(__iowrite32_copy)
30277diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30278index b046664..dec9465 100644
30279--- a/arch/x86/lib/memcpy_64.S
30280+++ b/arch/x86/lib/memcpy_64.S
30281@@ -37,6 +37,7 @@ ENTRY(memcpy)
30282 rep movsq
30283 movl %edx, %ecx
30284 rep movsb
30285+ pax_force_retaddr
30286 ret
30287 ENDPROC(memcpy)
30288 ENDPROC(__memcpy)
30289@@ -49,6 +50,7 @@ ENTRY(memcpy_erms)
30290 movq %rdi, %rax
30291 movq %rdx, %rcx
30292 rep movsb
30293+ pax_force_retaddr
30294 ret
30295 ENDPROC(memcpy_erms)
30296
30297@@ -134,6 +136,7 @@ ENTRY(memcpy_orig)
30298 movq %r9, 1*8(%rdi)
30299 movq %r10, -2*8(%rdi, %rdx)
30300 movq %r11, -1*8(%rdi, %rdx)
30301+ pax_force_retaddr
30302 retq
30303 .p2align 4
30304 .Lless_16bytes:
30305@@ -146,6 +149,7 @@ ENTRY(memcpy_orig)
30306 movq -1*8(%rsi, %rdx), %r9
30307 movq %r8, 0*8(%rdi)
30308 movq %r9, -1*8(%rdi, %rdx)
30309+ pax_force_retaddr
30310 retq
30311 .p2align 4
30312 .Lless_8bytes:
30313@@ -159,6 +163,7 @@ ENTRY(memcpy_orig)
30314 movl -4(%rsi, %rdx), %r8d
30315 movl %ecx, (%rdi)
30316 movl %r8d, -4(%rdi, %rdx)
30317+ pax_force_retaddr
30318 retq
30319 .p2align 4
30320 .Lless_3bytes:
30321@@ -177,6 +182,7 @@ ENTRY(memcpy_orig)
30322 movb %cl, (%rdi)
30323
30324 .Lend:
30325+ pax_force_retaddr
30326 retq
30327 CFI_ENDPROC
30328 ENDPROC(memcpy_orig)
30329diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30330index 0f8a0d0..f6e0ea4 100644
30331--- a/arch/x86/lib/memmove_64.S
30332+++ b/arch/x86/lib/memmove_64.S
30333@@ -43,7 +43,7 @@ ENTRY(__memmove)
30334 jg 2f
30335
30336 .Lmemmove_begin_forward:
30337- ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; retq", X86_FEATURE_ERMS
30338+ ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; pax_force_retaddr; retq", X86_FEATURE_ERMS
30339
30340 /*
30341 * movsq instruction have many startup latency
30342@@ -206,6 +206,7 @@ ENTRY(__memmove)
30343 movb (%rsi), %r11b
30344 movb %r11b, (%rdi)
30345 13:
30346+ pax_force_retaddr
30347 retq
30348 CFI_ENDPROC
30349 ENDPROC(__memmove)
30350diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30351index 93118fb..386ed2a 100644
30352--- a/arch/x86/lib/memset_64.S
30353+++ b/arch/x86/lib/memset_64.S
30354@@ -41,6 +41,7 @@ ENTRY(__memset)
30355 movl %edx,%ecx
30356 rep stosb
30357 movq %r9,%rax
30358+ pax_force_retaddr
30359 ret
30360 ENDPROC(memset)
30361 ENDPROC(__memset)
30362@@ -62,6 +63,7 @@ ENTRY(memset_erms)
30363 movq %rdx,%rcx
30364 rep stosb
30365 movq %r9,%rax
30366+ pax_force_retaddr
30367 ret
30368 ENDPROC(memset_erms)
30369
30370@@ -126,6 +128,7 @@ ENTRY(memset_orig)
30371
30372 .Lende:
30373 movq %r10,%rax
30374+ pax_force_retaddr
30375 ret
30376
30377 CFI_RESTORE_STATE
30378diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30379index c9f2d9b..e7fd2c0 100644
30380--- a/arch/x86/lib/mmx_32.c
30381+++ b/arch/x86/lib/mmx_32.c
30382@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30383 {
30384 void *p;
30385 int i;
30386+ unsigned long cr0;
30387
30388 if (unlikely(in_interrupt()))
30389 return __memcpy(to, from, len);
30390@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30391 kernel_fpu_begin();
30392
30393 __asm__ __volatile__ (
30394- "1: prefetch (%0)\n" /* This set is 28 bytes */
30395- " prefetch 64(%0)\n"
30396- " prefetch 128(%0)\n"
30397- " prefetch 192(%0)\n"
30398- " prefetch 256(%0)\n"
30399+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30400+ " prefetch 64(%1)\n"
30401+ " prefetch 128(%1)\n"
30402+ " prefetch 192(%1)\n"
30403+ " prefetch 256(%1)\n"
30404 "2: \n"
30405 ".section .fixup, \"ax\"\n"
30406- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30407+ "3: \n"
30408+
30409+#ifdef CONFIG_PAX_KERNEXEC
30410+ " movl %%cr0, %0\n"
30411+ " movl %0, %%eax\n"
30412+ " andl $0xFFFEFFFF, %%eax\n"
30413+ " movl %%eax, %%cr0\n"
30414+#endif
30415+
30416+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30417+
30418+#ifdef CONFIG_PAX_KERNEXEC
30419+ " movl %0, %%cr0\n"
30420+#endif
30421+
30422 " jmp 2b\n"
30423 ".previous\n"
30424 _ASM_EXTABLE(1b, 3b)
30425- : : "r" (from));
30426+ : "=&r" (cr0) : "r" (from) : "ax");
30427
30428 for ( ; i > 5; i--) {
30429 __asm__ __volatile__ (
30430- "1: prefetch 320(%0)\n"
30431- "2: movq (%0), %%mm0\n"
30432- " movq 8(%0), %%mm1\n"
30433- " movq 16(%0), %%mm2\n"
30434- " movq 24(%0), %%mm3\n"
30435- " movq %%mm0, (%1)\n"
30436- " movq %%mm1, 8(%1)\n"
30437- " movq %%mm2, 16(%1)\n"
30438- " movq %%mm3, 24(%1)\n"
30439- " movq 32(%0), %%mm0\n"
30440- " movq 40(%0), %%mm1\n"
30441- " movq 48(%0), %%mm2\n"
30442- " movq 56(%0), %%mm3\n"
30443- " movq %%mm0, 32(%1)\n"
30444- " movq %%mm1, 40(%1)\n"
30445- " movq %%mm2, 48(%1)\n"
30446- " movq %%mm3, 56(%1)\n"
30447+ "1: prefetch 320(%1)\n"
30448+ "2: movq (%1), %%mm0\n"
30449+ " movq 8(%1), %%mm1\n"
30450+ " movq 16(%1), %%mm2\n"
30451+ " movq 24(%1), %%mm3\n"
30452+ " movq %%mm0, (%2)\n"
30453+ " movq %%mm1, 8(%2)\n"
30454+ " movq %%mm2, 16(%2)\n"
30455+ " movq %%mm3, 24(%2)\n"
30456+ " movq 32(%1), %%mm0\n"
30457+ " movq 40(%1), %%mm1\n"
30458+ " movq 48(%1), %%mm2\n"
30459+ " movq 56(%1), %%mm3\n"
30460+ " movq %%mm0, 32(%2)\n"
30461+ " movq %%mm1, 40(%2)\n"
30462+ " movq %%mm2, 48(%2)\n"
30463+ " movq %%mm3, 56(%2)\n"
30464 ".section .fixup, \"ax\"\n"
30465- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30466+ "3:\n"
30467+
30468+#ifdef CONFIG_PAX_KERNEXEC
30469+ " movl %%cr0, %0\n"
30470+ " movl %0, %%eax\n"
30471+ " andl $0xFFFEFFFF, %%eax\n"
30472+ " movl %%eax, %%cr0\n"
30473+#endif
30474+
30475+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30476+
30477+#ifdef CONFIG_PAX_KERNEXEC
30478+ " movl %0, %%cr0\n"
30479+#endif
30480+
30481 " jmp 2b\n"
30482 ".previous\n"
30483 _ASM_EXTABLE(1b, 3b)
30484- : : "r" (from), "r" (to) : "memory");
30485+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30486
30487 from += 64;
30488 to += 64;
30489@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30490 static void fast_copy_page(void *to, void *from)
30491 {
30492 int i;
30493+ unsigned long cr0;
30494
30495 kernel_fpu_begin();
30496
30497@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30498 * but that is for later. -AV
30499 */
30500 __asm__ __volatile__(
30501- "1: prefetch (%0)\n"
30502- " prefetch 64(%0)\n"
30503- " prefetch 128(%0)\n"
30504- " prefetch 192(%0)\n"
30505- " prefetch 256(%0)\n"
30506+ "1: prefetch (%1)\n"
30507+ " prefetch 64(%1)\n"
30508+ " prefetch 128(%1)\n"
30509+ " prefetch 192(%1)\n"
30510+ " prefetch 256(%1)\n"
30511 "2: \n"
30512 ".section .fixup, \"ax\"\n"
30513- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30514+ "3: \n"
30515+
30516+#ifdef CONFIG_PAX_KERNEXEC
30517+ " movl %%cr0, %0\n"
30518+ " movl %0, %%eax\n"
30519+ " andl $0xFFFEFFFF, %%eax\n"
30520+ " movl %%eax, %%cr0\n"
30521+#endif
30522+
30523+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30524+
30525+#ifdef CONFIG_PAX_KERNEXEC
30526+ " movl %0, %%cr0\n"
30527+#endif
30528+
30529 " jmp 2b\n"
30530 ".previous\n"
30531- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30532+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30533
30534 for (i = 0; i < (4096-320)/64; i++) {
30535 __asm__ __volatile__ (
30536- "1: prefetch 320(%0)\n"
30537- "2: movq (%0), %%mm0\n"
30538- " movntq %%mm0, (%1)\n"
30539- " movq 8(%0), %%mm1\n"
30540- " movntq %%mm1, 8(%1)\n"
30541- " movq 16(%0), %%mm2\n"
30542- " movntq %%mm2, 16(%1)\n"
30543- " movq 24(%0), %%mm3\n"
30544- " movntq %%mm3, 24(%1)\n"
30545- " movq 32(%0), %%mm4\n"
30546- " movntq %%mm4, 32(%1)\n"
30547- " movq 40(%0), %%mm5\n"
30548- " movntq %%mm5, 40(%1)\n"
30549- " movq 48(%0), %%mm6\n"
30550- " movntq %%mm6, 48(%1)\n"
30551- " movq 56(%0), %%mm7\n"
30552- " movntq %%mm7, 56(%1)\n"
30553+ "1: prefetch 320(%1)\n"
30554+ "2: movq (%1), %%mm0\n"
30555+ " movntq %%mm0, (%2)\n"
30556+ " movq 8(%1), %%mm1\n"
30557+ " movntq %%mm1, 8(%2)\n"
30558+ " movq 16(%1), %%mm2\n"
30559+ " movntq %%mm2, 16(%2)\n"
30560+ " movq 24(%1), %%mm3\n"
30561+ " movntq %%mm3, 24(%2)\n"
30562+ " movq 32(%1), %%mm4\n"
30563+ " movntq %%mm4, 32(%2)\n"
30564+ " movq 40(%1), %%mm5\n"
30565+ " movntq %%mm5, 40(%2)\n"
30566+ " movq 48(%1), %%mm6\n"
30567+ " movntq %%mm6, 48(%2)\n"
30568+ " movq 56(%1), %%mm7\n"
30569+ " movntq %%mm7, 56(%2)\n"
30570 ".section .fixup, \"ax\"\n"
30571- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30572+ "3:\n"
30573+
30574+#ifdef CONFIG_PAX_KERNEXEC
30575+ " movl %%cr0, %0\n"
30576+ " movl %0, %%eax\n"
30577+ " andl $0xFFFEFFFF, %%eax\n"
30578+ " movl %%eax, %%cr0\n"
30579+#endif
30580+
30581+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30582+
30583+#ifdef CONFIG_PAX_KERNEXEC
30584+ " movl %0, %%cr0\n"
30585+#endif
30586+
30587 " jmp 2b\n"
30588 ".previous\n"
30589- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30590+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30591
30592 from += 64;
30593 to += 64;
30594@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30595 static void fast_copy_page(void *to, void *from)
30596 {
30597 int i;
30598+ unsigned long cr0;
30599
30600 kernel_fpu_begin();
30601
30602 __asm__ __volatile__ (
30603- "1: prefetch (%0)\n"
30604- " prefetch 64(%0)\n"
30605- " prefetch 128(%0)\n"
30606- " prefetch 192(%0)\n"
30607- " prefetch 256(%0)\n"
30608+ "1: prefetch (%1)\n"
30609+ " prefetch 64(%1)\n"
30610+ " prefetch 128(%1)\n"
30611+ " prefetch 192(%1)\n"
30612+ " prefetch 256(%1)\n"
30613 "2: \n"
30614 ".section .fixup, \"ax\"\n"
30615- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30616+ "3: \n"
30617+
30618+#ifdef CONFIG_PAX_KERNEXEC
30619+ " movl %%cr0, %0\n"
30620+ " movl %0, %%eax\n"
30621+ " andl $0xFFFEFFFF, %%eax\n"
30622+ " movl %%eax, %%cr0\n"
30623+#endif
30624+
30625+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30626+
30627+#ifdef CONFIG_PAX_KERNEXEC
30628+ " movl %0, %%cr0\n"
30629+#endif
30630+
30631 " jmp 2b\n"
30632 ".previous\n"
30633- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30634+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30635
30636 for (i = 0; i < 4096/64; i++) {
30637 __asm__ __volatile__ (
30638- "1: prefetch 320(%0)\n"
30639- "2: movq (%0), %%mm0\n"
30640- " movq 8(%0), %%mm1\n"
30641- " movq 16(%0), %%mm2\n"
30642- " movq 24(%0), %%mm3\n"
30643- " movq %%mm0, (%1)\n"
30644- " movq %%mm1, 8(%1)\n"
30645- " movq %%mm2, 16(%1)\n"
30646- " movq %%mm3, 24(%1)\n"
30647- " movq 32(%0), %%mm0\n"
30648- " movq 40(%0), %%mm1\n"
30649- " movq 48(%0), %%mm2\n"
30650- " movq 56(%0), %%mm3\n"
30651- " movq %%mm0, 32(%1)\n"
30652- " movq %%mm1, 40(%1)\n"
30653- " movq %%mm2, 48(%1)\n"
30654- " movq %%mm3, 56(%1)\n"
30655+ "1: prefetch 320(%1)\n"
30656+ "2: movq (%1), %%mm0\n"
30657+ " movq 8(%1), %%mm1\n"
30658+ " movq 16(%1), %%mm2\n"
30659+ " movq 24(%1), %%mm3\n"
30660+ " movq %%mm0, (%2)\n"
30661+ " movq %%mm1, 8(%2)\n"
30662+ " movq %%mm2, 16(%2)\n"
30663+ " movq %%mm3, 24(%2)\n"
30664+ " movq 32(%1), %%mm0\n"
30665+ " movq 40(%1), %%mm1\n"
30666+ " movq 48(%1), %%mm2\n"
30667+ " movq 56(%1), %%mm3\n"
30668+ " movq %%mm0, 32(%2)\n"
30669+ " movq %%mm1, 40(%2)\n"
30670+ " movq %%mm2, 48(%2)\n"
30671+ " movq %%mm3, 56(%2)\n"
30672 ".section .fixup, \"ax\"\n"
30673- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30674+ "3:\n"
30675+
30676+#ifdef CONFIG_PAX_KERNEXEC
30677+ " movl %%cr0, %0\n"
30678+ " movl %0, %%eax\n"
30679+ " andl $0xFFFEFFFF, %%eax\n"
30680+ " movl %%eax, %%cr0\n"
30681+#endif
30682+
30683+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30684+
30685+#ifdef CONFIG_PAX_KERNEXEC
30686+ " movl %0, %%cr0\n"
30687+#endif
30688+
30689 " jmp 2b\n"
30690 ".previous\n"
30691 _ASM_EXTABLE(1b, 3b)
30692- : : "r" (from), "r" (to) : "memory");
30693+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30694
30695 from += 64;
30696 to += 64;
30697diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30698index 3ca5218..c2ae6bc 100644
30699--- a/arch/x86/lib/msr-reg.S
30700+++ b/arch/x86/lib/msr-reg.S
30701@@ -3,6 +3,7 @@
30702 #include <asm/dwarf2.h>
30703 #include <asm/asm.h>
30704 #include <asm/msr.h>
30705+#include <asm/alternative-asm.h>
30706
30707 #ifdef CONFIG_X86_64
30708 /*
30709@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30710 movl %edi, 28(%r10)
30711 popq_cfi_reg rbp
30712 popq_cfi_reg rbx
30713+ pax_force_retaddr
30714 ret
30715 3:
30716 CFI_RESTORE_STATE
30717diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30718index fc6ba17..14ad9a5 100644
30719--- a/arch/x86/lib/putuser.S
30720+++ b/arch/x86/lib/putuser.S
30721@@ -16,7 +16,9 @@
30722 #include <asm/errno.h>
30723 #include <asm/asm.h>
30724 #include <asm/smap.h>
30725-
30726+#include <asm/segment.h>
30727+#include <asm/pgtable.h>
30728+#include <asm/alternative-asm.h>
30729
30730 /*
30731 * __put_user_X
30732@@ -30,57 +32,125 @@
30733 * as they get called from within inline assembly.
30734 */
30735
30736-#define ENTER CFI_STARTPROC ; \
30737- GET_THREAD_INFO(%_ASM_BX)
30738-#define EXIT ASM_CLAC ; \
30739- ret ; \
30740+#define ENTER CFI_STARTPROC
30741+#define EXIT ASM_CLAC ; \
30742+ pax_force_retaddr ; \
30743+ ret ; \
30744 CFI_ENDPROC
30745
30746+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30747+#define _DEST %_ASM_CX,%_ASM_BX
30748+#else
30749+#define _DEST %_ASM_CX
30750+#endif
30751+
30752+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30753+#define __copyuser_seg gs;
30754+#else
30755+#define __copyuser_seg
30756+#endif
30757+
30758 .text
30759 ENTRY(__put_user_1)
30760 ENTER
30761+
30762+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30763+ GET_THREAD_INFO(%_ASM_BX)
30764 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30765 jae bad_put_user
30766+
30767+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30768+ mov pax_user_shadow_base,%_ASM_BX
30769+ cmp %_ASM_BX,%_ASM_CX
30770+ jb 1234f
30771+ xor %ebx,%ebx
30772+1234:
30773+#endif
30774+
30775+#endif
30776+
30777 ASM_STAC
30778-1: movb %al,(%_ASM_CX)
30779+1: __copyuser_seg movb %al,(_DEST)
30780 xor %eax,%eax
30781 EXIT
30782 ENDPROC(__put_user_1)
30783
30784 ENTRY(__put_user_2)
30785 ENTER
30786+
30787+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30788+ GET_THREAD_INFO(%_ASM_BX)
30789 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30790 sub $1,%_ASM_BX
30791 cmp %_ASM_BX,%_ASM_CX
30792 jae bad_put_user
30793+
30794+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30795+ mov pax_user_shadow_base,%_ASM_BX
30796+ cmp %_ASM_BX,%_ASM_CX
30797+ jb 1234f
30798+ xor %ebx,%ebx
30799+1234:
30800+#endif
30801+
30802+#endif
30803+
30804 ASM_STAC
30805-2: movw %ax,(%_ASM_CX)
30806+2: __copyuser_seg movw %ax,(_DEST)
30807 xor %eax,%eax
30808 EXIT
30809 ENDPROC(__put_user_2)
30810
30811 ENTRY(__put_user_4)
30812 ENTER
30813+
30814+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30815+ GET_THREAD_INFO(%_ASM_BX)
30816 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30817 sub $3,%_ASM_BX
30818 cmp %_ASM_BX,%_ASM_CX
30819 jae bad_put_user
30820+
30821+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30822+ mov pax_user_shadow_base,%_ASM_BX
30823+ cmp %_ASM_BX,%_ASM_CX
30824+ jb 1234f
30825+ xor %ebx,%ebx
30826+1234:
30827+#endif
30828+
30829+#endif
30830+
30831 ASM_STAC
30832-3: movl %eax,(%_ASM_CX)
30833+3: __copyuser_seg movl %eax,(_DEST)
30834 xor %eax,%eax
30835 EXIT
30836 ENDPROC(__put_user_4)
30837
30838 ENTRY(__put_user_8)
30839 ENTER
30840+
30841+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30842+ GET_THREAD_INFO(%_ASM_BX)
30843 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30844 sub $7,%_ASM_BX
30845 cmp %_ASM_BX,%_ASM_CX
30846 jae bad_put_user
30847+
30848+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30849+ mov pax_user_shadow_base,%_ASM_BX
30850+ cmp %_ASM_BX,%_ASM_CX
30851+ jb 1234f
30852+ xor %ebx,%ebx
30853+1234:
30854+#endif
30855+
30856+#endif
30857+
30858 ASM_STAC
30859-4: mov %_ASM_AX,(%_ASM_CX)
30860+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30861 #ifdef CONFIG_X86_32
30862-5: movl %edx,4(%_ASM_CX)
30863+5: __copyuser_seg movl %edx,4(_DEST)
30864 #endif
30865 xor %eax,%eax
30866 EXIT
30867diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30868index 2322abe..1e78a75 100644
30869--- a/arch/x86/lib/rwsem.S
30870+++ b/arch/x86/lib/rwsem.S
30871@@ -92,6 +92,7 @@ ENTRY(call_rwsem_down_read_failed)
30872 call rwsem_down_read_failed
30873 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
30874 restore_common_regs
30875+ pax_force_retaddr
30876 ret
30877 CFI_ENDPROC
30878 ENDPROC(call_rwsem_down_read_failed)
30879@@ -102,6 +103,7 @@ ENTRY(call_rwsem_down_write_failed)
30880 movq %rax,%rdi
30881 call rwsem_down_write_failed
30882 restore_common_regs
30883+ pax_force_retaddr
30884 ret
30885 CFI_ENDPROC
30886 ENDPROC(call_rwsem_down_write_failed)
30887@@ -115,7 +117,8 @@ ENTRY(call_rwsem_wake)
30888 movq %rax,%rdi
30889 call rwsem_wake
30890 restore_common_regs
30891-1: ret
30892+1: pax_force_retaddr
30893+ ret
30894 CFI_ENDPROC
30895 ENDPROC(call_rwsem_wake)
30896
30897@@ -127,6 +130,7 @@ ENTRY(call_rwsem_downgrade_wake)
30898 call rwsem_downgrade_wake
30899 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
30900 restore_common_regs
30901+ pax_force_retaddr
30902 ret
30903 CFI_ENDPROC
30904 ENDPROC(call_rwsem_downgrade_wake)
30905diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30906index f89ba4e9..512b2de 100644
30907--- a/arch/x86/lib/thunk_64.S
30908+++ b/arch/x86/lib/thunk_64.S
30909@@ -9,6 +9,7 @@
30910 #include <asm/dwarf2.h>
30911 #include <asm/calling.h>
30912 #include <asm/asm.h>
30913+#include <asm/alternative-asm.h>
30914
30915 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30916 .macro THUNK name, func, put_ret_addr_in_rdi=0
30917@@ -69,6 +70,7 @@ restore:
30918 popq_cfi_reg rdx
30919 popq_cfi_reg rsi
30920 popq_cfi_reg rdi
30921+ pax_force_retaddr
30922 ret
30923 CFI_ENDPROC
30924 _ASM_NOKPROBE(restore)
30925diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
30926index ddf9ecb..e342586 100644
30927--- a/arch/x86/lib/usercopy.c
30928+++ b/arch/x86/lib/usercopy.c
30929@@ -20,7 +20,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
30930 unsigned long ret;
30931
30932 if (__range_not_ok(from, n, TASK_SIZE))
30933- return 0;
30934+ return n;
30935
30936 /*
30937 * Even though this function is typically called from NMI/IRQ context
30938diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
30939index e2f5e21..4b22130 100644
30940--- a/arch/x86/lib/usercopy_32.c
30941+++ b/arch/x86/lib/usercopy_32.c
30942@@ -42,11 +42,13 @@ do { \
30943 int __d0; \
30944 might_fault(); \
30945 __asm__ __volatile__( \
30946+ __COPYUSER_SET_ES \
30947 ASM_STAC "\n" \
30948 "0: rep; stosl\n" \
30949 " movl %2,%0\n" \
30950 "1: rep; stosb\n" \
30951 "2: " ASM_CLAC "\n" \
30952+ __COPYUSER_RESTORE_ES \
30953 ".section .fixup,\"ax\"\n" \
30954 "3: lea 0(%2,%0,4),%0\n" \
30955 " jmp 2b\n" \
30956@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
30957
30958 #ifdef CONFIG_X86_INTEL_USERCOPY
30959 static unsigned long
30960-__copy_user_intel(void __user *to, const void *from, unsigned long size)
30961+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
30962 {
30963 int d0, d1;
30964 __asm__ __volatile__(
30965@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
30966 " .align 2,0x90\n"
30967 "3: movl 0(%4), %%eax\n"
30968 "4: movl 4(%4), %%edx\n"
30969- "5: movl %%eax, 0(%3)\n"
30970- "6: movl %%edx, 4(%3)\n"
30971+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
30972+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
30973 "7: movl 8(%4), %%eax\n"
30974 "8: movl 12(%4),%%edx\n"
30975- "9: movl %%eax, 8(%3)\n"
30976- "10: movl %%edx, 12(%3)\n"
30977+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
30978+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
30979 "11: movl 16(%4), %%eax\n"
30980 "12: movl 20(%4), %%edx\n"
30981- "13: movl %%eax, 16(%3)\n"
30982- "14: movl %%edx, 20(%3)\n"
30983+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
30984+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
30985 "15: movl 24(%4), %%eax\n"
30986 "16: movl 28(%4), %%edx\n"
30987- "17: movl %%eax, 24(%3)\n"
30988- "18: movl %%edx, 28(%3)\n"
30989+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
30990+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
30991 "19: movl 32(%4), %%eax\n"
30992 "20: movl 36(%4), %%edx\n"
30993- "21: movl %%eax, 32(%3)\n"
30994- "22: movl %%edx, 36(%3)\n"
30995+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
30996+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
30997 "23: movl 40(%4), %%eax\n"
30998 "24: movl 44(%4), %%edx\n"
30999- "25: movl %%eax, 40(%3)\n"
31000- "26: movl %%edx, 44(%3)\n"
31001+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31002+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31003 "27: movl 48(%4), %%eax\n"
31004 "28: movl 52(%4), %%edx\n"
31005- "29: movl %%eax, 48(%3)\n"
31006- "30: movl %%edx, 52(%3)\n"
31007+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31008+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31009 "31: movl 56(%4), %%eax\n"
31010 "32: movl 60(%4), %%edx\n"
31011- "33: movl %%eax, 56(%3)\n"
31012- "34: movl %%edx, 60(%3)\n"
31013+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31014+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31015 " addl $-64, %0\n"
31016 " addl $64, %4\n"
31017 " addl $64, %3\n"
31018@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31019 " shrl $2, %0\n"
31020 " andl $3, %%eax\n"
31021 " cld\n"
31022+ __COPYUSER_SET_ES
31023 "99: rep; movsl\n"
31024 "36: movl %%eax, %0\n"
31025 "37: rep; movsb\n"
31026 "100:\n"
31027+ __COPYUSER_RESTORE_ES
31028+ ".section .fixup,\"ax\"\n"
31029+ "101: lea 0(%%eax,%0,4),%0\n"
31030+ " jmp 100b\n"
31031+ ".previous\n"
31032+ _ASM_EXTABLE(1b,100b)
31033+ _ASM_EXTABLE(2b,100b)
31034+ _ASM_EXTABLE(3b,100b)
31035+ _ASM_EXTABLE(4b,100b)
31036+ _ASM_EXTABLE(5b,100b)
31037+ _ASM_EXTABLE(6b,100b)
31038+ _ASM_EXTABLE(7b,100b)
31039+ _ASM_EXTABLE(8b,100b)
31040+ _ASM_EXTABLE(9b,100b)
31041+ _ASM_EXTABLE(10b,100b)
31042+ _ASM_EXTABLE(11b,100b)
31043+ _ASM_EXTABLE(12b,100b)
31044+ _ASM_EXTABLE(13b,100b)
31045+ _ASM_EXTABLE(14b,100b)
31046+ _ASM_EXTABLE(15b,100b)
31047+ _ASM_EXTABLE(16b,100b)
31048+ _ASM_EXTABLE(17b,100b)
31049+ _ASM_EXTABLE(18b,100b)
31050+ _ASM_EXTABLE(19b,100b)
31051+ _ASM_EXTABLE(20b,100b)
31052+ _ASM_EXTABLE(21b,100b)
31053+ _ASM_EXTABLE(22b,100b)
31054+ _ASM_EXTABLE(23b,100b)
31055+ _ASM_EXTABLE(24b,100b)
31056+ _ASM_EXTABLE(25b,100b)
31057+ _ASM_EXTABLE(26b,100b)
31058+ _ASM_EXTABLE(27b,100b)
31059+ _ASM_EXTABLE(28b,100b)
31060+ _ASM_EXTABLE(29b,100b)
31061+ _ASM_EXTABLE(30b,100b)
31062+ _ASM_EXTABLE(31b,100b)
31063+ _ASM_EXTABLE(32b,100b)
31064+ _ASM_EXTABLE(33b,100b)
31065+ _ASM_EXTABLE(34b,100b)
31066+ _ASM_EXTABLE(35b,100b)
31067+ _ASM_EXTABLE(36b,100b)
31068+ _ASM_EXTABLE(37b,100b)
31069+ _ASM_EXTABLE(99b,101b)
31070+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31071+ : "1"(to), "2"(from), "0"(size)
31072+ : "eax", "edx", "memory");
31073+ return size;
31074+}
31075+
31076+static unsigned long
31077+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31078+{
31079+ int d0, d1;
31080+ __asm__ __volatile__(
31081+ " .align 2,0x90\n"
31082+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31083+ " cmpl $67, %0\n"
31084+ " jbe 3f\n"
31085+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31086+ " .align 2,0x90\n"
31087+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31088+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31089+ "5: movl %%eax, 0(%3)\n"
31090+ "6: movl %%edx, 4(%3)\n"
31091+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31092+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31093+ "9: movl %%eax, 8(%3)\n"
31094+ "10: movl %%edx, 12(%3)\n"
31095+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31096+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31097+ "13: movl %%eax, 16(%3)\n"
31098+ "14: movl %%edx, 20(%3)\n"
31099+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31100+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31101+ "17: movl %%eax, 24(%3)\n"
31102+ "18: movl %%edx, 28(%3)\n"
31103+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31104+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31105+ "21: movl %%eax, 32(%3)\n"
31106+ "22: movl %%edx, 36(%3)\n"
31107+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31108+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31109+ "25: movl %%eax, 40(%3)\n"
31110+ "26: movl %%edx, 44(%3)\n"
31111+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31112+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31113+ "29: movl %%eax, 48(%3)\n"
31114+ "30: movl %%edx, 52(%3)\n"
31115+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31116+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31117+ "33: movl %%eax, 56(%3)\n"
31118+ "34: movl %%edx, 60(%3)\n"
31119+ " addl $-64, %0\n"
31120+ " addl $64, %4\n"
31121+ " addl $64, %3\n"
31122+ " cmpl $63, %0\n"
31123+ " ja 1b\n"
31124+ "35: movl %0, %%eax\n"
31125+ " shrl $2, %0\n"
31126+ " andl $3, %%eax\n"
31127+ " cld\n"
31128+ "99: rep; "__copyuser_seg" movsl\n"
31129+ "36: movl %%eax, %0\n"
31130+ "37: rep; "__copyuser_seg" movsb\n"
31131+ "100:\n"
31132 ".section .fixup,\"ax\"\n"
31133 "101: lea 0(%%eax,%0,4),%0\n"
31134 " jmp 100b\n"
31135@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31136 int d0, d1;
31137 __asm__ __volatile__(
31138 " .align 2,0x90\n"
31139- "0: movl 32(%4), %%eax\n"
31140+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31141 " cmpl $67, %0\n"
31142 " jbe 2f\n"
31143- "1: movl 64(%4), %%eax\n"
31144+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31145 " .align 2,0x90\n"
31146- "2: movl 0(%4), %%eax\n"
31147- "21: movl 4(%4), %%edx\n"
31148+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31149+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31150 " movl %%eax, 0(%3)\n"
31151 " movl %%edx, 4(%3)\n"
31152- "3: movl 8(%4), %%eax\n"
31153- "31: movl 12(%4),%%edx\n"
31154+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31155+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31156 " movl %%eax, 8(%3)\n"
31157 " movl %%edx, 12(%3)\n"
31158- "4: movl 16(%4), %%eax\n"
31159- "41: movl 20(%4), %%edx\n"
31160+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31161+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31162 " movl %%eax, 16(%3)\n"
31163 " movl %%edx, 20(%3)\n"
31164- "10: movl 24(%4), %%eax\n"
31165- "51: movl 28(%4), %%edx\n"
31166+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31167+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31168 " movl %%eax, 24(%3)\n"
31169 " movl %%edx, 28(%3)\n"
31170- "11: movl 32(%4), %%eax\n"
31171- "61: movl 36(%4), %%edx\n"
31172+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31173+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31174 " movl %%eax, 32(%3)\n"
31175 " movl %%edx, 36(%3)\n"
31176- "12: movl 40(%4), %%eax\n"
31177- "71: movl 44(%4), %%edx\n"
31178+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31179+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31180 " movl %%eax, 40(%3)\n"
31181 " movl %%edx, 44(%3)\n"
31182- "13: movl 48(%4), %%eax\n"
31183- "81: movl 52(%4), %%edx\n"
31184+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31185+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31186 " movl %%eax, 48(%3)\n"
31187 " movl %%edx, 52(%3)\n"
31188- "14: movl 56(%4), %%eax\n"
31189- "91: movl 60(%4), %%edx\n"
31190+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31191+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31192 " movl %%eax, 56(%3)\n"
31193 " movl %%edx, 60(%3)\n"
31194 " addl $-64, %0\n"
31195@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31196 " shrl $2, %0\n"
31197 " andl $3, %%eax\n"
31198 " cld\n"
31199- "6: rep; movsl\n"
31200+ "6: rep; "__copyuser_seg" movsl\n"
31201 " movl %%eax,%0\n"
31202- "7: rep; movsb\n"
31203+ "7: rep; "__copyuser_seg" movsb\n"
31204 "8:\n"
31205 ".section .fixup,\"ax\"\n"
31206 "9: lea 0(%%eax,%0,4),%0\n"
31207@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31208
31209 __asm__ __volatile__(
31210 " .align 2,0x90\n"
31211- "0: movl 32(%4), %%eax\n"
31212+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31213 " cmpl $67, %0\n"
31214 " jbe 2f\n"
31215- "1: movl 64(%4), %%eax\n"
31216+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31217 " .align 2,0x90\n"
31218- "2: movl 0(%4), %%eax\n"
31219- "21: movl 4(%4), %%edx\n"
31220+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31221+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31222 " movnti %%eax, 0(%3)\n"
31223 " movnti %%edx, 4(%3)\n"
31224- "3: movl 8(%4), %%eax\n"
31225- "31: movl 12(%4),%%edx\n"
31226+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31227+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31228 " movnti %%eax, 8(%3)\n"
31229 " movnti %%edx, 12(%3)\n"
31230- "4: movl 16(%4), %%eax\n"
31231- "41: movl 20(%4), %%edx\n"
31232+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31233+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31234 " movnti %%eax, 16(%3)\n"
31235 " movnti %%edx, 20(%3)\n"
31236- "10: movl 24(%4), %%eax\n"
31237- "51: movl 28(%4), %%edx\n"
31238+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31239+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31240 " movnti %%eax, 24(%3)\n"
31241 " movnti %%edx, 28(%3)\n"
31242- "11: movl 32(%4), %%eax\n"
31243- "61: movl 36(%4), %%edx\n"
31244+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31245+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31246 " movnti %%eax, 32(%3)\n"
31247 " movnti %%edx, 36(%3)\n"
31248- "12: movl 40(%4), %%eax\n"
31249- "71: movl 44(%4), %%edx\n"
31250+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31251+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31252 " movnti %%eax, 40(%3)\n"
31253 " movnti %%edx, 44(%3)\n"
31254- "13: movl 48(%4), %%eax\n"
31255- "81: movl 52(%4), %%edx\n"
31256+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31257+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31258 " movnti %%eax, 48(%3)\n"
31259 " movnti %%edx, 52(%3)\n"
31260- "14: movl 56(%4), %%eax\n"
31261- "91: movl 60(%4), %%edx\n"
31262+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31263+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31264 " movnti %%eax, 56(%3)\n"
31265 " movnti %%edx, 60(%3)\n"
31266 " addl $-64, %0\n"
31267@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31268 " shrl $2, %0\n"
31269 " andl $3, %%eax\n"
31270 " cld\n"
31271- "6: rep; movsl\n"
31272+ "6: rep; "__copyuser_seg" movsl\n"
31273 " movl %%eax,%0\n"
31274- "7: rep; movsb\n"
31275+ "7: rep; "__copyuser_seg" movsb\n"
31276 "8:\n"
31277 ".section .fixup,\"ax\"\n"
31278 "9: lea 0(%%eax,%0,4),%0\n"
31279@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31280
31281 __asm__ __volatile__(
31282 " .align 2,0x90\n"
31283- "0: movl 32(%4), %%eax\n"
31284+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31285 " cmpl $67, %0\n"
31286 " jbe 2f\n"
31287- "1: movl 64(%4), %%eax\n"
31288+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31289 " .align 2,0x90\n"
31290- "2: movl 0(%4), %%eax\n"
31291- "21: movl 4(%4), %%edx\n"
31292+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31293+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31294 " movnti %%eax, 0(%3)\n"
31295 " movnti %%edx, 4(%3)\n"
31296- "3: movl 8(%4), %%eax\n"
31297- "31: movl 12(%4),%%edx\n"
31298+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31299+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31300 " movnti %%eax, 8(%3)\n"
31301 " movnti %%edx, 12(%3)\n"
31302- "4: movl 16(%4), %%eax\n"
31303- "41: movl 20(%4), %%edx\n"
31304+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31305+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31306 " movnti %%eax, 16(%3)\n"
31307 " movnti %%edx, 20(%3)\n"
31308- "10: movl 24(%4), %%eax\n"
31309- "51: movl 28(%4), %%edx\n"
31310+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31311+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31312 " movnti %%eax, 24(%3)\n"
31313 " movnti %%edx, 28(%3)\n"
31314- "11: movl 32(%4), %%eax\n"
31315- "61: movl 36(%4), %%edx\n"
31316+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31317+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31318 " movnti %%eax, 32(%3)\n"
31319 " movnti %%edx, 36(%3)\n"
31320- "12: movl 40(%4), %%eax\n"
31321- "71: movl 44(%4), %%edx\n"
31322+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31323+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31324 " movnti %%eax, 40(%3)\n"
31325 " movnti %%edx, 44(%3)\n"
31326- "13: movl 48(%4), %%eax\n"
31327- "81: movl 52(%4), %%edx\n"
31328+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31329+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31330 " movnti %%eax, 48(%3)\n"
31331 " movnti %%edx, 52(%3)\n"
31332- "14: movl 56(%4), %%eax\n"
31333- "91: movl 60(%4), %%edx\n"
31334+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31335+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31336 " movnti %%eax, 56(%3)\n"
31337 " movnti %%edx, 60(%3)\n"
31338 " addl $-64, %0\n"
31339@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31340 " shrl $2, %0\n"
31341 " andl $3, %%eax\n"
31342 " cld\n"
31343- "6: rep; movsl\n"
31344+ "6: rep; "__copyuser_seg" movsl\n"
31345 " movl %%eax,%0\n"
31346- "7: rep; movsb\n"
31347+ "7: rep; "__copyuser_seg" movsb\n"
31348 "8:\n"
31349 ".section .fixup,\"ax\"\n"
31350 "9: lea 0(%%eax,%0,4),%0\n"
31351@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31352 */
31353 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31354 unsigned long size);
31355-unsigned long __copy_user_intel(void __user *to, const void *from,
31356+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31357+ unsigned long size);
31358+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31359 unsigned long size);
31360 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31361 const void __user *from, unsigned long size);
31362 #endif /* CONFIG_X86_INTEL_USERCOPY */
31363
31364 /* Generic arbitrary sized copy. */
31365-#define __copy_user(to, from, size) \
31366+#define __copy_user(to, from, size, prefix, set, restore) \
31367 do { \
31368 int __d0, __d1, __d2; \
31369 __asm__ __volatile__( \
31370+ set \
31371 " cmp $7,%0\n" \
31372 " jbe 1f\n" \
31373 " movl %1,%0\n" \
31374 " negl %0\n" \
31375 " andl $7,%0\n" \
31376 " subl %0,%3\n" \
31377- "4: rep; movsb\n" \
31378+ "4: rep; "prefix"movsb\n" \
31379 " movl %3,%0\n" \
31380 " shrl $2,%0\n" \
31381 " andl $3,%3\n" \
31382 " .align 2,0x90\n" \
31383- "0: rep; movsl\n" \
31384+ "0: rep; "prefix"movsl\n" \
31385 " movl %3,%0\n" \
31386- "1: rep; movsb\n" \
31387+ "1: rep; "prefix"movsb\n" \
31388 "2:\n" \
31389+ restore \
31390 ".section .fixup,\"ax\"\n" \
31391 "5: addl %3,%0\n" \
31392 " jmp 2b\n" \
31393@@ -538,14 +650,14 @@ do { \
31394 " negl %0\n" \
31395 " andl $7,%0\n" \
31396 " subl %0,%3\n" \
31397- "4: rep; movsb\n" \
31398+ "4: rep; "__copyuser_seg"movsb\n" \
31399 " movl %3,%0\n" \
31400 " shrl $2,%0\n" \
31401 " andl $3,%3\n" \
31402 " .align 2,0x90\n" \
31403- "0: rep; movsl\n" \
31404+ "0: rep; "__copyuser_seg"movsl\n" \
31405 " movl %3,%0\n" \
31406- "1: rep; movsb\n" \
31407+ "1: rep; "__copyuser_seg"movsb\n" \
31408 "2:\n" \
31409 ".section .fixup,\"ax\"\n" \
31410 "5: addl %3,%0\n" \
31411@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31412 {
31413 stac();
31414 if (movsl_is_ok(to, from, n))
31415- __copy_user(to, from, n);
31416+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31417 else
31418- n = __copy_user_intel(to, from, n);
31419+ n = __generic_copy_to_user_intel(to, from, n);
31420 clac();
31421 return n;
31422 }
31423@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31424 {
31425 stac();
31426 if (movsl_is_ok(to, from, n))
31427- __copy_user(to, from, n);
31428+ __copy_user(to, from, n, __copyuser_seg, "", "");
31429 else
31430- n = __copy_user_intel((void __user *)to,
31431- (const void *)from, n);
31432+ n = __generic_copy_from_user_intel(to, from, n);
31433 clac();
31434 return n;
31435 }
31436@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31437 if (n > 64 && cpu_has_xmm2)
31438 n = __copy_user_intel_nocache(to, from, n);
31439 else
31440- __copy_user(to, from, n);
31441+ __copy_user(to, from, n, __copyuser_seg, "", "");
31442 #else
31443- __copy_user(to, from, n);
31444+ __copy_user(to, from, n, __copyuser_seg, "", "");
31445 #endif
31446 clac();
31447 return n;
31448 }
31449 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31450
31451-/**
31452- * copy_to_user: - Copy a block of data into user space.
31453- * @to: Destination address, in user space.
31454- * @from: Source address, in kernel space.
31455- * @n: Number of bytes to copy.
31456- *
31457- * Context: User context only. This function may sleep.
31458- *
31459- * Copy data from kernel space to user space.
31460- *
31461- * Returns number of bytes that could not be copied.
31462- * On success, this will be zero.
31463- */
31464-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31465+#ifdef CONFIG_PAX_MEMORY_UDEREF
31466+void __set_fs(mm_segment_t x)
31467 {
31468- if (access_ok(VERIFY_WRITE, to, n))
31469- n = __copy_to_user(to, from, n);
31470- return n;
31471+ switch (x.seg) {
31472+ case 0:
31473+ loadsegment(gs, 0);
31474+ break;
31475+ case TASK_SIZE_MAX:
31476+ loadsegment(gs, __USER_DS);
31477+ break;
31478+ case -1UL:
31479+ loadsegment(gs, __KERNEL_DS);
31480+ break;
31481+ default:
31482+ BUG();
31483+ }
31484 }
31485-EXPORT_SYMBOL(_copy_to_user);
31486+EXPORT_SYMBOL(__set_fs);
31487
31488-/**
31489- * copy_from_user: - Copy a block of data from user space.
31490- * @to: Destination address, in kernel space.
31491- * @from: Source address, in user space.
31492- * @n: Number of bytes to copy.
31493- *
31494- * Context: User context only. This function may sleep.
31495- *
31496- * Copy data from user space to kernel space.
31497- *
31498- * Returns number of bytes that could not be copied.
31499- * On success, this will be zero.
31500- *
31501- * If some data could not be copied, this function will pad the copied
31502- * data to the requested size using zero bytes.
31503- */
31504-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31505+void set_fs(mm_segment_t x)
31506 {
31507- if (access_ok(VERIFY_READ, from, n))
31508- n = __copy_from_user(to, from, n);
31509- else
31510- memset(to, 0, n);
31511- return n;
31512+ current_thread_info()->addr_limit = x;
31513+ __set_fs(x);
31514 }
31515-EXPORT_SYMBOL(_copy_from_user);
31516+EXPORT_SYMBOL(set_fs);
31517+#endif
31518diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31519index 0a42327..7a82465 100644
31520--- a/arch/x86/lib/usercopy_64.c
31521+++ b/arch/x86/lib/usercopy_64.c
31522@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31523 might_fault();
31524 /* no memory constraint because it doesn't change any memory gcc knows
31525 about */
31526+ pax_open_userland();
31527 stac();
31528 asm volatile(
31529 " testq %[size8],%[size8]\n"
31530@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31531 _ASM_EXTABLE(0b,3b)
31532 _ASM_EXTABLE(1b,2b)
31533 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31534- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31535+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31536 [zero] "r" (0UL), [eight] "r" (8UL));
31537 clac();
31538+ pax_close_userland();
31539 return size;
31540 }
31541 EXPORT_SYMBOL(__clear_user);
31542@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31543 }
31544 EXPORT_SYMBOL(clear_user);
31545
31546-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31547+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31548 {
31549- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31550- return copy_user_generic((__force void *)to, (__force void *)from, len);
31551- }
31552- return len;
31553+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31554+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31555+ return len;
31556 }
31557 EXPORT_SYMBOL(copy_in_user);
31558
31559@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31560 * it is not necessary to optimize tail handling.
31561 */
31562 __visible unsigned long
31563-copy_user_handle_tail(char *to, char *from, unsigned len)
31564+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31565 {
31566+ clac();
31567+ pax_close_userland();
31568 for (; len; --len, to++) {
31569 char c;
31570
31571@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31572 if (__put_user_nocheck(c, to, sizeof(char)))
31573 break;
31574 }
31575- clac();
31576
31577 /* If the destination is a kernel buffer, we always clear the end */
31578- if (!__addr_ok(to))
31579+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31580 memset(to, 0, len);
31581 return len;
31582 }
31583diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31584index a482d10..1a6edb5 100644
31585--- a/arch/x86/mm/Makefile
31586+++ b/arch/x86/mm/Makefile
31587@@ -33,3 +33,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31588 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31589
31590 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31591+
31592+quote:="
31593+obj-$(CONFIG_X86_64) += uderef_64.o
31594+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) -fcall-saved-rax
31595diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31596index 903ec1e..c4166b2 100644
31597--- a/arch/x86/mm/extable.c
31598+++ b/arch/x86/mm/extable.c
31599@@ -6,12 +6,24 @@
31600 static inline unsigned long
31601 ex_insn_addr(const struct exception_table_entry *x)
31602 {
31603- return (unsigned long)&x->insn + x->insn;
31604+ unsigned long reloc = 0;
31605+
31606+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31607+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31608+#endif
31609+
31610+ return (unsigned long)&x->insn + x->insn + reloc;
31611 }
31612 static inline unsigned long
31613 ex_fixup_addr(const struct exception_table_entry *x)
31614 {
31615- return (unsigned long)&x->fixup + x->fixup;
31616+ unsigned long reloc = 0;
31617+
31618+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31619+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31620+#endif
31621+
31622+ return (unsigned long)&x->fixup + x->fixup + reloc;
31623 }
31624
31625 int fixup_exception(struct pt_regs *regs)
31626@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31627 unsigned long new_ip;
31628
31629 #ifdef CONFIG_PNPBIOS
31630- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31631+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31632 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31633 extern u32 pnp_bios_is_utter_crap;
31634 pnp_bios_is_utter_crap = 1;
31635@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31636 i += 4;
31637 p->fixup -= i;
31638 i += 4;
31639+
31640+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31641+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31642+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31643+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31644+#endif
31645+
31646 }
31647 }
31648
31649diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31650index 181c53b..d336596 100644
31651--- a/arch/x86/mm/fault.c
31652+++ b/arch/x86/mm/fault.c
31653@@ -13,12 +13,19 @@
31654 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31655 #include <linux/prefetch.h> /* prefetchw */
31656 #include <linux/context_tracking.h> /* exception_enter(), ... */
31657+#include <linux/unistd.h>
31658+#include <linux/compiler.h>
31659
31660 #include <asm/traps.h> /* dotraplinkage, ... */
31661 #include <asm/pgalloc.h> /* pgd_*(), ... */
31662 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31663 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31664 #include <asm/vsyscall.h> /* emulate_vsyscall */
31665+#include <asm/tlbflush.h>
31666+
31667+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31668+#include <asm/stacktrace.h>
31669+#endif
31670
31671 #define CREATE_TRACE_POINTS
31672 #include <asm/trace/exceptions.h>
31673@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31674 return !instr_lo || (instr_lo>>1) == 1;
31675 case 0x00:
31676 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31677- if (probe_kernel_address(instr, opcode))
31678+ if (user_mode(regs)) {
31679+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31680+ return 0;
31681+ } else if (probe_kernel_address(instr, opcode))
31682 return 0;
31683
31684 *prefetch = (instr_lo == 0xF) &&
31685@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31686 while (instr < max_instr) {
31687 unsigned char opcode;
31688
31689- if (probe_kernel_address(instr, opcode))
31690+ if (user_mode(regs)) {
31691+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31692+ break;
31693+ } else if (probe_kernel_address(instr, opcode))
31694 break;
31695
31696 instr++;
31697@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31698 force_sig_info(si_signo, &info, tsk);
31699 }
31700
31701+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31702+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31703+#endif
31704+
31705+#ifdef CONFIG_PAX_EMUTRAMP
31706+static int pax_handle_fetch_fault(struct pt_regs *regs);
31707+#endif
31708+
31709+#ifdef CONFIG_PAX_PAGEEXEC
31710+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31711+{
31712+ pgd_t *pgd;
31713+ pud_t *pud;
31714+ pmd_t *pmd;
31715+
31716+ pgd = pgd_offset(mm, address);
31717+ if (!pgd_present(*pgd))
31718+ return NULL;
31719+ pud = pud_offset(pgd, address);
31720+ if (!pud_present(*pud))
31721+ return NULL;
31722+ pmd = pmd_offset(pud, address);
31723+ if (!pmd_present(*pmd))
31724+ return NULL;
31725+ return pmd;
31726+}
31727+#endif
31728+
31729 DEFINE_SPINLOCK(pgd_lock);
31730 LIST_HEAD(pgd_list);
31731
31732@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31733 for (address = VMALLOC_START & PMD_MASK;
31734 address >= TASK_SIZE && address < FIXADDR_TOP;
31735 address += PMD_SIZE) {
31736+
31737+#ifdef CONFIG_PAX_PER_CPU_PGD
31738+ unsigned long cpu;
31739+#else
31740 struct page *page;
31741+#endif
31742
31743 spin_lock(&pgd_lock);
31744+
31745+#ifdef CONFIG_PAX_PER_CPU_PGD
31746+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31747+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31748+ pmd_t *ret;
31749+
31750+ ret = vmalloc_sync_one(pgd, address);
31751+ if (!ret)
31752+ break;
31753+ pgd = get_cpu_pgd(cpu, kernel);
31754+#else
31755 list_for_each_entry(page, &pgd_list, lru) {
31756+ pgd_t *pgd;
31757 spinlock_t *pgt_lock;
31758 pmd_t *ret;
31759
31760@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31761 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31762
31763 spin_lock(pgt_lock);
31764- ret = vmalloc_sync_one(page_address(page), address);
31765+ pgd = page_address(page);
31766+#endif
31767+
31768+ ret = vmalloc_sync_one(pgd, address);
31769+
31770+#ifndef CONFIG_PAX_PER_CPU_PGD
31771 spin_unlock(pgt_lock);
31772+#endif
31773
31774 if (!ret)
31775 break;
31776@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31777 * an interrupt in the middle of a task switch..
31778 */
31779 pgd_paddr = read_cr3();
31780+
31781+#ifdef CONFIG_PAX_PER_CPU_PGD
31782+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31783+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31784+#endif
31785+
31786 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31787 if (!pmd_k)
31788 return -1;
31789@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31790 * happen within a race in page table update. In the later
31791 * case just flush:
31792 */
31793- pgd = pgd_offset(current->active_mm, address);
31794+
31795 pgd_ref = pgd_offset_k(address);
31796 if (pgd_none(*pgd_ref))
31797 return -1;
31798
31799+#ifdef CONFIG_PAX_PER_CPU_PGD
31800+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31801+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31802+ if (pgd_none(*pgd)) {
31803+ set_pgd(pgd, *pgd_ref);
31804+ arch_flush_lazy_mmu_mode();
31805+ } else {
31806+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31807+ }
31808+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31809+#else
31810+ pgd = pgd_offset(current->active_mm, address);
31811+#endif
31812+
31813 if (pgd_none(*pgd)) {
31814 set_pgd(pgd, *pgd_ref);
31815 arch_flush_lazy_mmu_mode();
31816@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31817 static int is_errata100(struct pt_regs *regs, unsigned long address)
31818 {
31819 #ifdef CONFIG_X86_64
31820- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31821+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31822 return 1;
31823 #endif
31824 return 0;
31825@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31826 }
31827
31828 static const char nx_warning[] = KERN_CRIT
31829-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31830+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31831 static const char smep_warning[] = KERN_CRIT
31832-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31833+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31834
31835 static void
31836 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31837@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31838 if (!oops_may_print())
31839 return;
31840
31841- if (error_code & PF_INSTR) {
31842+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31843 unsigned int level;
31844 pgd_t *pgd;
31845 pte_t *pte;
31846@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31847 pte = lookup_address_in_pgd(pgd, address, &level);
31848
31849 if (pte && pte_present(*pte) && !pte_exec(*pte))
31850- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31851+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31852 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31853 (pgd_flags(*pgd) & _PAGE_USER) &&
31854 (__read_cr4() & X86_CR4_SMEP))
31855- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31856+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31857 }
31858
31859+#ifdef CONFIG_PAX_KERNEXEC
31860+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31861+ if (current->signal->curr_ip)
31862+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31863+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31864+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31865+ else
31866+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31867+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31868+ }
31869+#endif
31870+
31871 printk(KERN_ALERT "BUG: unable to handle kernel ");
31872 if (address < PAGE_SIZE)
31873 printk(KERN_CONT "NULL pointer dereference");
31874@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31875 return;
31876 }
31877 #endif
31878+
31879+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31880+ if (pax_is_fetch_fault(regs, error_code, address)) {
31881+
31882+#ifdef CONFIG_PAX_EMUTRAMP
31883+ switch (pax_handle_fetch_fault(regs)) {
31884+ case 2:
31885+ return;
31886+ }
31887+#endif
31888+
31889+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31890+ do_group_exit(SIGKILL);
31891+ }
31892+#endif
31893+
31894 /* Kernel addresses are always protection faults: */
31895 if (address >= TASK_SIZE)
31896 error_code |= PF_PROT;
31897@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31898 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31899 printk(KERN_ERR
31900 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31901- tsk->comm, tsk->pid, address);
31902+ tsk->comm, task_pid_nr(tsk), address);
31903 code = BUS_MCEERR_AR;
31904 }
31905 #endif
31906@@ -916,6 +1028,107 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31907 return 1;
31908 }
31909
31910+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31911+static inline unsigned long get_limit(unsigned long segment)
31912+{
31913+ unsigned long __limit;
31914+
31915+ asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
31916+ return __limit + 1;
31917+}
31918+
31919+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31920+{
31921+ pte_t *pte;
31922+ pmd_t *pmd;
31923+ spinlock_t *ptl;
31924+ unsigned char pte_mask;
31925+
31926+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31927+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
31928+ return 0;
31929+
31930+ /* PaX: it's our fault, let's handle it if we can */
31931+
31932+ /* PaX: take a look at read faults before acquiring any locks */
31933+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31934+ /* instruction fetch attempt from a protected page in user mode */
31935+ up_read(&mm->mmap_sem);
31936+
31937+#ifdef CONFIG_PAX_EMUTRAMP
31938+ switch (pax_handle_fetch_fault(regs)) {
31939+ case 2:
31940+ return 1;
31941+ }
31942+#endif
31943+
31944+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31945+ do_group_exit(SIGKILL);
31946+ }
31947+
31948+ pmd = pax_get_pmd(mm, address);
31949+ if (unlikely(!pmd))
31950+ return 0;
31951+
31952+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
31953+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
31954+ pte_unmap_unlock(pte, ptl);
31955+ return 0;
31956+ }
31957+
31958+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
31959+ /* write attempt to a protected page in user mode */
31960+ pte_unmap_unlock(pte, ptl);
31961+ return 0;
31962+ }
31963+
31964+#ifdef CONFIG_SMP
31965+ if (likely(address > get_limit(regs->cs) && cpumask_test_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask)))
31966+#else
31967+ if (likely(address > get_limit(regs->cs)))
31968+#endif
31969+ {
31970+ set_pte(pte, pte_mkread(*pte));
31971+ __flush_tlb_one(address);
31972+ pte_unmap_unlock(pte, ptl);
31973+ up_read(&mm->mmap_sem);
31974+ return 1;
31975+ }
31976+
31977+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
31978+
31979+ /*
31980+ * PaX: fill DTLB with user rights and retry
31981+ */
31982+ __asm__ __volatile__ (
31983+ "orb %2,(%1)\n"
31984+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
31985+/*
31986+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
31987+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
31988+ * page fault when examined during a TLB load attempt. this is true not only
31989+ * for PTEs holding a non-present entry but also present entries that will
31990+ * raise a page fault (such as those set up by PaX, or the copy-on-write
31991+ * mechanism). in effect it means that we do *not* need to flush the TLBs
31992+ * for our target pages since their PTEs are simply not in the TLBs at all.
31993+
31994+ * the best thing in omitting it is that we gain around 15-20% speed in the
31995+ * fast path of the page fault handler and can get rid of tracing since we
31996+ * can no longer flush unintended entries.
31997+ */
31998+ "invlpg (%0)\n"
31999+#endif
32000+ __copyuser_seg"testb $0,(%0)\n"
32001+ "xorb %3,(%1)\n"
32002+ :
32003+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32004+ : "memory", "cc");
32005+ pte_unmap_unlock(pte, ptl);
32006+ up_read(&mm->mmap_sem);
32007+ return 1;
32008+}
32009+#endif
32010+
32011 /*
32012 * Handle a spurious fault caused by a stale TLB entry.
32013 *
32014@@ -1001,6 +1214,9 @@ int show_unhandled_signals = 1;
32015 static inline int
32016 access_error(unsigned long error_code, struct vm_area_struct *vma)
32017 {
32018+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32019+ return 1;
32020+
32021 if (error_code & PF_WRITE) {
32022 /* write, present and write, not present: */
32023 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32024@@ -1063,6 +1279,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32025 tsk = current;
32026 mm = tsk->mm;
32027
32028+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32029+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32030+ if (!search_exception_tables(regs->ip)) {
32031+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32032+ bad_area_nosemaphore(regs, error_code, address);
32033+ return;
32034+ }
32035+ if (address < pax_user_shadow_base) {
32036+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32037+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32038+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32039+ } else
32040+ address -= pax_user_shadow_base;
32041+ }
32042+#endif
32043+
32044 /*
32045 * Detect and handle instructions that would cause a page fault for
32046 * both a tracked kernel page and a userspace page.
32047@@ -1187,6 +1419,11 @@ retry:
32048 might_sleep();
32049 }
32050
32051+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32052+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32053+ return;
32054+#endif
32055+
32056 vma = find_vma(mm, address);
32057 if (unlikely(!vma)) {
32058 bad_area(regs, error_code, address);
32059@@ -1198,18 +1435,24 @@ retry:
32060 bad_area(regs, error_code, address);
32061 return;
32062 }
32063- if (error_code & PF_USER) {
32064- /*
32065- * Accessing the stack below %sp is always a bug.
32066- * The large cushion allows instructions like enter
32067- * and pusha to work. ("enter $65535, $31" pushes
32068- * 32 pointers and then decrements %sp by 65535.)
32069- */
32070- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32071- bad_area(regs, error_code, address);
32072- return;
32073- }
32074+ /*
32075+ * Accessing the stack below %sp is always a bug.
32076+ * The large cushion allows instructions like enter
32077+ * and pusha to work. ("enter $65535, $31" pushes
32078+ * 32 pointers and then decrements %sp by 65535.)
32079+ */
32080+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32081+ bad_area(regs, error_code, address);
32082+ return;
32083 }
32084+
32085+#ifdef CONFIG_PAX_SEGMEXEC
32086+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32087+ bad_area(regs, error_code, address);
32088+ return;
32089+ }
32090+#endif
32091+
32092 if (unlikely(expand_stack(vma, address))) {
32093 bad_area(regs, error_code, address);
32094 return;
32095@@ -1329,3 +1572,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32096 }
32097 NOKPROBE_SYMBOL(trace_do_page_fault);
32098 #endif /* CONFIG_TRACING */
32099+
32100+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32101+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32102+{
32103+ struct mm_struct *mm = current->mm;
32104+ unsigned long ip = regs->ip;
32105+
32106+ if (v8086_mode(regs))
32107+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32108+
32109+#ifdef CONFIG_PAX_PAGEEXEC
32110+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32111+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32112+ return true;
32113+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32114+ return true;
32115+ return false;
32116+ }
32117+#endif
32118+
32119+#ifdef CONFIG_PAX_SEGMEXEC
32120+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32121+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32122+ return true;
32123+ return false;
32124+ }
32125+#endif
32126+
32127+ return false;
32128+}
32129+#endif
32130+
32131+#ifdef CONFIG_PAX_EMUTRAMP
32132+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32133+{
32134+ int err;
32135+
32136+ do { /* PaX: libffi trampoline emulation */
32137+ unsigned char mov, jmp;
32138+ unsigned int addr1, addr2;
32139+
32140+#ifdef CONFIG_X86_64
32141+ if ((regs->ip + 9) >> 32)
32142+ break;
32143+#endif
32144+
32145+ err = get_user(mov, (unsigned char __user *)regs->ip);
32146+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32147+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32148+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32149+
32150+ if (err)
32151+ break;
32152+
32153+ if (mov == 0xB8 && jmp == 0xE9) {
32154+ regs->ax = addr1;
32155+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32156+ return 2;
32157+ }
32158+ } while (0);
32159+
32160+ do { /* PaX: gcc trampoline emulation #1 */
32161+ unsigned char mov1, mov2;
32162+ unsigned short jmp;
32163+ unsigned int addr1, addr2;
32164+
32165+#ifdef CONFIG_X86_64
32166+ if ((regs->ip + 11) >> 32)
32167+ break;
32168+#endif
32169+
32170+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32171+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32172+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32173+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32174+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32175+
32176+ if (err)
32177+ break;
32178+
32179+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32180+ regs->cx = addr1;
32181+ regs->ax = addr2;
32182+ regs->ip = addr2;
32183+ return 2;
32184+ }
32185+ } while (0);
32186+
32187+ do { /* PaX: gcc trampoline emulation #2 */
32188+ unsigned char mov, jmp;
32189+ unsigned int addr1, addr2;
32190+
32191+#ifdef CONFIG_X86_64
32192+ if ((regs->ip + 9) >> 32)
32193+ break;
32194+#endif
32195+
32196+ err = get_user(mov, (unsigned char __user *)regs->ip);
32197+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32198+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32199+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32200+
32201+ if (err)
32202+ break;
32203+
32204+ if (mov == 0xB9 && jmp == 0xE9) {
32205+ regs->cx = addr1;
32206+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32207+ return 2;
32208+ }
32209+ } while (0);
32210+
32211+ return 1; /* PaX in action */
32212+}
32213+
32214+#ifdef CONFIG_X86_64
32215+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32216+{
32217+ int err;
32218+
32219+ do { /* PaX: libffi trampoline emulation */
32220+ unsigned short mov1, mov2, jmp1;
32221+ unsigned char stcclc, jmp2;
32222+ unsigned long addr1, addr2;
32223+
32224+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32225+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32226+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32227+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32228+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32229+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32230+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32231+
32232+ if (err)
32233+ break;
32234+
32235+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32236+ regs->r11 = addr1;
32237+ regs->r10 = addr2;
32238+ if (stcclc == 0xF8)
32239+ regs->flags &= ~X86_EFLAGS_CF;
32240+ else
32241+ regs->flags |= X86_EFLAGS_CF;
32242+ regs->ip = addr1;
32243+ return 2;
32244+ }
32245+ } while (0);
32246+
32247+ do { /* PaX: gcc trampoline emulation #1 */
32248+ unsigned short mov1, mov2, jmp1;
32249+ unsigned char jmp2;
32250+ unsigned int addr1;
32251+ unsigned long addr2;
32252+
32253+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32254+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32255+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32256+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32257+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32258+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32259+
32260+ if (err)
32261+ break;
32262+
32263+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32264+ regs->r11 = addr1;
32265+ regs->r10 = addr2;
32266+ regs->ip = addr1;
32267+ return 2;
32268+ }
32269+ } while (0);
32270+
32271+ do { /* PaX: gcc trampoline emulation #2 */
32272+ unsigned short mov1, mov2, jmp1;
32273+ unsigned char jmp2;
32274+ unsigned long addr1, addr2;
32275+
32276+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32277+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32278+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32279+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32280+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32281+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32282+
32283+ if (err)
32284+ break;
32285+
32286+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32287+ regs->r11 = addr1;
32288+ regs->r10 = addr2;
32289+ regs->ip = addr1;
32290+ return 2;
32291+ }
32292+ } while (0);
32293+
32294+ return 1; /* PaX in action */
32295+}
32296+#endif
32297+
32298+/*
32299+ * PaX: decide what to do with offenders (regs->ip = fault address)
32300+ *
32301+ * returns 1 when task should be killed
32302+ * 2 when gcc trampoline was detected
32303+ */
32304+static int pax_handle_fetch_fault(struct pt_regs *regs)
32305+{
32306+ if (v8086_mode(regs))
32307+ return 1;
32308+
32309+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32310+ return 1;
32311+
32312+#ifdef CONFIG_X86_32
32313+ return pax_handle_fetch_fault_32(regs);
32314+#else
32315+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32316+ return pax_handle_fetch_fault_32(regs);
32317+ else
32318+ return pax_handle_fetch_fault_64(regs);
32319+#endif
32320+}
32321+#endif
32322+
32323+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32324+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32325+{
32326+ long i;
32327+
32328+ printk(KERN_ERR "PAX: bytes at PC: ");
32329+ for (i = 0; i < 20; i++) {
32330+ unsigned char c;
32331+ if (get_user(c, (unsigned char __force_user *)pc+i))
32332+ printk(KERN_CONT "?? ");
32333+ else
32334+ printk(KERN_CONT "%02x ", c);
32335+ }
32336+ printk("\n");
32337+
32338+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32339+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32340+ unsigned long c;
32341+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32342+#ifdef CONFIG_X86_32
32343+ printk(KERN_CONT "???????? ");
32344+#else
32345+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32346+ printk(KERN_CONT "???????? ???????? ");
32347+ else
32348+ printk(KERN_CONT "???????????????? ");
32349+#endif
32350+ } else {
32351+#ifdef CONFIG_X86_64
32352+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32353+ printk(KERN_CONT "%08x ", (unsigned int)c);
32354+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32355+ } else
32356+#endif
32357+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32358+ }
32359+ }
32360+ printk("\n");
32361+}
32362+#endif
32363+
32364+/**
32365+ * probe_kernel_write(): safely attempt to write to a location
32366+ * @dst: address to write to
32367+ * @src: pointer to the data that shall be written
32368+ * @size: size of the data chunk
32369+ *
32370+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32371+ * happens, handle that and return -EFAULT.
32372+ */
32373+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32374+{
32375+ long ret;
32376+ mm_segment_t old_fs = get_fs();
32377+
32378+ set_fs(KERNEL_DS);
32379+ pagefault_disable();
32380+ pax_open_kernel();
32381+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32382+ pax_close_kernel();
32383+ pagefault_enable();
32384+ set_fs(old_fs);
32385+
32386+ return ret ? -EFAULT : 0;
32387+}
32388diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32389index 81bf3d2..7ef25c2 100644
32390--- a/arch/x86/mm/gup.c
32391+++ b/arch/x86/mm/gup.c
32392@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32393 addr = start;
32394 len = (unsigned long) nr_pages << PAGE_SHIFT;
32395 end = start + len;
32396- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32397+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32398 (void __user *)start, len)))
32399 return 0;
32400
32401@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32402 goto slow_irqon;
32403 #endif
32404
32405+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32406+ (void __user *)start, len)))
32407+ return 0;
32408+
32409 /*
32410 * XXX: batch / limit 'nr', to avoid large irq off latency
32411 * needs some instrumenting to determine the common sizes used by
32412diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32413index 4500142..53a363c 100644
32414--- a/arch/x86/mm/highmem_32.c
32415+++ b/arch/x86/mm/highmem_32.c
32416@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32417 idx = type + KM_TYPE_NR*smp_processor_id();
32418 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32419 BUG_ON(!pte_none(*(kmap_pte-idx)));
32420+
32421+ pax_open_kernel();
32422 set_pte(kmap_pte-idx, mk_pte(page, prot));
32423+ pax_close_kernel();
32424+
32425 arch_flush_lazy_mmu_mode();
32426
32427 return (void *)vaddr;
32428diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32429index 42982b2..7168fc3 100644
32430--- a/arch/x86/mm/hugetlbpage.c
32431+++ b/arch/x86/mm/hugetlbpage.c
32432@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32433 #ifdef CONFIG_HUGETLB_PAGE
32434 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32435 unsigned long addr, unsigned long len,
32436- unsigned long pgoff, unsigned long flags)
32437+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32438 {
32439 struct hstate *h = hstate_file(file);
32440 struct vm_unmapped_area_info info;
32441-
32442+
32443 info.flags = 0;
32444 info.length = len;
32445 info.low_limit = current->mm->mmap_legacy_base;
32446 info.high_limit = TASK_SIZE;
32447 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32448 info.align_offset = 0;
32449+ info.threadstack_offset = offset;
32450 return vm_unmapped_area(&info);
32451 }
32452
32453 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32454 unsigned long addr0, unsigned long len,
32455- unsigned long pgoff, unsigned long flags)
32456+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32457 {
32458 struct hstate *h = hstate_file(file);
32459 struct vm_unmapped_area_info info;
32460@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32461 info.high_limit = current->mm->mmap_base;
32462 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32463 info.align_offset = 0;
32464+ info.threadstack_offset = offset;
32465 addr = vm_unmapped_area(&info);
32466
32467 /*
32468@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32469 VM_BUG_ON(addr != -ENOMEM);
32470 info.flags = 0;
32471 info.low_limit = TASK_UNMAPPED_BASE;
32472+
32473+#ifdef CONFIG_PAX_RANDMMAP
32474+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32475+ info.low_limit += current->mm->delta_mmap;
32476+#endif
32477+
32478 info.high_limit = TASK_SIZE;
32479 addr = vm_unmapped_area(&info);
32480 }
32481@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32482 struct hstate *h = hstate_file(file);
32483 struct mm_struct *mm = current->mm;
32484 struct vm_area_struct *vma;
32485+ unsigned long pax_task_size = TASK_SIZE;
32486+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32487
32488 if (len & ~huge_page_mask(h))
32489 return -EINVAL;
32490- if (len > TASK_SIZE)
32491+
32492+#ifdef CONFIG_PAX_SEGMEXEC
32493+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32494+ pax_task_size = SEGMEXEC_TASK_SIZE;
32495+#endif
32496+
32497+ pax_task_size -= PAGE_SIZE;
32498+
32499+ if (len > pax_task_size)
32500 return -ENOMEM;
32501
32502 if (flags & MAP_FIXED) {
32503@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32504 return addr;
32505 }
32506
32507+#ifdef CONFIG_PAX_RANDMMAP
32508+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32509+#endif
32510+
32511 if (addr) {
32512 addr = ALIGN(addr, huge_page_size(h));
32513 vma = find_vma(mm, addr);
32514- if (TASK_SIZE - len >= addr &&
32515- (!vma || addr + len <= vma->vm_start))
32516+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32517 return addr;
32518 }
32519 if (mm->get_unmapped_area == arch_get_unmapped_area)
32520 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32521- pgoff, flags);
32522+ pgoff, flags, offset);
32523 else
32524 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32525- pgoff, flags);
32526+ pgoff, flags, offset);
32527 }
32528 #endif /* CONFIG_HUGETLB_PAGE */
32529
32530diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32531index 1d55318..d58fd6a 100644
32532--- a/arch/x86/mm/init.c
32533+++ b/arch/x86/mm/init.c
32534@@ -4,6 +4,7 @@
32535 #include <linux/swap.h>
32536 #include <linux/memblock.h>
32537 #include <linux/bootmem.h> /* for max_low_pfn */
32538+#include <linux/tboot.h>
32539
32540 #include <asm/cacheflush.h>
32541 #include <asm/e820.h>
32542@@ -17,6 +18,8 @@
32543 #include <asm/proto.h>
32544 #include <asm/dma.h> /* for MAX_DMA_PFN */
32545 #include <asm/microcode.h>
32546+#include <asm/desc.h>
32547+#include <asm/bios_ebda.h>
32548
32549 /*
32550 * We need to define the tracepoints somewhere, and tlb.c
32551@@ -615,7 +618,18 @@ void __init init_mem_mapping(void)
32552 early_ioremap_page_table_range_init();
32553 #endif
32554
32555+#ifdef CONFIG_PAX_PER_CPU_PGD
32556+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32557+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32558+ KERNEL_PGD_PTRS);
32559+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32560+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32561+ KERNEL_PGD_PTRS);
32562+ load_cr3(get_cpu_pgd(0, kernel));
32563+#else
32564 load_cr3(swapper_pg_dir);
32565+#endif
32566+
32567 __flush_tlb_all();
32568
32569 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32570@@ -631,10 +645,40 @@ void __init init_mem_mapping(void)
32571 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32572 * mmio resources as well as potential bios/acpi data regions.
32573 */
32574+
32575+#ifdef CONFIG_GRKERNSEC_KMEM
32576+static unsigned int ebda_start __read_only;
32577+static unsigned int ebda_end __read_only;
32578+#endif
32579+
32580 int devmem_is_allowed(unsigned long pagenr)
32581 {
32582- if (pagenr < 256)
32583+#ifdef CONFIG_GRKERNSEC_KMEM
32584+ /* allow BDA */
32585+ if (!pagenr)
32586 return 1;
32587+ /* allow EBDA */
32588+ if (pagenr >= ebda_start && pagenr < ebda_end)
32589+ return 1;
32590+ /* if tboot is in use, allow access to its hardcoded serial log range */
32591+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32592+ return 1;
32593+#else
32594+ if (!pagenr)
32595+ return 1;
32596+#ifdef CONFIG_VM86
32597+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32598+ return 1;
32599+#endif
32600+#endif
32601+
32602+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32603+ return 1;
32604+#ifdef CONFIG_GRKERNSEC_KMEM
32605+ /* throw out everything else below 1MB */
32606+ if (pagenr <= 256)
32607+ return 0;
32608+#endif
32609 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32610 return 0;
32611 if (!page_is_ram(pagenr))
32612@@ -680,8 +724,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32613 #endif
32614 }
32615
32616+#ifdef CONFIG_GRKERNSEC_KMEM
32617+static inline void gr_init_ebda(void)
32618+{
32619+ unsigned int ebda_addr;
32620+ unsigned int ebda_size = 0;
32621+
32622+ ebda_addr = get_bios_ebda();
32623+ if (ebda_addr) {
32624+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32625+ ebda_size <<= 10;
32626+ }
32627+ if (ebda_addr && ebda_size) {
32628+ ebda_start = ebda_addr >> PAGE_SHIFT;
32629+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32630+ } else {
32631+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32632+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32633+ }
32634+}
32635+#else
32636+static inline void gr_init_ebda(void) { }
32637+#endif
32638+
32639 void free_initmem(void)
32640 {
32641+#ifdef CONFIG_PAX_KERNEXEC
32642+#ifdef CONFIG_X86_32
32643+ /* PaX: limit KERNEL_CS to actual size */
32644+ unsigned long addr, limit;
32645+ struct desc_struct d;
32646+ int cpu;
32647+#else
32648+ pgd_t *pgd;
32649+ pud_t *pud;
32650+ pmd_t *pmd;
32651+ unsigned long addr, end;
32652+#endif
32653+#endif
32654+
32655+ gr_init_ebda();
32656+
32657+#ifdef CONFIG_PAX_KERNEXEC
32658+#ifdef CONFIG_X86_32
32659+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32660+ limit = (limit - 1UL) >> PAGE_SHIFT;
32661+
32662+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32663+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32664+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32665+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32666+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32667+ }
32668+
32669+ /* PaX: make KERNEL_CS read-only */
32670+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32671+ if (!paravirt_enabled())
32672+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32673+/*
32674+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32675+ pgd = pgd_offset_k(addr);
32676+ pud = pud_offset(pgd, addr);
32677+ pmd = pmd_offset(pud, addr);
32678+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32679+ }
32680+*/
32681+#ifdef CONFIG_X86_PAE
32682+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32683+/*
32684+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32685+ pgd = pgd_offset_k(addr);
32686+ pud = pud_offset(pgd, addr);
32687+ pmd = pmd_offset(pud, addr);
32688+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32689+ }
32690+*/
32691+#endif
32692+
32693+#ifdef CONFIG_MODULES
32694+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32695+#endif
32696+
32697+#else
32698+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32699+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32700+ pgd = pgd_offset_k(addr);
32701+ pud = pud_offset(pgd, addr);
32702+ pmd = pmd_offset(pud, addr);
32703+ if (!pmd_present(*pmd))
32704+ continue;
32705+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32706+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32707+ else
32708+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32709+ }
32710+
32711+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32712+ end = addr + KERNEL_IMAGE_SIZE;
32713+ for (; addr < end; addr += PMD_SIZE) {
32714+ pgd = pgd_offset_k(addr);
32715+ pud = pud_offset(pgd, addr);
32716+ pmd = pmd_offset(pud, addr);
32717+ if (!pmd_present(*pmd))
32718+ continue;
32719+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32720+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32721+ }
32722+#endif
32723+
32724+ flush_tlb_all();
32725+#endif
32726+
32727 free_init_pages("unused kernel",
32728 (unsigned long)(&__init_begin),
32729 (unsigned long)(&__init_end));
32730diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32731index c8140e1..59257fc 100644
32732--- a/arch/x86/mm/init_32.c
32733+++ b/arch/x86/mm/init_32.c
32734@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32735 bool __read_mostly __vmalloc_start_set = false;
32736
32737 /*
32738- * Creates a middle page table and puts a pointer to it in the
32739- * given global directory entry. This only returns the gd entry
32740- * in non-PAE compilation mode, since the middle layer is folded.
32741- */
32742-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32743-{
32744- pud_t *pud;
32745- pmd_t *pmd_table;
32746-
32747-#ifdef CONFIG_X86_PAE
32748- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32749- pmd_table = (pmd_t *)alloc_low_page();
32750- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32751- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32752- pud = pud_offset(pgd, 0);
32753- BUG_ON(pmd_table != pmd_offset(pud, 0));
32754-
32755- return pmd_table;
32756- }
32757-#endif
32758- pud = pud_offset(pgd, 0);
32759- pmd_table = pmd_offset(pud, 0);
32760-
32761- return pmd_table;
32762-}
32763-
32764-/*
32765 * Create a page table and place a pointer to it in a middle page
32766 * directory entry:
32767 */
32768@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32769 pte_t *page_table = (pte_t *)alloc_low_page();
32770
32771 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32772+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32773+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32774+#else
32775 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32776+#endif
32777 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32778 }
32779
32780 return pte_offset_kernel(pmd, 0);
32781 }
32782
32783+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32784+{
32785+ pud_t *pud;
32786+ pmd_t *pmd_table;
32787+
32788+ pud = pud_offset(pgd, 0);
32789+ pmd_table = pmd_offset(pud, 0);
32790+
32791+ return pmd_table;
32792+}
32793+
32794 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32795 {
32796 int pgd_idx = pgd_index(vaddr);
32797@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32798 int pgd_idx, pmd_idx;
32799 unsigned long vaddr;
32800 pgd_t *pgd;
32801+ pud_t *pud;
32802 pmd_t *pmd;
32803 pte_t *pte = NULL;
32804 unsigned long count = page_table_range_init_count(start, end);
32805@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32806 pgd = pgd_base + pgd_idx;
32807
32808 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32809- pmd = one_md_table_init(pgd);
32810- pmd = pmd + pmd_index(vaddr);
32811+ pud = pud_offset(pgd, vaddr);
32812+ pmd = pmd_offset(pud, vaddr);
32813+
32814+#ifdef CONFIG_X86_PAE
32815+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32816+#endif
32817+
32818 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32819 pmd++, pmd_idx++) {
32820 pte = page_table_kmap_check(one_page_table_init(pmd),
32821@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32822 }
32823 }
32824
32825-static inline int is_kernel_text(unsigned long addr)
32826+static inline int is_kernel_text(unsigned long start, unsigned long end)
32827 {
32828- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32829- return 1;
32830- return 0;
32831+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32832+ end <= ktla_ktva((unsigned long)_stext)) &&
32833+ (start >= ktla_ktva((unsigned long)_einittext) ||
32834+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32835+
32836+#ifdef CONFIG_ACPI_SLEEP
32837+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32838+#endif
32839+
32840+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32841+ return 0;
32842+ return 1;
32843 }
32844
32845 /*
32846@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32847 unsigned long last_map_addr = end;
32848 unsigned long start_pfn, end_pfn;
32849 pgd_t *pgd_base = swapper_pg_dir;
32850- int pgd_idx, pmd_idx, pte_ofs;
32851+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32852 unsigned long pfn;
32853 pgd_t *pgd;
32854+ pud_t *pud;
32855 pmd_t *pmd;
32856 pte_t *pte;
32857 unsigned pages_2m, pages_4k;
32858@@ -291,8 +295,13 @@ repeat:
32859 pfn = start_pfn;
32860 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32861 pgd = pgd_base + pgd_idx;
32862- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32863- pmd = one_md_table_init(pgd);
32864+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32865+ pud = pud_offset(pgd, 0);
32866+ pmd = pmd_offset(pud, 0);
32867+
32868+#ifdef CONFIG_X86_PAE
32869+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32870+#endif
32871
32872 if (pfn >= end_pfn)
32873 continue;
32874@@ -304,14 +313,13 @@ repeat:
32875 #endif
32876 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32877 pmd++, pmd_idx++) {
32878- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32879+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32880
32881 /*
32882 * Map with big pages if possible, otherwise
32883 * create normal page tables:
32884 */
32885 if (use_pse) {
32886- unsigned int addr2;
32887 pgprot_t prot = PAGE_KERNEL_LARGE;
32888 /*
32889 * first pass will use the same initial
32890@@ -322,11 +330,7 @@ repeat:
32891 _PAGE_PSE);
32892
32893 pfn &= PMD_MASK >> PAGE_SHIFT;
32894- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32895- PAGE_OFFSET + PAGE_SIZE-1;
32896-
32897- if (is_kernel_text(addr) ||
32898- is_kernel_text(addr2))
32899+ if (is_kernel_text(address, address + PMD_SIZE))
32900 prot = PAGE_KERNEL_LARGE_EXEC;
32901
32902 pages_2m++;
32903@@ -343,7 +347,7 @@ repeat:
32904 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32905 pte += pte_ofs;
32906 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32907- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32908+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32909 pgprot_t prot = PAGE_KERNEL;
32910 /*
32911 * first pass will use the same initial
32912@@ -351,7 +355,7 @@ repeat:
32913 */
32914 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32915
32916- if (is_kernel_text(addr))
32917+ if (is_kernel_text(address, address + PAGE_SIZE))
32918 prot = PAGE_KERNEL_EXEC;
32919
32920 pages_4k++;
32921@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
32922
32923 pud = pud_offset(pgd, va);
32924 pmd = pmd_offset(pud, va);
32925- if (!pmd_present(*pmd))
32926+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
32927 break;
32928
32929 /* should not be large page here */
32930@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
32931
32932 static void __init pagetable_init(void)
32933 {
32934- pgd_t *pgd_base = swapper_pg_dir;
32935-
32936- permanent_kmaps_init(pgd_base);
32937+ permanent_kmaps_init(swapper_pg_dir);
32938 }
32939
32940-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
32941+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
32942 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32943
32944 /* user-defined highmem size */
32945@@ -787,10 +789,10 @@ void __init mem_init(void)
32946 ((unsigned long)&__init_end -
32947 (unsigned long)&__init_begin) >> 10,
32948
32949- (unsigned long)&_etext, (unsigned long)&_edata,
32950- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
32951+ (unsigned long)&_sdata, (unsigned long)&_edata,
32952+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
32953
32954- (unsigned long)&_text, (unsigned long)&_etext,
32955+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
32956 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
32957
32958 /*
32959@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
32960 if (!kernel_set_to_readonly)
32961 return;
32962
32963+ start = ktla_ktva(start);
32964 pr_debug("Set kernel text: %lx - %lx for read write\n",
32965 start, start+size);
32966
32967@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
32968 if (!kernel_set_to_readonly)
32969 return;
32970
32971+ start = ktla_ktva(start);
32972 pr_debug("Set kernel text: %lx - %lx for read only\n",
32973 start, start+size);
32974
32975@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
32976 unsigned long start = PFN_ALIGN(_text);
32977 unsigned long size = PFN_ALIGN(_etext) - start;
32978
32979+ start = ktla_ktva(start);
32980 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
32981 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
32982 size >> 10);
32983diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
32984index 3fba623..5ee9802 100644
32985--- a/arch/x86/mm/init_64.c
32986+++ b/arch/x86/mm/init_64.c
32987@@ -136,7 +136,7 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
32988 * around without checking the pgd every time.
32989 */
32990
32991-pteval_t __supported_pte_mask __read_mostly = ~0;
32992+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
32993 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32994
32995 int force_personality32;
32996@@ -169,7 +169,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
32997
32998 for (address = start; address <= end; address += PGDIR_SIZE) {
32999 const pgd_t *pgd_ref = pgd_offset_k(address);
33000+
33001+#ifdef CONFIG_PAX_PER_CPU_PGD
33002+ unsigned long cpu;
33003+#else
33004 struct page *page;
33005+#endif
33006
33007 /*
33008 * When it is called after memory hot remove, pgd_none()
33009@@ -180,6 +185,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33010 continue;
33011
33012 spin_lock(&pgd_lock);
33013+
33014+#ifdef CONFIG_PAX_PER_CPU_PGD
33015+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33016+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33017+
33018+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33019+ BUG_ON(pgd_page_vaddr(*pgd)
33020+ != pgd_page_vaddr(*pgd_ref));
33021+
33022+ if (removed) {
33023+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33024+ pgd_clear(pgd);
33025+ } else {
33026+ if (pgd_none(*pgd))
33027+ set_pgd(pgd, *pgd_ref);
33028+ }
33029+
33030+ pgd = pgd_offset_cpu(cpu, kernel, address);
33031+#else
33032 list_for_each_entry(page, &pgd_list, lru) {
33033 pgd_t *pgd;
33034 spinlock_t *pgt_lock;
33035@@ -188,6 +212,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33036 /* the pgt_lock only for Xen */
33037 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33038 spin_lock(pgt_lock);
33039+#endif
33040
33041 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33042 BUG_ON(pgd_page_vaddr(*pgd)
33043@@ -201,7 +226,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33044 set_pgd(pgd, *pgd_ref);
33045 }
33046
33047+#ifndef CONFIG_PAX_PER_CPU_PGD
33048 spin_unlock(pgt_lock);
33049+#endif
33050+
33051 }
33052 spin_unlock(&pgd_lock);
33053 }
33054@@ -234,7 +262,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33055 {
33056 if (pgd_none(*pgd)) {
33057 pud_t *pud = (pud_t *)spp_getpage();
33058- pgd_populate(&init_mm, pgd, pud);
33059+ pgd_populate_kernel(&init_mm, pgd, pud);
33060 if (pud != pud_offset(pgd, 0))
33061 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33062 pud, pud_offset(pgd, 0));
33063@@ -246,7 +274,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33064 {
33065 if (pud_none(*pud)) {
33066 pmd_t *pmd = (pmd_t *) spp_getpage();
33067- pud_populate(&init_mm, pud, pmd);
33068+ pud_populate_kernel(&init_mm, pud, pmd);
33069 if (pmd != pmd_offset(pud, 0))
33070 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33071 pmd, pmd_offset(pud, 0));
33072@@ -275,7 +303,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33073 pmd = fill_pmd(pud, vaddr);
33074 pte = fill_pte(pmd, vaddr);
33075
33076+ pax_open_kernel();
33077 set_pte(pte, new_pte);
33078+ pax_close_kernel();
33079
33080 /*
33081 * It's enough to flush this one mapping.
33082@@ -337,14 +367,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33083 pgd = pgd_offset_k((unsigned long)__va(phys));
33084 if (pgd_none(*pgd)) {
33085 pud = (pud_t *) spp_getpage();
33086- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33087- _PAGE_USER));
33088+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33089 }
33090 pud = pud_offset(pgd, (unsigned long)__va(phys));
33091 if (pud_none(*pud)) {
33092 pmd = (pmd_t *) spp_getpage();
33093- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33094- _PAGE_USER));
33095+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33096 }
33097 pmd = pmd_offset(pud, phys);
33098 BUG_ON(!pmd_none(*pmd));
33099@@ -585,7 +613,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33100 prot);
33101
33102 spin_lock(&init_mm.page_table_lock);
33103- pud_populate(&init_mm, pud, pmd);
33104+ pud_populate_kernel(&init_mm, pud, pmd);
33105 spin_unlock(&init_mm.page_table_lock);
33106 }
33107 __flush_tlb_all();
33108@@ -626,7 +654,7 @@ kernel_physical_mapping_init(unsigned long start,
33109 page_size_mask);
33110
33111 spin_lock(&init_mm.page_table_lock);
33112- pgd_populate(&init_mm, pgd, pud);
33113+ pgd_populate_kernel(&init_mm, pgd, pud);
33114 spin_unlock(&init_mm.page_table_lock);
33115 pgd_changed = true;
33116 }
33117diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33118index 9ca35fc..4b2b7b7 100644
33119--- a/arch/x86/mm/iomap_32.c
33120+++ b/arch/x86/mm/iomap_32.c
33121@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33122 type = kmap_atomic_idx_push();
33123 idx = type + KM_TYPE_NR * smp_processor_id();
33124 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33125+
33126+ pax_open_kernel();
33127 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33128+ pax_close_kernel();
33129+
33130 arch_flush_lazy_mmu_mode();
33131
33132 return (void *)vaddr;
33133diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33134index 70e7444..e9904fd 100644
33135--- a/arch/x86/mm/ioremap.c
33136+++ b/arch/x86/mm/ioremap.c
33137@@ -56,12 +56,10 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33138 unsigned long i;
33139
33140 for (i = 0; i < nr_pages; ++i)
33141- if (pfn_valid(start_pfn + i) &&
33142- !PageReserved(pfn_to_page(start_pfn + i)))
33143+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33144+ !PageReserved(pfn_to_page(start_pfn + i))))
33145 return 1;
33146
33147- WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33148-
33149 return 0;
33150 }
33151
33152@@ -91,7 +89,6 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
33153 pgprot_t prot;
33154 int retval;
33155 void __iomem *ret_addr;
33156- int ram_region;
33157
33158 /* Don't allow wraparound or zero size */
33159 last_addr = phys_addr + size - 1;
33160@@ -114,23 +111,15 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
33161 /*
33162 * Don't allow anybody to remap normal RAM that we're using..
33163 */
33164- /* First check if whole region can be identified as RAM or not */
33165- ram_region = region_is_ram(phys_addr, size);
33166- if (ram_region > 0) {
33167- WARN_ONCE(1, "ioremap on RAM at 0x%lx - 0x%lx\n",
33168- (unsigned long int)phys_addr,
33169- (unsigned long int)last_addr);
33170+ pfn = phys_addr >> PAGE_SHIFT;
33171+ last_pfn = last_addr >> PAGE_SHIFT;
33172+ if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
33173+ __ioremap_check_ram) == 1) {
33174+ WARN_ONCE(1, "ioremap on RAM at 0x%llx - 0x%llx\n",
33175+ phys_addr, last_addr);
33176 return NULL;
33177 }
33178
33179- /* If could not be identified(-1), check page by page */
33180- if (ram_region < 0) {
33181- pfn = phys_addr >> PAGE_SHIFT;
33182- last_pfn = last_addr >> PAGE_SHIFT;
33183- if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
33184- __ioremap_check_ram) == 1)
33185- return NULL;
33186- }
33187 /*
33188 * Mappings have to be page-aligned
33189 */
33190@@ -288,7 +277,7 @@ EXPORT_SYMBOL(ioremap_prot);
33191 *
33192 * Caller must ensure there is only one unmapping for the same pointer.
33193 */
33194-void iounmap(volatile void __iomem *addr)
33195+void iounmap(const volatile void __iomem *addr)
33196 {
33197 struct vm_struct *p, *o;
33198
33199@@ -351,32 +340,36 @@ int arch_ioremap_pmd_supported(void)
33200 */
33201 void *xlate_dev_mem_ptr(phys_addr_t phys)
33202 {
33203- unsigned long start = phys & PAGE_MASK;
33204- unsigned long offset = phys & ~PAGE_MASK;
33205- unsigned long vaddr;
33206+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33207
33208- /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33209- if (page_is_ram(start >> PAGE_SHIFT))
33210- return __va(phys);
33211+ if (page_is_ram(pfn)) {
33212+#ifdef CONFIG_HIGHMEM
33213+ if (pfn >= max_low_pfn)
33214+ return kmap_high(pfn_to_page(pfn));
33215+ else
33216+#endif
33217+ return __va(phys);
33218+ }
33219
33220- vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE);
33221- /* Only add the offset on success and return NULL if the ioremap() failed: */
33222- if (vaddr)
33223- vaddr += offset;
33224-
33225- return (void *)vaddr;
33226+ return (void __force *)ioremap_cache(phys, 1);
33227 }
33228
33229 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33230 {
33231- if (page_is_ram(phys >> PAGE_SHIFT))
33232+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33233+
33234+ if (page_is_ram(pfn)) {
33235+#ifdef CONFIG_HIGHMEM
33236+ if (pfn >= max_low_pfn)
33237+ kunmap_high(pfn_to_page(pfn));
33238+#endif
33239 return;
33240+ }
33241
33242- iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33243- return;
33244+ iounmap((void __iomem __force *)addr);
33245 }
33246
33247-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33248+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33249
33250 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33251 {
33252@@ -412,8 +405,7 @@ void __init early_ioremap_init(void)
33253 early_ioremap_setup();
33254
33255 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33256- memset(bm_pte, 0, sizeof(bm_pte));
33257- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33258+ pmd_populate_user(&init_mm, pmd, bm_pte);
33259
33260 /*
33261 * The boot-ioremap range spans multiple pmds, for which
33262diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33263index b4f2e7e..96c9c3e 100644
33264--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33265+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33266@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33267 * memory (e.g. tracked pages)? For now, we need this to avoid
33268 * invoking kmemcheck for PnP BIOS calls.
33269 */
33270- if (regs->flags & X86_VM_MASK)
33271+ if (v8086_mode(regs))
33272 return false;
33273- if (regs->cs != __KERNEL_CS)
33274+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33275 return false;
33276
33277 pte = kmemcheck_pte_lookup(address);
33278diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33279index 844b06d..f363c86 100644
33280--- a/arch/x86/mm/mmap.c
33281+++ b/arch/x86/mm/mmap.c
33282@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33283 * Leave an at least ~128 MB hole with possible stack randomization.
33284 */
33285 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33286-#define MAX_GAP (TASK_SIZE/6*5)
33287+#define MAX_GAP (pax_task_size/6*5)
33288
33289 static int mmap_is_legacy(void)
33290 {
33291@@ -81,27 +81,40 @@ unsigned long arch_mmap_rnd(void)
33292 return rnd << PAGE_SHIFT;
33293 }
33294
33295-static unsigned long mmap_base(unsigned long rnd)
33296+static unsigned long mmap_base(struct mm_struct *mm, unsigned long rnd)
33297 {
33298 unsigned long gap = rlimit(RLIMIT_STACK);
33299+ unsigned long pax_task_size = TASK_SIZE;
33300+
33301+#ifdef CONFIG_PAX_SEGMEXEC
33302+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33303+ pax_task_size = SEGMEXEC_TASK_SIZE;
33304+#endif
33305
33306 if (gap < MIN_GAP)
33307 gap = MIN_GAP;
33308 else if (gap > MAX_GAP)
33309 gap = MAX_GAP;
33310
33311- return PAGE_ALIGN(TASK_SIZE - gap - rnd);
33312+ return PAGE_ALIGN(pax_task_size - gap - rnd);
33313 }
33314
33315 /*
33316 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33317 * does, but not when emulating X86_32
33318 */
33319-static unsigned long mmap_legacy_base(unsigned long rnd)
33320+static unsigned long mmap_legacy_base(struct mm_struct *mm, unsigned long rnd)
33321 {
33322- if (mmap_is_ia32())
33323+ if (mmap_is_ia32()) {
33324+
33325+#ifdef CONFIG_PAX_SEGMEXEC
33326+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33327+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33328+ else
33329+#endif
33330+
33331 return TASK_UNMAPPED_BASE;
33332- else
33333+ } else
33334 return TASK_UNMAPPED_BASE + rnd;
33335 }
33336
33337@@ -113,18 +126,29 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
33338 {
33339 unsigned long random_factor = 0UL;
33340
33341+#ifdef CONFIG_PAX_RANDMMAP
33342+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
33343+#endif
33344 if (current->flags & PF_RANDOMIZE)
33345 random_factor = arch_mmap_rnd();
33346
33347- mm->mmap_legacy_base = mmap_legacy_base(random_factor);
33348+ mm->mmap_legacy_base = mmap_legacy_base(mm, random_factor);
33349
33350 if (mmap_is_legacy()) {
33351 mm->mmap_base = mm->mmap_legacy_base;
33352 mm->get_unmapped_area = arch_get_unmapped_area;
33353 } else {
33354- mm->mmap_base = mmap_base(random_factor);
33355+ mm->mmap_base = mmap_base(mm, random_factor);
33356 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
33357 }
33358+
33359+#ifdef CONFIG_PAX_RANDMMAP
33360+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33361+ mm->mmap_legacy_base += mm->delta_mmap;
33362+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33363+ }
33364+#endif
33365+
33366 }
33367
33368 const char *arch_vma_name(struct vm_area_struct *vma)
33369diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33370index 0057a7a..95c7edd 100644
33371--- a/arch/x86/mm/mmio-mod.c
33372+++ b/arch/x86/mm/mmio-mod.c
33373@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33374 break;
33375 default:
33376 {
33377- unsigned char *ip = (unsigned char *)instptr;
33378+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33379 my_trace->opcode = MMIO_UNKNOWN_OP;
33380 my_trace->width = 0;
33381 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33382@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33383 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33384 void __iomem *addr)
33385 {
33386- static atomic_t next_id;
33387+ static atomic_unchecked_t next_id;
33388 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33389 /* These are page-unaligned. */
33390 struct mmiotrace_map map = {
33391@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33392 .private = trace
33393 },
33394 .phys = offset,
33395- .id = atomic_inc_return(&next_id)
33396+ .id = atomic_inc_return_unchecked(&next_id)
33397 };
33398 map.map_id = trace->id;
33399
33400@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33401 ioremap_trace_core(offset, size, addr);
33402 }
33403
33404-static void iounmap_trace_core(volatile void __iomem *addr)
33405+static void iounmap_trace_core(const volatile void __iomem *addr)
33406 {
33407 struct mmiotrace_map map = {
33408 .phys = 0,
33409@@ -328,7 +328,7 @@ not_enabled:
33410 }
33411 }
33412
33413-void mmiotrace_iounmap(volatile void __iomem *addr)
33414+void mmiotrace_iounmap(const volatile void __iomem *addr)
33415 {
33416 might_sleep();
33417 if (is_enabled()) /* recheck and proper locking in *_core() */
33418diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33419index 4053bb5..b1ad3dc 100644
33420--- a/arch/x86/mm/numa.c
33421+++ b/arch/x86/mm/numa.c
33422@@ -506,7 +506,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33423 }
33424 }
33425
33426-static int __init numa_register_memblks(struct numa_meminfo *mi)
33427+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33428 {
33429 unsigned long uninitialized_var(pfn_align);
33430 int i, nid;
33431diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33432index 89af288..05381957 100644
33433--- a/arch/x86/mm/pageattr.c
33434+++ b/arch/x86/mm/pageattr.c
33435@@ -260,7 +260,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33436 */
33437 #ifdef CONFIG_PCI_BIOS
33438 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33439- pgprot_val(forbidden) |= _PAGE_NX;
33440+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33441 #endif
33442
33443 /*
33444@@ -268,9 +268,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33445 * Does not cover __inittext since that is gone later on. On
33446 * 64bit we do not enforce !NX on the low mapping
33447 */
33448- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33449- pgprot_val(forbidden) |= _PAGE_NX;
33450+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33451+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33452
33453+#ifdef CONFIG_DEBUG_RODATA
33454 /*
33455 * The .rodata section needs to be read-only. Using the pfn
33456 * catches all aliases.
33457@@ -278,6 +279,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33458 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33459 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33460 pgprot_val(forbidden) |= _PAGE_RW;
33461+#endif
33462
33463 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33464 /*
33465@@ -316,6 +318,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33466 }
33467 #endif
33468
33469+#ifdef CONFIG_PAX_KERNEXEC
33470+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33471+ pgprot_val(forbidden) |= _PAGE_RW;
33472+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33473+ }
33474+#endif
33475+
33476 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33477
33478 return prot;
33479@@ -438,23 +447,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33480 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33481 {
33482 /* change init_mm */
33483+ pax_open_kernel();
33484 set_pte_atomic(kpte, pte);
33485+
33486 #ifdef CONFIG_X86_32
33487 if (!SHARED_KERNEL_PMD) {
33488+
33489+#ifdef CONFIG_PAX_PER_CPU_PGD
33490+ unsigned long cpu;
33491+#else
33492 struct page *page;
33493+#endif
33494
33495+#ifdef CONFIG_PAX_PER_CPU_PGD
33496+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33497+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33498+#else
33499 list_for_each_entry(page, &pgd_list, lru) {
33500- pgd_t *pgd;
33501+ pgd_t *pgd = (pgd_t *)page_address(page);
33502+#endif
33503+
33504 pud_t *pud;
33505 pmd_t *pmd;
33506
33507- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33508+ pgd += pgd_index(address);
33509 pud = pud_offset(pgd, address);
33510 pmd = pmd_offset(pud, address);
33511 set_pte_atomic((pte_t *)pmd, pte);
33512 }
33513 }
33514 #endif
33515+ pax_close_kernel();
33516 }
33517
33518 static int
33519diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33520index 35af677..e7bf11f 100644
33521--- a/arch/x86/mm/pat.c
33522+++ b/arch/x86/mm/pat.c
33523@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33524 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33525
33526 if (pg_flags == _PGMT_DEFAULT)
33527- return -1;
33528+ return _PAGE_CACHE_MODE_NUM;
33529 else if (pg_flags == _PGMT_WC)
33530 return _PAGE_CACHE_MODE_WC;
33531 else if (pg_flags == _PGMT_UC_MINUS)
33532@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33533
33534 page = pfn_to_page(pfn);
33535 type = get_page_memtype(page);
33536- if (type != -1) {
33537+ if (type != _PAGE_CACHE_MODE_NUM) {
33538 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33539 start, end - 1, type, req_type);
33540 if (new_type)
33541@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33542
33543 if (!entry) {
33544 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33545- current->comm, current->pid, start, end - 1);
33546+ current->comm, task_pid_nr(current), start, end - 1);
33547 return -EINVAL;
33548 }
33549
33550@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33551 page = pfn_to_page(paddr >> PAGE_SHIFT);
33552 rettype = get_page_memtype(page);
33553 /*
33554- * -1 from get_page_memtype() implies RAM page is in its
33555+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33556 * default state and not reserved, and hence of type WB
33557 */
33558- if (rettype == -1)
33559+ if (rettype == _PAGE_CACHE_MODE_NUM)
33560 rettype = _PAGE_CACHE_MODE_WB;
33561
33562 return rettype;
33563@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33564
33565 while (cursor < to) {
33566 if (!devmem_is_allowed(pfn)) {
33567- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx], PAT prevents it\n",
33568- current->comm, from, to - 1);
33569+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx), PAT prevents it\n",
33570+ current->comm, from, to - 1, cursor);
33571 return 0;
33572 }
33573 cursor += PAGE_SIZE;
33574@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33575 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33576 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33577 "for [mem %#010Lx-%#010Lx]\n",
33578- current->comm, current->pid,
33579+ current->comm, task_pid_nr(current),
33580 cattr_name(pcm),
33581 base, (unsigned long long)(base + size-1));
33582 return -EINVAL;
33583@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33584 pcm = lookup_memtype(paddr);
33585 if (want_pcm != pcm) {
33586 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33587- current->comm, current->pid,
33588+ current->comm, task_pid_nr(current),
33589 cattr_name(want_pcm),
33590 (unsigned long long)paddr,
33591 (unsigned long long)(paddr + size - 1),
33592@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33593 free_memtype(paddr, paddr + size);
33594 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33595 " for [mem %#010Lx-%#010Lx], got %s\n",
33596- current->comm, current->pid,
33597+ current->comm, task_pid_nr(current),
33598 cattr_name(want_pcm),
33599 (unsigned long long)paddr,
33600 (unsigned long long)(paddr + size - 1),
33601diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33602index 6582adc..fcc5d0b 100644
33603--- a/arch/x86/mm/pat_rbtree.c
33604+++ b/arch/x86/mm/pat_rbtree.c
33605@@ -161,7 +161,7 @@ success:
33606
33607 failure:
33608 printk(KERN_INFO "%s:%d conflicting memory types "
33609- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33610+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33611 end, cattr_name(found_type), cattr_name(match->type));
33612 return -EBUSY;
33613 }
33614diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33615index 9f0614d..92ae64a 100644
33616--- a/arch/x86/mm/pf_in.c
33617+++ b/arch/x86/mm/pf_in.c
33618@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33619 int i;
33620 enum reason_type rv = OTHERS;
33621
33622- p = (unsigned char *)ins_addr;
33623+ p = (unsigned char *)ktla_ktva(ins_addr);
33624 p += skip_prefix(p, &prf);
33625 p += get_opcode(p, &opcode);
33626
33627@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33628 struct prefix_bits prf;
33629 int i;
33630
33631- p = (unsigned char *)ins_addr;
33632+ p = (unsigned char *)ktla_ktva(ins_addr);
33633 p += skip_prefix(p, &prf);
33634 p += get_opcode(p, &opcode);
33635
33636@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33637 struct prefix_bits prf;
33638 int i;
33639
33640- p = (unsigned char *)ins_addr;
33641+ p = (unsigned char *)ktla_ktva(ins_addr);
33642 p += skip_prefix(p, &prf);
33643 p += get_opcode(p, &opcode);
33644
33645@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33646 struct prefix_bits prf;
33647 int i;
33648
33649- p = (unsigned char *)ins_addr;
33650+ p = (unsigned char *)ktla_ktva(ins_addr);
33651 p += skip_prefix(p, &prf);
33652 p += get_opcode(p, &opcode);
33653 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33654@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33655 struct prefix_bits prf;
33656 int i;
33657
33658- p = (unsigned char *)ins_addr;
33659+ p = (unsigned char *)ktla_ktva(ins_addr);
33660 p += skip_prefix(p, &prf);
33661 p += get_opcode(p, &opcode);
33662 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33663diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33664index 0b97d2c..597bb38 100644
33665--- a/arch/x86/mm/pgtable.c
33666+++ b/arch/x86/mm/pgtable.c
33667@@ -98,10 +98,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33668 list_del(&page->lru);
33669 }
33670
33671-#define UNSHARED_PTRS_PER_PGD \
33672- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33673+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33674+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33675
33676+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33677+{
33678+ unsigned int count = USER_PGD_PTRS;
33679
33680+ if (!pax_user_shadow_base)
33681+ return;
33682+
33683+ while (count--)
33684+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33685+}
33686+#endif
33687+
33688+#ifdef CONFIG_PAX_PER_CPU_PGD
33689+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33690+{
33691+ unsigned int count = USER_PGD_PTRS;
33692+
33693+ while (count--) {
33694+ pgd_t pgd;
33695+
33696+#ifdef CONFIG_X86_64
33697+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33698+#else
33699+ pgd = *src++;
33700+#endif
33701+
33702+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33703+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33704+#endif
33705+
33706+ *dst++ = pgd;
33707+ }
33708+
33709+}
33710+#endif
33711+
33712+#ifdef CONFIG_X86_64
33713+#define pxd_t pud_t
33714+#define pyd_t pgd_t
33715+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33716+#define pgtable_pxd_page_ctor(page) true
33717+#define pgtable_pxd_page_dtor(page) do {} while (0)
33718+#define pxd_free(mm, pud) pud_free((mm), (pud))
33719+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33720+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33721+#define PYD_SIZE PGDIR_SIZE
33722+#define mm_inc_nr_pxds(mm) do {} while (0)
33723+#define mm_dec_nr_pxds(mm) do {} while (0)
33724+#else
33725+#define pxd_t pmd_t
33726+#define pyd_t pud_t
33727+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33728+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33729+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33730+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33731+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33732+#define pyd_offset(mm, address) pud_offset((mm), (address))
33733+#define PYD_SIZE PUD_SIZE
33734+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33735+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33736+#endif
33737+
33738+#ifdef CONFIG_PAX_PER_CPU_PGD
33739+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33740+static inline void pgd_dtor(pgd_t *pgd) {}
33741+#else
33742 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33743 {
33744 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33745@@ -142,6 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
33746 pgd_list_del(pgd);
33747 spin_unlock(&pgd_lock);
33748 }
33749+#endif
33750
33751 /*
33752 * List of all pgd's needed for non-PAE so it can invalidate entries
33753@@ -154,7 +220,7 @@ static void pgd_dtor(pgd_t *pgd)
33754 * -- nyc
33755 */
33756
33757-#ifdef CONFIG_X86_PAE
33758+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33759 /*
33760 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33761 * updating the top-level pagetable entries to guarantee the
33762@@ -166,7 +232,7 @@ static void pgd_dtor(pgd_t *pgd)
33763 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33764 * and initialize the kernel pmds here.
33765 */
33766-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33767+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33768
33769 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33770 {
33771@@ -184,46 +250,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33772 */
33773 flush_tlb_mm(mm);
33774 }
33775+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33776+#define PREALLOCATED_PXDS USER_PGD_PTRS
33777 #else /* !CONFIG_X86_PAE */
33778
33779 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33780-#define PREALLOCATED_PMDS 0
33781+#define PREALLOCATED_PXDS 0
33782
33783 #endif /* CONFIG_X86_PAE */
33784
33785-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33786+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33787 {
33788 int i;
33789
33790- for(i = 0; i < PREALLOCATED_PMDS; i++)
33791- if (pmds[i]) {
33792- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33793- free_page((unsigned long)pmds[i]);
33794- mm_dec_nr_pmds(mm);
33795+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33796+ if (pxds[i]) {
33797+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33798+ free_page((unsigned long)pxds[i]);
33799+ mm_dec_nr_pxds(mm);
33800 }
33801 }
33802
33803-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33804+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33805 {
33806 int i;
33807 bool failed = false;
33808
33809- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33810- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33811- if (!pmd)
33812+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33813+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33814+ if (!pxd)
33815 failed = true;
33816- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33817- free_page((unsigned long)pmd);
33818- pmd = NULL;
33819+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33820+ free_page((unsigned long)pxd);
33821+ pxd = NULL;
33822 failed = true;
33823 }
33824- if (pmd)
33825- mm_inc_nr_pmds(mm);
33826- pmds[i] = pmd;
33827+ if (pxd)
33828+ mm_inc_nr_pxds(mm);
33829+ pxds[i] = pxd;
33830 }
33831
33832 if (failed) {
33833- free_pmds(mm, pmds);
33834+ free_pxds(mm, pxds);
33835 return -ENOMEM;
33836 }
33837
33838@@ -236,43 +304,47 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33839 * preallocate which never got a corresponding vma will need to be
33840 * freed manually.
33841 */
33842-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33843+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33844 {
33845 int i;
33846
33847- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33848+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33849 pgd_t pgd = pgdp[i];
33850
33851 if (pgd_val(pgd) != 0) {
33852- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33853+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33854
33855- pgdp[i] = native_make_pgd(0);
33856+ set_pgd(pgdp + i, native_make_pgd(0));
33857
33858- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33859- pmd_free(mm, pmd);
33860- mm_dec_nr_pmds(mm);
33861+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33862+ pxd_free(mm, pxd);
33863+ mm_dec_nr_pxds(mm);
33864 }
33865 }
33866 }
33867
33868-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33869+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33870 {
33871- pud_t *pud;
33872+ pyd_t *pyd;
33873 int i;
33874
33875- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33876+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33877 return;
33878
33879- pud = pud_offset(pgd, 0);
33880+#ifdef CONFIG_X86_64
33881+ pyd = pyd_offset(mm, 0L);
33882+#else
33883+ pyd = pyd_offset(pgd, 0L);
33884+#endif
33885
33886- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33887- pmd_t *pmd = pmds[i];
33888+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33889+ pxd_t *pxd = pxds[i];
33890
33891 if (i >= KERNEL_PGD_BOUNDARY)
33892- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33893- sizeof(pmd_t) * PTRS_PER_PMD);
33894+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33895+ sizeof(pxd_t) * PTRS_PER_PMD);
33896
33897- pud_populate(mm, pud, pmd);
33898+ pyd_populate(mm, pyd, pxd);
33899 }
33900 }
33901
33902@@ -354,7 +426,7 @@ static inline void _pgd_free(pgd_t *pgd)
33903 pgd_t *pgd_alloc(struct mm_struct *mm)
33904 {
33905 pgd_t *pgd;
33906- pmd_t *pmds[PREALLOCATED_PMDS];
33907+ pxd_t *pxds[PREALLOCATED_PXDS];
33908
33909 pgd = _pgd_alloc();
33910
33911@@ -363,11 +435,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33912
33913 mm->pgd = pgd;
33914
33915- if (preallocate_pmds(mm, pmds) != 0)
33916+ if (preallocate_pxds(mm, pxds) != 0)
33917 goto out_free_pgd;
33918
33919 if (paravirt_pgd_alloc(mm) != 0)
33920- goto out_free_pmds;
33921+ goto out_free_pxds;
33922
33923 /*
33924 * Make sure that pre-populating the pmds is atomic with
33925@@ -377,14 +449,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33926 spin_lock(&pgd_lock);
33927
33928 pgd_ctor(mm, pgd);
33929- pgd_prepopulate_pmd(mm, pgd, pmds);
33930+ pgd_prepopulate_pxd(mm, pgd, pxds);
33931
33932 spin_unlock(&pgd_lock);
33933
33934 return pgd;
33935
33936-out_free_pmds:
33937- free_pmds(mm, pmds);
33938+out_free_pxds:
33939+ free_pxds(mm, pxds);
33940 out_free_pgd:
33941 _pgd_free(pgd);
33942 out:
33943@@ -393,7 +465,7 @@ out:
33944
33945 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33946 {
33947- pgd_mop_up_pmds(mm, pgd);
33948+ pgd_mop_up_pxds(mm, pgd);
33949 pgd_dtor(pgd);
33950 paravirt_pgd_free(mm, pgd);
33951 _pgd_free(pgd);
33952diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33953index 75cc097..79a097f 100644
33954--- a/arch/x86/mm/pgtable_32.c
33955+++ b/arch/x86/mm/pgtable_32.c
33956@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33957 return;
33958 }
33959 pte = pte_offset_kernel(pmd, vaddr);
33960+
33961+ pax_open_kernel();
33962 if (pte_val(pteval))
33963 set_pte_at(&init_mm, vaddr, pte, pteval);
33964 else
33965 pte_clear(&init_mm, vaddr, pte);
33966+ pax_close_kernel();
33967
33968 /*
33969 * It's enough to flush this one mapping.
33970diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33971index e666cbb..61788c45 100644
33972--- a/arch/x86/mm/physaddr.c
33973+++ b/arch/x86/mm/physaddr.c
33974@@ -10,7 +10,7 @@
33975 #ifdef CONFIG_X86_64
33976
33977 #ifdef CONFIG_DEBUG_VIRTUAL
33978-unsigned long __phys_addr(unsigned long x)
33979+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33980 {
33981 unsigned long y = x - __START_KERNEL_map;
33982
33983@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33984 #else
33985
33986 #ifdef CONFIG_DEBUG_VIRTUAL
33987-unsigned long __phys_addr(unsigned long x)
33988+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33989 {
33990 unsigned long phys_addr = x - PAGE_OFFSET;
33991 /* VMALLOC_* aren't constants */
33992diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33993index 90555bf..f5f1828 100644
33994--- a/arch/x86/mm/setup_nx.c
33995+++ b/arch/x86/mm/setup_nx.c
33996@@ -5,8 +5,10 @@
33997 #include <asm/pgtable.h>
33998 #include <asm/proto.h>
33999
34000+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34001 static int disable_nx;
34002
34003+#ifndef CONFIG_PAX_PAGEEXEC
34004 /*
34005 * noexec = on|off
34006 *
34007@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34008 return 0;
34009 }
34010 early_param("noexec", noexec_setup);
34011+#endif
34012+
34013+#endif
34014
34015 void x86_configure_nx(void)
34016 {
34017+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34018 if (cpu_has_nx && !disable_nx)
34019 __supported_pte_mask |= _PAGE_NX;
34020 else
34021+#endif
34022 __supported_pte_mask &= ~_PAGE_NX;
34023 }
34024
34025diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34026index 90b924a..4197ac2 100644
34027--- a/arch/x86/mm/tlb.c
34028+++ b/arch/x86/mm/tlb.c
34029@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34030 BUG();
34031 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34032 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34033+
34034+#ifndef CONFIG_PAX_PER_CPU_PGD
34035 load_cr3(swapper_pg_dir);
34036+#endif
34037+
34038 /*
34039 * This gets called in the idle path where RCU
34040 * functions differently. Tracing normally
34041diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34042new file mode 100644
34043index 0000000..3fda3f3
34044--- /dev/null
34045+++ b/arch/x86/mm/uderef_64.c
34046@@ -0,0 +1,37 @@
34047+#include <linux/mm.h>
34048+#include <asm/pgtable.h>
34049+#include <asm/uaccess.h>
34050+
34051+#ifdef CONFIG_PAX_MEMORY_UDEREF
34052+/* PaX: due to the special call convention these functions must
34053+ * - remain leaf functions under all configurations,
34054+ * - never be called directly, only dereferenced from the wrappers.
34055+ */
34056+void __used __pax_open_userland(void)
34057+{
34058+ unsigned int cpu;
34059+
34060+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34061+ return;
34062+
34063+ cpu = raw_get_cpu();
34064+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34065+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34066+ raw_put_cpu_no_resched();
34067+}
34068+EXPORT_SYMBOL(__pax_open_userland);
34069+
34070+void __used __pax_close_userland(void)
34071+{
34072+ unsigned int cpu;
34073+
34074+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34075+ return;
34076+
34077+ cpu = raw_get_cpu();
34078+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34079+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34080+ raw_put_cpu_no_resched();
34081+}
34082+EXPORT_SYMBOL(__pax_close_userland);
34083+#endif
34084diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34085index 6440221..f84b5c7 100644
34086--- a/arch/x86/net/bpf_jit.S
34087+++ b/arch/x86/net/bpf_jit.S
34088@@ -9,6 +9,7 @@
34089 */
34090 #include <linux/linkage.h>
34091 #include <asm/dwarf2.h>
34092+#include <asm/alternative-asm.h>
34093
34094 /*
34095 * Calling convention :
34096@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34097 jle bpf_slow_path_word
34098 mov (SKBDATA,%rsi),%eax
34099 bswap %eax /* ntohl() */
34100+ pax_force_retaddr
34101 ret
34102
34103 sk_load_half:
34104@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34105 jle bpf_slow_path_half
34106 movzwl (SKBDATA,%rsi),%eax
34107 rol $8,%ax # ntohs()
34108+ pax_force_retaddr
34109 ret
34110
34111 sk_load_byte:
34112@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34113 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34114 jle bpf_slow_path_byte
34115 movzbl (SKBDATA,%rsi),%eax
34116+ pax_force_retaddr
34117 ret
34118
34119 /* rsi contains offset and can be scratched */
34120@@ -90,6 +94,7 @@ bpf_slow_path_word:
34121 js bpf_error
34122 mov - MAX_BPF_STACK + 32(%rbp),%eax
34123 bswap %eax
34124+ pax_force_retaddr
34125 ret
34126
34127 bpf_slow_path_half:
34128@@ -98,12 +103,14 @@ bpf_slow_path_half:
34129 mov - MAX_BPF_STACK + 32(%rbp),%ax
34130 rol $8,%ax
34131 movzwl %ax,%eax
34132+ pax_force_retaddr
34133 ret
34134
34135 bpf_slow_path_byte:
34136 bpf_slow_path_common(1)
34137 js bpf_error
34138 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34139+ pax_force_retaddr
34140 ret
34141
34142 #define sk_negative_common(SIZE) \
34143@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34144 sk_negative_common(4)
34145 mov (%rax), %eax
34146 bswap %eax
34147+ pax_force_retaddr
34148 ret
34149
34150 bpf_slow_path_half_neg:
34151@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34152 mov (%rax),%ax
34153 rol $8,%ax
34154 movzwl %ax,%eax
34155+ pax_force_retaddr
34156 ret
34157
34158 bpf_slow_path_byte_neg:
34159@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34160 .globl sk_load_byte_negative_offset
34161 sk_negative_common(1)
34162 movzbl (%rax), %eax
34163+ pax_force_retaddr
34164 ret
34165
34166 bpf_error:
34167@@ -156,4 +166,5 @@ bpf_error:
34168 mov - MAX_BPF_STACK + 16(%rbp),%r14
34169 mov - MAX_BPF_STACK + 24(%rbp),%r15
34170 leaveq
34171+ pax_force_retaddr
34172 ret
34173diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34174index ddeff48..877ead6 100644
34175--- a/arch/x86/net/bpf_jit_comp.c
34176+++ b/arch/x86/net/bpf_jit_comp.c
34177@@ -13,7 +13,11 @@
34178 #include <linux/if_vlan.h>
34179 #include <asm/cacheflush.h>
34180
34181+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34182+int bpf_jit_enable __read_only;
34183+#else
34184 int bpf_jit_enable __read_mostly;
34185+#endif
34186
34187 /*
34188 * assembly code in arch/x86/net/bpf_jit.S
34189@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34190 static void jit_fill_hole(void *area, unsigned int size)
34191 {
34192 /* fill whole space with int3 instructions */
34193+ pax_open_kernel();
34194 memset(area, 0xcc, size);
34195+ pax_close_kernel();
34196 }
34197
34198 struct jit_context {
34199@@ -924,7 +930,9 @@ common_load:
34200 pr_err("bpf_jit_compile fatal error\n");
34201 return -EFAULT;
34202 }
34203+ pax_open_kernel();
34204 memcpy(image + proglen, temp, ilen);
34205+ pax_close_kernel();
34206 }
34207 proglen += ilen;
34208 addrs[i] = proglen;
34209@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34210
34211 if (image) {
34212 bpf_flush_icache(header, image + proglen);
34213- set_memory_ro((unsigned long)header, header->pages);
34214 prog->bpf_func = (void *)image;
34215 prog->jited = true;
34216 }
34217@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34218 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34219 struct bpf_binary_header *header = (void *)addr;
34220
34221- if (!fp->jited)
34222- goto free_filter;
34223+ if (fp->jited)
34224+ bpf_jit_binary_free(header);
34225
34226- set_memory_rw(addr, header->pages);
34227- bpf_jit_binary_free(header);
34228-
34229-free_filter:
34230 bpf_prog_unlock_free(fp);
34231 }
34232diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34233index 4e664bd..2beeaa2 100644
34234--- a/arch/x86/oprofile/backtrace.c
34235+++ b/arch/x86/oprofile/backtrace.c
34236@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34237 struct stack_frame_ia32 *fp;
34238 unsigned long bytes;
34239
34240- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34241+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34242 if (bytes != 0)
34243 return NULL;
34244
34245- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34246+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34247
34248 oprofile_add_trace(bufhead[0].return_address);
34249
34250@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34251 struct stack_frame bufhead[2];
34252 unsigned long bytes;
34253
34254- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34255+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34256 if (bytes != 0)
34257 return NULL;
34258
34259diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34260index 1d2e639..f6ef82a 100644
34261--- a/arch/x86/oprofile/nmi_int.c
34262+++ b/arch/x86/oprofile/nmi_int.c
34263@@ -23,6 +23,7 @@
34264 #include <asm/nmi.h>
34265 #include <asm/msr.h>
34266 #include <asm/apic.h>
34267+#include <asm/pgtable.h>
34268
34269 #include "op_counter.h"
34270 #include "op_x86_model.h"
34271@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34272 if (ret)
34273 return ret;
34274
34275- if (!model->num_virt_counters)
34276- model->num_virt_counters = model->num_counters;
34277+ if (!model->num_virt_counters) {
34278+ pax_open_kernel();
34279+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34280+ pax_close_kernel();
34281+ }
34282
34283 mux_init(ops);
34284
34285diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34286index 50d86c0..7985318 100644
34287--- a/arch/x86/oprofile/op_model_amd.c
34288+++ b/arch/x86/oprofile/op_model_amd.c
34289@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34290 num_counters = AMD64_NUM_COUNTERS;
34291 }
34292
34293- op_amd_spec.num_counters = num_counters;
34294- op_amd_spec.num_controls = num_counters;
34295- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34296+ pax_open_kernel();
34297+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34298+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34299+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34300+ pax_close_kernel();
34301
34302 return 0;
34303 }
34304diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34305index d90528e..0127e2b 100644
34306--- a/arch/x86/oprofile/op_model_ppro.c
34307+++ b/arch/x86/oprofile/op_model_ppro.c
34308@@ -19,6 +19,7 @@
34309 #include <asm/msr.h>
34310 #include <asm/apic.h>
34311 #include <asm/nmi.h>
34312+#include <asm/pgtable.h>
34313
34314 #include "op_x86_model.h"
34315 #include "op_counter.h"
34316@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34317
34318 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34319
34320- op_arch_perfmon_spec.num_counters = num_counters;
34321- op_arch_perfmon_spec.num_controls = num_counters;
34322+ pax_open_kernel();
34323+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34324+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34325+ pax_close_kernel();
34326 }
34327
34328 static int arch_perfmon_init(struct oprofile_operations *ignore)
34329diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34330index 71e8a67..6a313bb 100644
34331--- a/arch/x86/oprofile/op_x86_model.h
34332+++ b/arch/x86/oprofile/op_x86_model.h
34333@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34334 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34335 struct op_msrs const * const msrs);
34336 #endif
34337-};
34338+} __do_const;
34339
34340 struct op_counter_config;
34341
34342diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34343index 852aa4c..71613f2 100644
34344--- a/arch/x86/pci/intel_mid_pci.c
34345+++ b/arch/x86/pci/intel_mid_pci.c
34346@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34347 pci_mmcfg_late_init();
34348 pcibios_enable_irq = intel_mid_pci_irq_enable;
34349 pcibios_disable_irq = intel_mid_pci_irq_disable;
34350- pci_root_ops = intel_mid_pci_ops;
34351+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34352 pci_soc_mode = 1;
34353 /* Continue with standard init */
34354 return 1;
34355diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34356index 5dc6ca5..25c03f5 100644
34357--- a/arch/x86/pci/irq.c
34358+++ b/arch/x86/pci/irq.c
34359@@ -51,7 +51,7 @@ struct irq_router {
34360 struct irq_router_handler {
34361 u16 vendor;
34362 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34363-};
34364+} __do_const;
34365
34366 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34367 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34368@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34369 return 0;
34370 }
34371
34372-static __initdata struct irq_router_handler pirq_routers[] = {
34373+static __initconst const struct irq_router_handler pirq_routers[] = {
34374 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34375 { PCI_VENDOR_ID_AL, ali_router_probe },
34376 { PCI_VENDOR_ID_ITE, ite_router_probe },
34377@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34378 static void __init pirq_find_router(struct irq_router *r)
34379 {
34380 struct irq_routing_table *rt = pirq_table;
34381- struct irq_router_handler *h;
34382+ const struct irq_router_handler *h;
34383
34384 #ifdef CONFIG_PCI_BIOS
34385 if (!rt->signature) {
34386@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34387 return 0;
34388 }
34389
34390-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34391+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34392 {
34393 .callback = fix_broken_hp_bios_irq9,
34394 .ident = "HP Pavilion N5400 Series Laptop",
34395diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34396index 9b83b90..2c256c5 100644
34397--- a/arch/x86/pci/pcbios.c
34398+++ b/arch/x86/pci/pcbios.c
34399@@ -79,7 +79,7 @@ union bios32 {
34400 static struct {
34401 unsigned long address;
34402 unsigned short segment;
34403-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34404+} bios32_indirect __initdata = { 0, __PCIBIOS_CS };
34405
34406 /*
34407 * Returns the entry point for the given service, NULL on error
34408@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34409 unsigned long length; /* %ecx */
34410 unsigned long entry; /* %edx */
34411 unsigned long flags;
34412+ struct desc_struct d, *gdt;
34413
34414 local_irq_save(flags);
34415- __asm__("lcall *(%%edi); cld"
34416+
34417+ gdt = get_cpu_gdt_table(smp_processor_id());
34418+
34419+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34420+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34421+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34422+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34423+
34424+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34425 : "=a" (return_code),
34426 "=b" (address),
34427 "=c" (length),
34428 "=d" (entry)
34429 : "0" (service),
34430 "1" (0),
34431- "D" (&bios32_indirect));
34432+ "D" (&bios32_indirect),
34433+ "r"(__PCIBIOS_DS)
34434+ : "memory");
34435+
34436+ pax_open_kernel();
34437+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34438+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34439+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34440+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34441+ pax_close_kernel();
34442+
34443 local_irq_restore(flags);
34444
34445 switch (return_code) {
34446- case 0:
34447- return address + entry;
34448- case 0x80: /* Not present */
34449- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34450- return 0;
34451- default: /* Shouldn't happen */
34452- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34453- service, return_code);
34454+ case 0: {
34455+ int cpu;
34456+ unsigned char flags;
34457+
34458+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34459+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34460+ printk(KERN_WARNING "bios32_service: not valid\n");
34461 return 0;
34462+ }
34463+ address = address + PAGE_OFFSET;
34464+ length += 16UL; /* some BIOSs underreport this... */
34465+ flags = 4;
34466+ if (length >= 64*1024*1024) {
34467+ length >>= PAGE_SHIFT;
34468+ flags |= 8;
34469+ }
34470+
34471+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34472+ gdt = get_cpu_gdt_table(cpu);
34473+ pack_descriptor(&d, address, length, 0x9b, flags);
34474+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34475+ pack_descriptor(&d, address, length, 0x93, flags);
34476+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34477+ }
34478+ return entry;
34479+ }
34480+ case 0x80: /* Not present */
34481+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34482+ return 0;
34483+ default: /* Shouldn't happen */
34484+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34485+ service, return_code);
34486+ return 0;
34487 }
34488 }
34489
34490 static struct {
34491 unsigned long address;
34492 unsigned short segment;
34493-} pci_indirect = { 0, __KERNEL_CS };
34494+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34495
34496-static int pci_bios_present;
34497+static int pci_bios_present __read_only;
34498
34499 static int __init check_pcibios(void)
34500 {
34501@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34502 unsigned long flags, pcibios_entry;
34503
34504 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34505- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34506+ pci_indirect.address = pcibios_entry;
34507
34508 local_irq_save(flags);
34509- __asm__(
34510- "lcall *(%%edi); cld\n\t"
34511+ __asm__("movw %w6, %%ds\n\t"
34512+ "lcall *%%ss:(%%edi); cld\n\t"
34513+ "push %%ss\n\t"
34514+ "pop %%ds\n\t"
34515 "jc 1f\n\t"
34516 "xor %%ah, %%ah\n"
34517 "1:"
34518@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34519 "=b" (ebx),
34520 "=c" (ecx)
34521 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34522- "D" (&pci_indirect)
34523+ "D" (&pci_indirect),
34524+ "r" (__PCIBIOS_DS)
34525 : "memory");
34526 local_irq_restore(flags);
34527
34528@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34529
34530 switch (len) {
34531 case 1:
34532- __asm__("lcall *(%%esi); cld\n\t"
34533+ __asm__("movw %w6, %%ds\n\t"
34534+ "lcall *%%ss:(%%esi); cld\n\t"
34535+ "push %%ss\n\t"
34536+ "pop %%ds\n\t"
34537 "jc 1f\n\t"
34538 "xor %%ah, %%ah\n"
34539 "1:"
34540@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34541 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34542 "b" (bx),
34543 "D" ((long)reg),
34544- "S" (&pci_indirect));
34545+ "S" (&pci_indirect),
34546+ "r" (__PCIBIOS_DS));
34547 /*
34548 * Zero-extend the result beyond 8 bits, do not trust the
34549 * BIOS having done it:
34550@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34551 *value &= 0xff;
34552 break;
34553 case 2:
34554- __asm__("lcall *(%%esi); cld\n\t"
34555+ __asm__("movw %w6, %%ds\n\t"
34556+ "lcall *%%ss:(%%esi); cld\n\t"
34557+ "push %%ss\n\t"
34558+ "pop %%ds\n\t"
34559 "jc 1f\n\t"
34560 "xor %%ah, %%ah\n"
34561 "1:"
34562@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34563 : "1" (PCIBIOS_READ_CONFIG_WORD),
34564 "b" (bx),
34565 "D" ((long)reg),
34566- "S" (&pci_indirect));
34567+ "S" (&pci_indirect),
34568+ "r" (__PCIBIOS_DS));
34569 /*
34570 * Zero-extend the result beyond 16 bits, do not trust the
34571 * BIOS having done it:
34572@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34573 *value &= 0xffff;
34574 break;
34575 case 4:
34576- __asm__("lcall *(%%esi); cld\n\t"
34577+ __asm__("movw %w6, %%ds\n\t"
34578+ "lcall *%%ss:(%%esi); cld\n\t"
34579+ "push %%ss\n\t"
34580+ "pop %%ds\n\t"
34581 "jc 1f\n\t"
34582 "xor %%ah, %%ah\n"
34583 "1:"
34584@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34585 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34586 "b" (bx),
34587 "D" ((long)reg),
34588- "S" (&pci_indirect));
34589+ "S" (&pci_indirect),
34590+ "r" (__PCIBIOS_DS));
34591 break;
34592 }
34593
34594@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34595
34596 switch (len) {
34597 case 1:
34598- __asm__("lcall *(%%esi); cld\n\t"
34599+ __asm__("movw %w6, %%ds\n\t"
34600+ "lcall *%%ss:(%%esi); cld\n\t"
34601+ "push %%ss\n\t"
34602+ "pop %%ds\n\t"
34603 "jc 1f\n\t"
34604 "xor %%ah, %%ah\n"
34605 "1:"
34606@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34607 "c" (value),
34608 "b" (bx),
34609 "D" ((long)reg),
34610- "S" (&pci_indirect));
34611+ "S" (&pci_indirect),
34612+ "r" (__PCIBIOS_DS));
34613 break;
34614 case 2:
34615- __asm__("lcall *(%%esi); cld\n\t"
34616+ __asm__("movw %w6, %%ds\n\t"
34617+ "lcall *%%ss:(%%esi); cld\n\t"
34618+ "push %%ss\n\t"
34619+ "pop %%ds\n\t"
34620 "jc 1f\n\t"
34621 "xor %%ah, %%ah\n"
34622 "1:"
34623@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34624 "c" (value),
34625 "b" (bx),
34626 "D" ((long)reg),
34627- "S" (&pci_indirect));
34628+ "S" (&pci_indirect),
34629+ "r" (__PCIBIOS_DS));
34630 break;
34631 case 4:
34632- __asm__("lcall *(%%esi); cld\n\t"
34633+ __asm__("movw %w6, %%ds\n\t"
34634+ "lcall *%%ss:(%%esi); cld\n\t"
34635+ "push %%ss\n\t"
34636+ "pop %%ds\n\t"
34637 "jc 1f\n\t"
34638 "xor %%ah, %%ah\n"
34639 "1:"
34640@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34641 "c" (value),
34642 "b" (bx),
34643 "D" ((long)reg),
34644- "S" (&pci_indirect));
34645+ "S" (&pci_indirect),
34646+ "r" (__PCIBIOS_DS));
34647 break;
34648 }
34649
34650@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34651
34652 DBG("PCI: Fetching IRQ routing table... ");
34653 __asm__("push %%es\n\t"
34654+ "movw %w8, %%ds\n\t"
34655 "push %%ds\n\t"
34656 "pop %%es\n\t"
34657- "lcall *(%%esi); cld\n\t"
34658+ "lcall *%%ss:(%%esi); cld\n\t"
34659 "pop %%es\n\t"
34660+ "push %%ss\n\t"
34661+ "pop %%ds\n"
34662 "jc 1f\n\t"
34663 "xor %%ah, %%ah\n"
34664 "1:"
34665@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34666 "1" (0),
34667 "D" ((long) &opt),
34668 "S" (&pci_indirect),
34669- "m" (opt)
34670+ "m" (opt),
34671+ "r" (__PCIBIOS_DS)
34672 : "memory");
34673 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34674 if (ret & 0xff00)
34675@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34676 {
34677 int ret;
34678
34679- __asm__("lcall *(%%esi); cld\n\t"
34680+ __asm__("movw %w5, %%ds\n\t"
34681+ "lcall *%%ss:(%%esi); cld\n\t"
34682+ "push %%ss\n\t"
34683+ "pop %%ds\n"
34684 "jc 1f\n\t"
34685 "xor %%ah, %%ah\n"
34686 "1:"
34687@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34688 : "0" (PCIBIOS_SET_PCI_HW_INT),
34689 "b" ((dev->bus->number << 8) | dev->devfn),
34690 "c" ((irq << 8) | (pin + 10)),
34691- "S" (&pci_indirect));
34692+ "S" (&pci_indirect),
34693+ "r" (__PCIBIOS_DS));
34694 return !(ret & 0xff00);
34695 }
34696 EXPORT_SYMBOL(pcibios_set_irq_routing);
34697diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34698index ed5b673..24d2d53 100644
34699--- a/arch/x86/platform/efi/efi_32.c
34700+++ b/arch/x86/platform/efi/efi_32.c
34701@@ -61,11 +61,27 @@ pgd_t * __init efi_call_phys_prolog(void)
34702 struct desc_ptr gdt_descr;
34703 pgd_t *save_pgd;
34704
34705+#ifdef CONFIG_PAX_KERNEXEC
34706+ struct desc_struct d;
34707+#endif
34708+
34709 /* Current pgd is swapper_pg_dir, we'll restore it later: */
34710+#ifdef CONFIG_PAX_PER_CPU_PGD
34711+ save_pgd = get_cpu_pgd(smp_processor_id(), kernel);
34712+#else
34713 save_pgd = swapper_pg_dir;
34714+#endif
34715+
34716 load_cr3(initial_page_table);
34717 __flush_tlb_all();
34718
34719+#ifdef CONFIG_PAX_KERNEXEC
34720+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34721+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34722+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34723+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34724+#endif
34725+
34726 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34727 gdt_descr.size = GDT_SIZE - 1;
34728 load_gdt(&gdt_descr);
34729@@ -77,6 +93,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
34730 {
34731 struct desc_ptr gdt_descr;
34732
34733+#ifdef CONFIG_PAX_KERNEXEC
34734+ struct desc_struct d;
34735+
34736+ memset(&d, 0, sizeof d);
34737+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34738+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34739+#endif
34740+
34741 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34742 gdt_descr.size = GDT_SIZE - 1;
34743 load_gdt(&gdt_descr);
34744diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34745index a0ac0f9..f41d324 100644
34746--- a/arch/x86/platform/efi/efi_64.c
34747+++ b/arch/x86/platform/efi/efi_64.c
34748@@ -96,6 +96,11 @@ pgd_t * __init efi_call_phys_prolog(void)
34749 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34750 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34751 }
34752+
34753+#ifdef CONFIG_PAX_PER_CPU_PGD
34754+ load_cr3(swapper_pg_dir);
34755+#endif
34756+
34757 __flush_tlb_all();
34758
34759 return save_pgd;
34760@@ -119,6 +124,10 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
34761
34762 kfree(save_pgd);
34763
34764+#ifdef CONFIG_PAX_PER_CPU_PGD
34765+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34766+#endif
34767+
34768 __flush_tlb_all();
34769 early_code_mapping_set_exec(0);
34770 }
34771@@ -148,8 +157,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34772 unsigned npages;
34773 pgd_t *pgd;
34774
34775- if (efi_enabled(EFI_OLD_MEMMAP))
34776+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34777+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34778+ * able to execute the EFI services.
34779+ */
34780+ if (__supported_pte_mask & _PAGE_NX) {
34781+ unsigned long addr = (unsigned long) __va(0);
34782+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34783+
34784+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34785+#ifdef CONFIG_PAX_PER_CPU_PGD
34786+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34787+#endif
34788+ set_pgd(pgd_offset_k(addr), pe);
34789+ }
34790+
34791 return 0;
34792+ }
34793
34794 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34795 pgd = __va(efi_scratch.efi_pgt);
34796diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34797index 040192b..7d3300f 100644
34798--- a/arch/x86/platform/efi/efi_stub_32.S
34799+++ b/arch/x86/platform/efi/efi_stub_32.S
34800@@ -6,7 +6,9 @@
34801 */
34802
34803 #include <linux/linkage.h>
34804+#include <linux/init.h>
34805 #include <asm/page_types.h>
34806+#include <asm/segment.h>
34807
34808 /*
34809 * efi_call_phys(void *, ...) is a function with variable parameters.
34810@@ -20,7 +22,7 @@
34811 * service functions will comply with gcc calling convention, too.
34812 */
34813
34814-.text
34815+__INIT
34816 ENTRY(efi_call_phys)
34817 /*
34818 * 0. The function can only be called in Linux kernel. So CS has been
34819@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34820 * The mapping of lower virtual memory has been created in prolog and
34821 * epilog.
34822 */
34823- movl $1f, %edx
34824- subl $__PAGE_OFFSET, %edx
34825- jmp *%edx
34826+#ifdef CONFIG_PAX_KERNEXEC
34827+ movl $(__KERNEXEC_EFI_DS), %edx
34828+ mov %edx, %ds
34829+ mov %edx, %es
34830+ mov %edx, %ss
34831+ addl $2f,(1f)
34832+ ljmp *(1f)
34833+
34834+__INITDATA
34835+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34836+.previous
34837+
34838+2:
34839+ subl $2b,(1b)
34840+#else
34841+ jmp 1f-__PAGE_OFFSET
34842 1:
34843+#endif
34844
34845 /*
34846 * 2. Now on the top of stack is the return
34847@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34848 * parameter 2, ..., param n. To make things easy, we save the return
34849 * address of efi_call_phys in a global variable.
34850 */
34851- popl %edx
34852- movl %edx, saved_return_addr
34853- /* get the function pointer into ECX*/
34854- popl %ecx
34855- movl %ecx, efi_rt_function_ptr
34856- movl $2f, %edx
34857- subl $__PAGE_OFFSET, %edx
34858- pushl %edx
34859+ popl (saved_return_addr)
34860+ popl (efi_rt_function_ptr)
34861
34862 /*
34863 * 3. Clear PG bit in %CR0.
34864@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34865 /*
34866 * 5. Call the physical function.
34867 */
34868- jmp *%ecx
34869+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34870
34871-2:
34872 /*
34873 * 6. After EFI runtime service returns, control will return to
34874 * following instruction. We'd better readjust stack pointer first.
34875@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34876 movl %cr0, %edx
34877 orl $0x80000000, %edx
34878 movl %edx, %cr0
34879- jmp 1f
34880-1:
34881+
34882 /*
34883 * 8. Now restore the virtual mode from flat mode by
34884 * adding EIP with PAGE_OFFSET.
34885 */
34886- movl $1f, %edx
34887- jmp *%edx
34888+#ifdef CONFIG_PAX_KERNEXEC
34889+ movl $(__KERNEL_DS), %edx
34890+ mov %edx, %ds
34891+ mov %edx, %es
34892+ mov %edx, %ss
34893+ ljmp $(__KERNEL_CS),$1f
34894+#else
34895+ jmp 1f+__PAGE_OFFSET
34896+#endif
34897 1:
34898
34899 /*
34900 * 9. Balance the stack. And because EAX contain the return value,
34901 * we'd better not clobber it.
34902 */
34903- leal efi_rt_function_ptr, %edx
34904- movl (%edx), %ecx
34905- pushl %ecx
34906+ pushl (efi_rt_function_ptr)
34907
34908 /*
34909- * 10. Push the saved return address onto the stack and return.
34910+ * 10. Return to the saved return address.
34911 */
34912- leal saved_return_addr, %edx
34913- movl (%edx), %ecx
34914- pushl %ecx
34915- ret
34916+ jmpl *(saved_return_addr)
34917 ENDPROC(efi_call_phys)
34918 .previous
34919
34920-.data
34921+__INITDATA
34922 saved_return_addr:
34923 .long 0
34924 efi_rt_function_ptr:
34925diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34926index 86d0f9e..6d499f4 100644
34927--- a/arch/x86/platform/efi/efi_stub_64.S
34928+++ b/arch/x86/platform/efi/efi_stub_64.S
34929@@ -11,6 +11,7 @@
34930 #include <asm/msr.h>
34931 #include <asm/processor-flags.h>
34932 #include <asm/page_types.h>
34933+#include <asm/alternative-asm.h>
34934
34935 #define SAVE_XMM \
34936 mov %rsp, %rax; \
34937@@ -88,6 +89,7 @@ ENTRY(efi_call)
34938 RESTORE_PGT
34939 addq $48, %rsp
34940 RESTORE_XMM
34941+ pax_force_retaddr 0, 1
34942 ret
34943 ENDPROC(efi_call)
34944
34945diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34946index 3005f0c..d06aeb0 100644
34947--- a/arch/x86/platform/intel-mid/intel-mid.c
34948+++ b/arch/x86/platform/intel-mid/intel-mid.c
34949@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
34950 /* intel_mid_ops to store sub arch ops */
34951 struct intel_mid_ops *intel_mid_ops;
34952 /* getter function for sub arch ops*/
34953-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
34954+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
34955 enum intel_mid_cpu_type __intel_mid_cpu_chip;
34956 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
34957
34958@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34959 {
34960 };
34961
34962-static void intel_mid_reboot(void)
34963+static void __noreturn intel_mid_reboot(void)
34964 {
34965 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34966+ BUG();
34967 }
34968
34969 static unsigned long __init intel_mid_calibrate_tsc(void)
34970diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34971index 3c1c386..59a68ed 100644
34972--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34973+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34974@@ -13,6 +13,6 @@
34975 /* For every CPU addition a new get_<cpuname>_ops interface needs
34976 * to be added.
34977 */
34978-extern void *get_penwell_ops(void);
34979-extern void *get_cloverview_ops(void);
34980-extern void *get_tangier_ops(void);
34981+extern const void *get_penwell_ops(void);
34982+extern const void *get_cloverview_ops(void);
34983+extern const void *get_tangier_ops(void);
34984diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
34985index 23381d2..8ddc10e 100644
34986--- a/arch/x86/platform/intel-mid/mfld.c
34987+++ b/arch/x86/platform/intel-mid/mfld.c
34988@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
34989 pm_power_off = mfld_power_off;
34990 }
34991
34992-void *get_penwell_ops(void)
34993+const void *get_penwell_ops(void)
34994 {
34995 return &penwell_ops;
34996 }
34997
34998-void *get_cloverview_ops(void)
34999+const void *get_cloverview_ops(void)
35000 {
35001 return &penwell_ops;
35002 }
35003diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35004index aaca917..66eadbc 100644
35005--- a/arch/x86/platform/intel-mid/mrfl.c
35006+++ b/arch/x86/platform/intel-mid/mrfl.c
35007@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35008 .arch_setup = tangier_arch_setup,
35009 };
35010
35011-void *get_tangier_ops(void)
35012+const void *get_tangier_ops(void)
35013 {
35014 return &tangier_ops;
35015 }
35016diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35017index 278e4da..55e8d8a 100644
35018--- a/arch/x86/platform/intel-quark/imr_selftest.c
35019+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35020@@ -55,7 +55,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35021 */
35022 static void __init imr_self_test(void)
35023 {
35024- phys_addr_t base = virt_to_phys(&_text);
35025+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35026 size_t size = virt_to_phys(&__end_rodata) - base;
35027 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35028 int ret;
35029diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35030index d6ee929..3637cb5 100644
35031--- a/arch/x86/platform/olpc/olpc_dt.c
35032+++ b/arch/x86/platform/olpc/olpc_dt.c
35033@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35034 return res;
35035 }
35036
35037-static struct of_pdt_ops prom_olpc_ops __initdata = {
35038+static struct of_pdt_ops prom_olpc_ops __initconst = {
35039 .nextprop = olpc_dt_nextprop,
35040 .getproplen = olpc_dt_getproplen,
35041 .getproperty = olpc_dt_getproperty,
35042diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35043index 757678f..9895d9b 100644
35044--- a/arch/x86/power/cpu.c
35045+++ b/arch/x86/power/cpu.c
35046@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35047 static void fix_processor_context(void)
35048 {
35049 int cpu = smp_processor_id();
35050- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
35051-#ifdef CONFIG_X86_64
35052- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35053- tss_desc tss;
35054-#endif
35055+ struct tss_struct *t = cpu_tss + cpu;
35056+
35057 set_tss_desc(cpu, t); /*
35058 * This just modifies memory; should not be
35059 * necessary. But... This is necessary, because
35060@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35061 */
35062
35063 #ifdef CONFIG_X86_64
35064- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35065- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35066- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35067-
35068 syscall_init(); /* This sets MSR_*STAR and related */
35069 #endif
35070 load_TR_desc(); /* This does ltr */
35071diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35072index 0b7a63d..0d0f2c2 100644
35073--- a/arch/x86/realmode/init.c
35074+++ b/arch/x86/realmode/init.c
35075@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35076 __va(real_mode_header->trampoline_header);
35077
35078 #ifdef CONFIG_X86_32
35079- trampoline_header->start = __pa_symbol(startup_32_smp);
35080+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35081+
35082+#ifdef CONFIG_PAX_KERNEXEC
35083+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35084+#endif
35085+
35086+ trampoline_header->boot_cs = __BOOT_CS;
35087 trampoline_header->gdt_limit = __BOOT_DS + 7;
35088 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35089 #else
35090@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35091 *trampoline_cr4_features = __read_cr4();
35092
35093 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35094- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35095+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35096 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35097 #endif
35098 }
35099diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35100index 2730d77..2e4cd19 100644
35101--- a/arch/x86/realmode/rm/Makefile
35102+++ b/arch/x86/realmode/rm/Makefile
35103@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35104
35105 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35106 -I$(srctree)/arch/x86/boot
35107+ifdef CONSTIFY_PLUGIN
35108+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35109+endif
35110 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35111 GCOV_PROFILE := n
35112diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35113index a28221d..93c40f1 100644
35114--- a/arch/x86/realmode/rm/header.S
35115+++ b/arch/x86/realmode/rm/header.S
35116@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35117 #endif
35118 /* APM/BIOS reboot */
35119 .long pa_machine_real_restart_asm
35120-#ifdef CONFIG_X86_64
35121+#ifdef CONFIG_X86_32
35122+ .long __KERNEL_CS
35123+#else
35124 .long __KERNEL32_CS
35125 #endif
35126 END(real_mode_header)
35127diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35128index d66c607..3def845 100644
35129--- a/arch/x86/realmode/rm/reboot.S
35130+++ b/arch/x86/realmode/rm/reboot.S
35131@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35132 lgdtl pa_tr_gdt
35133
35134 /* Disable paging to drop us out of long mode */
35135+ movl %cr4, %eax
35136+ andl $~X86_CR4_PCIDE, %eax
35137+ movl %eax, %cr4
35138+
35139 movl %cr0, %eax
35140 andl $~X86_CR0_PG, %eax
35141 movl %eax, %cr0
35142diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35143index 48ddd76..c26749f 100644
35144--- a/arch/x86/realmode/rm/trampoline_32.S
35145+++ b/arch/x86/realmode/rm/trampoline_32.S
35146@@ -24,6 +24,12 @@
35147 #include <asm/page_types.h>
35148 #include "realmode.h"
35149
35150+#ifdef CONFIG_PAX_KERNEXEC
35151+#define ta(X) (X)
35152+#else
35153+#define ta(X) (pa_ ## X)
35154+#endif
35155+
35156 .text
35157 .code16
35158
35159@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35160
35161 cli # We should be safe anyway
35162
35163- movl tr_start, %eax # where we need to go
35164-
35165 movl $0xA5A5A5A5, trampoline_status
35166 # write marker for master knows we're running
35167
35168@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35169 movw $1, %dx # protected mode (PE) bit
35170 lmsw %dx # into protected mode
35171
35172- ljmpl $__BOOT_CS, $pa_startup_32
35173+ ljmpl *(trampoline_header)
35174
35175 .section ".text32","ax"
35176 .code32
35177@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35178 .balign 8
35179 GLOBAL(trampoline_header)
35180 tr_start: .space 4
35181- tr_gdt_pad: .space 2
35182+ tr_boot_cs: .space 2
35183 tr_gdt: .space 6
35184 END(trampoline_header)
35185
35186diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35187index dac7b20..72dbaca 100644
35188--- a/arch/x86/realmode/rm/trampoline_64.S
35189+++ b/arch/x86/realmode/rm/trampoline_64.S
35190@@ -93,6 +93,7 @@ ENTRY(startup_32)
35191 movl %edx, %gs
35192
35193 movl pa_tr_cr4, %eax
35194+ andl $~X86_CR4_PCIDE, %eax
35195 movl %eax, %cr4 # Enable PAE mode
35196
35197 # Setup trampoline 4 level pagetables
35198@@ -106,7 +107,7 @@ ENTRY(startup_32)
35199 wrmsr
35200
35201 # Enable paging and in turn activate Long Mode
35202- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35203+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35204 movl %eax, %cr0
35205
35206 /*
35207diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35208index 9e7e147..25a4158 100644
35209--- a/arch/x86/realmode/rm/wakeup_asm.S
35210+++ b/arch/x86/realmode/rm/wakeup_asm.S
35211@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35212 lgdtl pmode_gdt
35213
35214 /* This really couldn't... */
35215- movl pmode_entry, %eax
35216 movl pmode_cr0, %ecx
35217 movl %ecx, %cr0
35218- ljmpl $__KERNEL_CS, $pa_startup_32
35219- /* -> jmp *%eax in trampoline_32.S */
35220+
35221+ ljmpl *pmode_entry
35222 #else
35223 jmp trampoline_start
35224 #endif
35225diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35226index 604a37e..e49702a 100644
35227--- a/arch/x86/tools/Makefile
35228+++ b/arch/x86/tools/Makefile
35229@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35230
35231 $(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
35232
35233-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35234+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35235 hostprogs-y += relocs
35236 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35237 PHONY += relocs
35238diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35239index 0c2fae8..88036b7 100644
35240--- a/arch/x86/tools/relocs.c
35241+++ b/arch/x86/tools/relocs.c
35242@@ -1,5 +1,7 @@
35243 /* This is included from relocs_32/64.c */
35244
35245+#include "../../../include/generated/autoconf.h"
35246+
35247 #define ElfW(type) _ElfW(ELF_BITS, type)
35248 #define _ElfW(bits, type) __ElfW(bits, type)
35249 #define __ElfW(bits, type) Elf##bits##_##type
35250@@ -11,6 +13,7 @@
35251 #define Elf_Sym ElfW(Sym)
35252
35253 static Elf_Ehdr ehdr;
35254+static Elf_Phdr *phdr;
35255
35256 struct relocs {
35257 uint32_t *offset;
35258@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35259 }
35260 }
35261
35262+static void read_phdrs(FILE *fp)
35263+{
35264+ unsigned int i;
35265+
35266+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35267+ if (!phdr) {
35268+ die("Unable to allocate %d program headers\n",
35269+ ehdr.e_phnum);
35270+ }
35271+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35272+ die("Seek to %d failed: %s\n",
35273+ ehdr.e_phoff, strerror(errno));
35274+ }
35275+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35276+ die("Cannot read ELF program headers: %s\n",
35277+ strerror(errno));
35278+ }
35279+ for(i = 0; i < ehdr.e_phnum; i++) {
35280+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35281+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35282+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35283+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35284+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35285+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35286+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35287+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35288+ }
35289+
35290+}
35291+
35292 static void read_shdrs(FILE *fp)
35293 {
35294- int i;
35295+ unsigned int i;
35296 Elf_Shdr shdr;
35297
35298 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35299@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35300
35301 static void read_strtabs(FILE *fp)
35302 {
35303- int i;
35304+ unsigned int i;
35305 for (i = 0; i < ehdr.e_shnum; i++) {
35306 struct section *sec = &secs[i];
35307 if (sec->shdr.sh_type != SHT_STRTAB) {
35308@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35309
35310 static void read_symtabs(FILE *fp)
35311 {
35312- int i,j;
35313+ unsigned int i,j;
35314 for (i = 0; i < ehdr.e_shnum; i++) {
35315 struct section *sec = &secs[i];
35316 if (sec->shdr.sh_type != SHT_SYMTAB) {
35317@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35318 }
35319
35320
35321-static void read_relocs(FILE *fp)
35322+static void read_relocs(FILE *fp, int use_real_mode)
35323 {
35324- int i,j;
35325+ unsigned int i,j;
35326+ uint32_t base;
35327+
35328 for (i = 0; i < ehdr.e_shnum; i++) {
35329 struct section *sec = &secs[i];
35330 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35331@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35332 die("Cannot read symbol table: %s\n",
35333 strerror(errno));
35334 }
35335+ base = 0;
35336+
35337+#ifdef CONFIG_X86_32
35338+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35339+ if (phdr[j].p_type != PT_LOAD )
35340+ continue;
35341+ 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)
35342+ continue;
35343+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35344+ break;
35345+ }
35346+#endif
35347+
35348 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35349 Elf_Rel *rel = &sec->reltab[j];
35350- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35351+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35352 rel->r_info = elf_xword_to_cpu(rel->r_info);
35353 #if (SHT_REL_TYPE == SHT_RELA)
35354 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35355@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35356
35357 static void print_absolute_symbols(void)
35358 {
35359- int i;
35360+ unsigned int i;
35361 const char *format;
35362
35363 if (ELF_BITS == 64)
35364@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35365 for (i = 0; i < ehdr.e_shnum; i++) {
35366 struct section *sec = &secs[i];
35367 char *sym_strtab;
35368- int j;
35369+ unsigned int j;
35370
35371 if (sec->shdr.sh_type != SHT_SYMTAB) {
35372 continue;
35373@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35374
35375 static void print_absolute_relocs(void)
35376 {
35377- int i, printed = 0;
35378+ unsigned int i, printed = 0;
35379 const char *format;
35380
35381 if (ELF_BITS == 64)
35382@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35383 struct section *sec_applies, *sec_symtab;
35384 char *sym_strtab;
35385 Elf_Sym *sh_symtab;
35386- int j;
35387+ unsigned int j;
35388 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35389 continue;
35390 }
35391@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35392 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35393 Elf_Sym *sym, const char *symname))
35394 {
35395- int i;
35396+ unsigned int i;
35397 /* Walk through the relocations */
35398 for (i = 0; i < ehdr.e_shnum; i++) {
35399 char *sym_strtab;
35400 Elf_Sym *sh_symtab;
35401 struct section *sec_applies, *sec_symtab;
35402- int j;
35403+ unsigned int j;
35404 struct section *sec = &secs[i];
35405
35406 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35407@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35408 {
35409 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35410 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35411+ char *sym_strtab = sec->link->link->strtab;
35412+
35413+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35414+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35415+ return 0;
35416+
35417+#ifdef CONFIG_PAX_KERNEXEC
35418+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35419+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35420+ return 0;
35421+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35422+ return 0;
35423+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35424+ return 0;
35425+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35426+ return 0;
35427+#endif
35428
35429 switch (r_type) {
35430 case R_386_NONE:
35431@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35432
35433 static void emit_relocs(int as_text, int use_real_mode)
35434 {
35435- int i;
35436+ unsigned int i;
35437 int (*write_reloc)(uint32_t, FILE *) = write32;
35438 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35439 const char *symname);
35440@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35441 {
35442 regex_init(use_real_mode);
35443 read_ehdr(fp);
35444+ read_phdrs(fp);
35445 read_shdrs(fp);
35446 read_strtabs(fp);
35447 read_symtabs(fp);
35448- read_relocs(fp);
35449+ read_relocs(fp, use_real_mode);
35450 if (ELF_BITS == 64)
35451 percpu_init();
35452 if (show_absolute_syms) {
35453diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35454index f40281e..92728c9 100644
35455--- a/arch/x86/um/mem_32.c
35456+++ b/arch/x86/um/mem_32.c
35457@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35458 gate_vma.vm_start = FIXADDR_USER_START;
35459 gate_vma.vm_end = FIXADDR_USER_END;
35460 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35461- gate_vma.vm_page_prot = __P101;
35462+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35463
35464 return 0;
35465 }
35466diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35467index 80ffa5b..a33bd15 100644
35468--- a/arch/x86/um/tls_32.c
35469+++ b/arch/x86/um/tls_32.c
35470@@ -260,7 +260,7 @@ out:
35471 if (unlikely(task == current &&
35472 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35473 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35474- "without flushed TLS.", current->pid);
35475+ "without flushed TLS.", task_pid_nr(current));
35476 }
35477
35478 return 0;
35479diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35480index e970320..c006fea 100644
35481--- a/arch/x86/vdso/Makefile
35482+++ b/arch/x86/vdso/Makefile
35483@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35484 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35485 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35486
35487-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35488+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35489 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35490 GCOV_PROFILE := n
35491
35492diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35493index 0224987..c7d65a5 100644
35494--- a/arch/x86/vdso/vdso2c.h
35495+++ b/arch/x86/vdso/vdso2c.h
35496@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35497 unsigned long load_size = -1; /* Work around bogus warning */
35498 unsigned long mapping_size;
35499 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35500- int i;
35501+ unsigned int i;
35502 unsigned long j;
35503 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35504 *alt_sec = NULL;
35505diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35506index e904c27..b9eaa03 100644
35507--- a/arch/x86/vdso/vdso32-setup.c
35508+++ b/arch/x86/vdso/vdso32-setup.c
35509@@ -14,6 +14,7 @@
35510 #include <asm/cpufeature.h>
35511 #include <asm/processor.h>
35512 #include <asm/vdso.h>
35513+#include <asm/mman.h>
35514
35515 #ifdef CONFIG_COMPAT_VDSO
35516 #define VDSO_DEFAULT 0
35517diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35518index 1c9f750..cfddb1a 100644
35519--- a/arch/x86/vdso/vma.c
35520+++ b/arch/x86/vdso/vma.c
35521@@ -19,10 +19,7 @@
35522 #include <asm/page.h>
35523 #include <asm/hpet.h>
35524 #include <asm/desc.h>
35525-
35526-#if defined(CONFIG_X86_64)
35527-unsigned int __read_mostly vdso64_enabled = 1;
35528-#endif
35529+#include <asm/mman.h>
35530
35531 void __init init_vdso_image(const struct vdso_image *image)
35532 {
35533@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35534 .pages = no_pages,
35535 };
35536
35537+#ifdef CONFIG_PAX_RANDMMAP
35538+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35539+ calculate_addr = false;
35540+#endif
35541+
35542 if (calculate_addr) {
35543 addr = vdso_addr(current->mm->start_stack,
35544 image->size - image->sym_vvar_start);
35545@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35546 down_write(&mm->mmap_sem);
35547
35548 addr = get_unmapped_area(NULL, addr,
35549- image->size - image->sym_vvar_start, 0, 0);
35550+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35551 if (IS_ERR_VALUE(addr)) {
35552 ret = addr;
35553 goto up_fail;
35554 }
35555
35556 text_start = addr - image->sym_vvar_start;
35557- current->mm->context.vdso = (void __user *)text_start;
35558+ mm->context.vdso = text_start;
35559
35560 /*
35561 * MAYWRITE to allow gdb to COW and set breakpoints
35562@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35563 hpet_address >> PAGE_SHIFT,
35564 PAGE_SIZE,
35565 pgprot_noncached(PAGE_READONLY));
35566-
35567- if (ret)
35568- goto up_fail;
35569 }
35570 #endif
35571
35572 up_fail:
35573 if (ret)
35574- current->mm->context.vdso = NULL;
35575+ current->mm->context.vdso = 0;
35576
35577 up_write(&mm->mmap_sem);
35578 return ret;
35579@@ -191,8 +190,8 @@ static int load_vdso32(void)
35580
35581 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35582 current_thread_info()->sysenter_return =
35583- current->mm->context.vdso +
35584- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35585+ (void __force_user *)(current->mm->context.vdso +
35586+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35587
35588 return 0;
35589 }
35590@@ -201,9 +200,6 @@ static int load_vdso32(void)
35591 #ifdef CONFIG_X86_64
35592 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35593 {
35594- if (!vdso64_enabled)
35595- return 0;
35596-
35597 return map_vdso(&vdso_image_64, true);
35598 }
35599
35600@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35601 int uses_interp)
35602 {
35603 #ifdef CONFIG_X86_X32_ABI
35604- if (test_thread_flag(TIF_X32)) {
35605- if (!vdso64_enabled)
35606- return 0;
35607-
35608+ if (test_thread_flag(TIF_X32))
35609 return map_vdso(&vdso_image_x32, true);
35610- }
35611 #endif
35612
35613 return load_vdso32();
35614@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35615 #endif
35616
35617 #ifdef CONFIG_X86_64
35618-static __init int vdso_setup(char *s)
35619-{
35620- vdso64_enabled = simple_strtoul(s, NULL, 0);
35621- return 0;
35622-}
35623-__setup("vdso=", vdso_setup);
35624-#endif
35625-
35626-#ifdef CONFIG_X86_64
35627 static void vgetcpu_cpu_init(void *arg)
35628 {
35629 int cpu = smp_processor_id();
35630diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35631index 4841453..d59a203 100644
35632--- a/arch/x86/xen/Kconfig
35633+++ b/arch/x86/xen/Kconfig
35634@@ -9,6 +9,7 @@ config XEN
35635 select XEN_HAVE_PVMMU
35636 depends on X86_64 || (X86_32 && X86_PAE)
35637 depends on X86_LOCAL_APIC && X86_TSC
35638+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35639 help
35640 This is the Linux Xen port. Enabling this will allow the
35641 kernel to boot in a paravirtualized environment under the
35642diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35643index a671e83..a9dc1d9 100644
35644--- a/arch/x86/xen/enlighten.c
35645+++ b/arch/x86/xen/enlighten.c
35646@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35647
35648 struct shared_info xen_dummy_shared_info;
35649
35650-void *xen_initial_gdt;
35651-
35652 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35653 __read_mostly int xen_have_vector_callback;
35654 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35655@@ -584,8 +582,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35656 {
35657 unsigned long va = dtr->address;
35658 unsigned int size = dtr->size + 1;
35659- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35660- unsigned long frames[pages];
35661+ unsigned long frames[65536 / PAGE_SIZE];
35662 int f;
35663
35664 /*
35665@@ -633,8 +630,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35666 {
35667 unsigned long va = dtr->address;
35668 unsigned int size = dtr->size + 1;
35669- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35670- unsigned long frames[pages];
35671+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35672 int f;
35673
35674 /*
35675@@ -642,7 +638,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35676 * 8-byte entries, or 16 4k pages..
35677 */
35678
35679- BUG_ON(size > 65536);
35680+ BUG_ON(size > GDT_SIZE);
35681 BUG_ON(va & ~PAGE_MASK);
35682
35683 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35684@@ -1263,30 +1259,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35685 #endif
35686 };
35687
35688-static void xen_reboot(int reason)
35689+static __noreturn void xen_reboot(int reason)
35690 {
35691 struct sched_shutdown r = { .reason = reason };
35692
35693- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35694- BUG();
35695+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35696+ BUG();
35697 }
35698
35699-static void xen_restart(char *msg)
35700+static __noreturn void xen_restart(char *msg)
35701 {
35702 xen_reboot(SHUTDOWN_reboot);
35703 }
35704
35705-static void xen_emergency_restart(void)
35706+static __noreturn void xen_emergency_restart(void)
35707 {
35708 xen_reboot(SHUTDOWN_reboot);
35709 }
35710
35711-static void xen_machine_halt(void)
35712+static __noreturn void xen_machine_halt(void)
35713 {
35714 xen_reboot(SHUTDOWN_poweroff);
35715 }
35716
35717-static void xen_machine_power_off(void)
35718+static __noreturn void xen_machine_power_off(void)
35719 {
35720 if (pm_power_off)
35721 pm_power_off();
35722@@ -1439,8 +1435,11 @@ static void __ref xen_setup_gdt(int cpu)
35723 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35724 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35725
35726- setup_stack_canary_segment(0);
35727- switch_to_new_gdt(0);
35728+ setup_stack_canary_segment(cpu);
35729+#ifdef CONFIG_X86_64
35730+ load_percpu_segment(cpu);
35731+#endif
35732+ switch_to_new_gdt(cpu);
35733
35734 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35735 pv_cpu_ops.load_gdt = xen_load_gdt;
35736@@ -1555,7 +1554,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35737 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35738
35739 /* Work out if we support NX */
35740- x86_configure_nx();
35741+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35742+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35743+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35744+ unsigned l, h;
35745+
35746+ __supported_pte_mask |= _PAGE_NX;
35747+ rdmsr(MSR_EFER, l, h);
35748+ l |= EFER_NX;
35749+ wrmsr(MSR_EFER, l, h);
35750+ }
35751+#endif
35752
35753 /* Get mfn list */
35754 xen_build_dynamic_phys_to_machine();
35755@@ -1583,13 +1592,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35756
35757 machine_ops = xen_machine_ops;
35758
35759- /*
35760- * The only reliable way to retain the initial address of the
35761- * percpu gdt_page is to remember it here, so we can go and
35762- * mark it RW later, when the initial percpu area is freed.
35763- */
35764- xen_initial_gdt = &per_cpu(gdt_page, 0);
35765-
35766 xen_smp_init();
35767
35768 #ifdef CONFIG_ACPI_NUMA
35769diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35770index dd151b2..d5ab952 100644
35771--- a/arch/x86/xen/mmu.c
35772+++ b/arch/x86/xen/mmu.c
35773@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35774 return val;
35775 }
35776
35777-static pteval_t pte_pfn_to_mfn(pteval_t val)
35778+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35779 {
35780 if (val & _PAGE_PRESENT) {
35781 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35782@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35783 * L3_k[511] -> level2_fixmap_pgt */
35784 convert_pfn_mfn(level3_kernel_pgt);
35785
35786+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35787+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35788+ convert_pfn_mfn(level3_vmemmap_pgt);
35789 /* L3_k[511][506] -> level1_fixmap_pgt */
35790+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35791 convert_pfn_mfn(level2_fixmap_pgt);
35792 }
35793 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35794@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35795 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35796 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35797 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35798+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35799+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35800+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35801 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35802 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35803+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35804 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35805 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35806- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35807+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
35808+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
35809+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
35810+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35811
35812 /* Pin down new L4 */
35813 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35814@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
35815 pv_mmu_ops.set_pud = xen_set_pud;
35816 #if CONFIG_PGTABLE_LEVELS == 4
35817 pv_mmu_ops.set_pgd = xen_set_pgd;
35818+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35819 #endif
35820
35821 /* This will work as long as patching hasn't happened yet
35822@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35823 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35824 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35825 .set_pgd = xen_set_pgd_hyper,
35826+ .set_pgd_batched = xen_set_pgd_hyper,
35827
35828 .alloc_pud = xen_alloc_pmd_init,
35829 .release_pud = xen_release_pmd_init,
35830diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35831index 8648438..18bac20 100644
35832--- a/arch/x86/xen/smp.c
35833+++ b/arch/x86/xen/smp.c
35834@@ -284,17 +284,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35835
35836 if (xen_pv_domain()) {
35837 if (!xen_feature(XENFEAT_writable_page_tables))
35838- /* We've switched to the "real" per-cpu gdt, so make
35839- * sure the old memory can be recycled. */
35840- make_lowmem_page_readwrite(xen_initial_gdt);
35841-
35842 #ifdef CONFIG_X86_32
35843 /*
35844 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35845 * expects __USER_DS
35846 */
35847- loadsegment(ds, __USER_DS);
35848- loadsegment(es, __USER_DS);
35849+ loadsegment(ds, __KERNEL_DS);
35850+ loadsegment(es, __KERNEL_DS);
35851 #endif
35852
35853 xen_filter_cpu_maps();
35854@@ -375,7 +371,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35855 #ifdef CONFIG_X86_32
35856 /* Note: PVH is not yet supported on x86_32. */
35857 ctxt->user_regs.fs = __KERNEL_PERCPU;
35858- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35859+ savesegment(gs, ctxt->user_regs.gs);
35860 #endif
35861 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35862
35863@@ -383,8 +379,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35864 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35865 ctxt->flags = VGCF_IN_KERNEL;
35866 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35867- ctxt->user_regs.ds = __USER_DS;
35868- ctxt->user_regs.es = __USER_DS;
35869+ ctxt->user_regs.ds = __KERNEL_DS;
35870+ ctxt->user_regs.es = __KERNEL_DS;
35871 ctxt->user_regs.ss = __KERNEL_DS;
35872
35873 xen_copy_trap_info(ctxt->trap_ctxt);
35874@@ -720,7 +716,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35875
35876 void __init xen_smp_init(void)
35877 {
35878- smp_ops = xen_smp_ops;
35879+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35880 xen_fill_possible_map();
35881 }
35882
35883diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35884index fd92a64..1f72641 100644
35885--- a/arch/x86/xen/xen-asm_32.S
35886+++ b/arch/x86/xen/xen-asm_32.S
35887@@ -99,7 +99,7 @@ ENTRY(xen_iret)
35888 pushw %fs
35889 movl $(__KERNEL_PERCPU), %eax
35890 movl %eax, %fs
35891- movl %fs:xen_vcpu, %eax
35892+ mov PER_CPU_VAR(xen_vcpu), %eax
35893 POP_FS
35894 #else
35895 movl %ss:xen_vcpu, %eax
35896diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35897index 8afdfcc..79239db 100644
35898--- a/arch/x86/xen/xen-head.S
35899+++ b/arch/x86/xen/xen-head.S
35900@@ -41,6 +41,17 @@ ENTRY(startup_xen)
35901 #ifdef CONFIG_X86_32
35902 mov %esi,xen_start_info
35903 mov $init_thread_union+THREAD_SIZE,%esp
35904+#ifdef CONFIG_SMP
35905+ movl $cpu_gdt_table,%edi
35906+ movl $__per_cpu_load,%eax
35907+ movw %ax,__KERNEL_PERCPU + 2(%edi)
35908+ rorl $16,%eax
35909+ movb %al,__KERNEL_PERCPU + 4(%edi)
35910+ movb %ah,__KERNEL_PERCPU + 7(%edi)
35911+ movl $__per_cpu_end - 1,%eax
35912+ subl $__per_cpu_start,%eax
35913+ movw %ax,__KERNEL_PERCPU + 0(%edi)
35914+#endif
35915 #else
35916 mov %rsi,xen_start_info
35917 mov $init_thread_union+THREAD_SIZE,%rsp
35918diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35919index bef30cb..f1a0d68 100644
35920--- a/arch/x86/xen/xen-ops.h
35921+++ b/arch/x86/xen/xen-ops.h
35922@@ -16,8 +16,6 @@ void xen_syscall_target(void);
35923 void xen_syscall32_target(void);
35924 #endif
35925
35926-extern void *xen_initial_gdt;
35927-
35928 struct trap_info;
35929 void xen_copy_trap_info(struct trap_info *traps);
35930
35931diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35932index 525bd3d..ef888b1 100644
35933--- a/arch/xtensa/variants/dc232b/include/variant/core.h
35934+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35935@@ -119,9 +119,9 @@
35936 ----------------------------------------------------------------------*/
35937
35938 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35939-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35940 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35941 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35942+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35943
35944 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35945 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35946diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35947index 2f33760..835e50a 100644
35948--- a/arch/xtensa/variants/fsf/include/variant/core.h
35949+++ b/arch/xtensa/variants/fsf/include/variant/core.h
35950@@ -11,6 +11,7 @@
35951 #ifndef _XTENSA_CORE_H
35952 #define _XTENSA_CORE_H
35953
35954+#include <linux/const.h>
35955
35956 /****************************************************************************
35957 Parameters Useful for Any Code, USER or PRIVILEGED
35958@@ -112,9 +113,9 @@
35959 ----------------------------------------------------------------------*/
35960
35961 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35962-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35963 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35964 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35965+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35966
35967 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35968 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35969diff --git a/block/bio.c b/block/bio.c
35970index 4441522..dedbafc 100644
35971--- a/block/bio.c
35972+++ b/block/bio.c
35973@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
35974 /*
35975 * Overflow, abort
35976 */
35977- if (end < start)
35978+ if (end < start || end - start > INT_MAX - nr_pages)
35979 return ERR_PTR(-EINVAL);
35980
35981 nr_pages += end - start;
35982@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
35983 /*
35984 * Overflow, abort
35985 */
35986- if (end < start)
35987+ if (end < start || end - start > INT_MAX - nr_pages)
35988 return ERR_PTR(-EINVAL);
35989
35990 nr_pages += end - start;
35991diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35992index 0736729..2ec3b48 100644
35993--- a/block/blk-iopoll.c
35994+++ b/block/blk-iopoll.c
35995@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
35996 }
35997 EXPORT_SYMBOL(blk_iopoll_complete);
35998
35999-static void blk_iopoll_softirq(struct softirq_action *h)
36000+static __latent_entropy void blk_iopoll_softirq(void)
36001 {
36002 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36003 int rearm = 0, budget = blk_iopoll_budget;
36004diff --git a/block/blk-map.c b/block/blk-map.c
36005index da310a1..213b5c9 100644
36006--- a/block/blk-map.c
36007+++ b/block/blk-map.c
36008@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36009 if (!len || !kbuf)
36010 return -EINVAL;
36011
36012- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36013+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36014 if (do_copy)
36015 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36016 else
36017diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36018index 53b1737..08177d2e 100644
36019--- a/block/blk-softirq.c
36020+++ b/block/blk-softirq.c
36021@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36022 * Softirq action handler - move entries to local list and loop over them
36023 * while passing them to the queue registered handler.
36024 */
36025-static void blk_done_softirq(struct softirq_action *h)
36026+static __latent_entropy void blk_done_softirq(void)
36027 {
36028 struct list_head *cpu_list, local_list;
36029
36030diff --git a/block/bsg.c b/block/bsg.c
36031index d214e92..9649863 100644
36032--- a/block/bsg.c
36033+++ b/block/bsg.c
36034@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36035 struct sg_io_v4 *hdr, struct bsg_device *bd,
36036 fmode_t has_write_perm)
36037 {
36038+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36039+ unsigned char *cmdptr;
36040+
36041 if (hdr->request_len > BLK_MAX_CDB) {
36042 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36043 if (!rq->cmd)
36044 return -ENOMEM;
36045- }
36046+ cmdptr = rq->cmd;
36047+ } else
36048+ cmdptr = tmpcmd;
36049
36050- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36051+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36052 hdr->request_len))
36053 return -EFAULT;
36054
36055+ if (cmdptr != rq->cmd)
36056+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36057+
36058 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36059 if (blk_verify_command(rq->cmd, has_write_perm))
36060 return -EPERM;
36061diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36062index f678c73..f35aa18 100644
36063--- a/block/compat_ioctl.c
36064+++ b/block/compat_ioctl.c
36065@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36066 cgc = compat_alloc_user_space(sizeof(*cgc));
36067 cgc32 = compat_ptr(arg);
36068
36069- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36070+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36071 get_user(data, &cgc32->buffer) ||
36072 put_user(compat_ptr(data), &cgc->buffer) ||
36073 copy_in_user(&cgc->buflen, &cgc32->buflen,
36074@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36075 err |= __get_user(f->spec1, &uf->spec1);
36076 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36077 err |= __get_user(name, &uf->name);
36078- f->name = compat_ptr(name);
36079+ f->name = (void __force_kernel *)compat_ptr(name);
36080 if (err) {
36081 err = -EFAULT;
36082 goto out;
36083diff --git a/block/genhd.c b/block/genhd.c
36084index ea982ea..86e0f9e 100644
36085--- a/block/genhd.c
36086+++ b/block/genhd.c
36087@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36088
36089 /*
36090 * Register device numbers dev..(dev+range-1)
36091- * range must be nonzero
36092+ * Noop if @range is zero.
36093 * The hash chain is sorted on range, so that subranges can override.
36094 */
36095 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36096 struct kobject *(*probe)(dev_t, int *, void *),
36097 int (*lock)(dev_t, void *), void *data)
36098 {
36099- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36100+ if (range)
36101+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36102 }
36103
36104 EXPORT_SYMBOL(blk_register_region);
36105
36106+/* undo blk_register_region(), noop if @range is zero */
36107 void blk_unregister_region(dev_t devt, unsigned long range)
36108 {
36109- kobj_unmap(bdev_map, devt, range);
36110+ if (range)
36111+ kobj_unmap(bdev_map, devt, range);
36112 }
36113
36114 EXPORT_SYMBOL(blk_unregister_region);
36115diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36116index 26cb624..a49c3a5 100644
36117--- a/block/partitions/efi.c
36118+++ b/block/partitions/efi.c
36119@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36120 if (!gpt)
36121 return NULL;
36122
36123+ if (!le32_to_cpu(gpt->num_partition_entries))
36124+ return NULL;
36125+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36126+ if (!pte)
36127+ return NULL;
36128+
36129 count = le32_to_cpu(gpt->num_partition_entries) *
36130 le32_to_cpu(gpt->sizeof_partition_entry);
36131- if (!count)
36132- return NULL;
36133- pte = kmalloc(count, GFP_KERNEL);
36134- if (!pte)
36135- return NULL;
36136-
36137 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36138 (u8 *) pte, count) < count) {
36139 kfree(pte);
36140diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36141index 55b6f15..b602c9a 100644
36142--- a/block/scsi_ioctl.c
36143+++ b/block/scsi_ioctl.c
36144@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36145 return put_user(0, p);
36146 }
36147
36148-static int sg_get_timeout(struct request_queue *q)
36149+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36150 {
36151 return jiffies_to_clock_t(q->sg_timeout);
36152 }
36153@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36154 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36155 struct sg_io_hdr *hdr, fmode_t mode)
36156 {
36157- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36158+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36159+ unsigned char *cmdptr;
36160+
36161+ if (rq->cmd != rq->__cmd)
36162+ cmdptr = rq->cmd;
36163+ else
36164+ cmdptr = tmpcmd;
36165+
36166+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36167 return -EFAULT;
36168+
36169+ if (cmdptr != rq->cmd)
36170+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36171+
36172 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36173 return -EPERM;
36174
36175@@ -420,6 +432,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36176 int err;
36177 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36178 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36179+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36180+ unsigned char *cmdptr;
36181
36182 if (!sic)
36183 return -EINVAL;
36184@@ -458,9 +472,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36185 */
36186 err = -EFAULT;
36187 rq->cmd_len = cmdlen;
36188- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36189+
36190+ if (rq->cmd != rq->__cmd)
36191+ cmdptr = rq->cmd;
36192+ else
36193+ cmdptr = tmpcmd;
36194+
36195+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36196 goto error;
36197
36198+ if (rq->cmd != cmdptr)
36199+ memcpy(rq->cmd, cmdptr, cmdlen);
36200+
36201 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36202 goto error;
36203
36204diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36205index b0602ba..fb71850 100644
36206--- a/crypto/cryptd.c
36207+++ b/crypto/cryptd.c
36208@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36209
36210 struct cryptd_blkcipher_request_ctx {
36211 crypto_completion_t complete;
36212-};
36213+} __no_const;
36214
36215 struct cryptd_hash_ctx {
36216 struct crypto_shash *child;
36217@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36218
36219 struct cryptd_aead_request_ctx {
36220 crypto_completion_t complete;
36221-};
36222+} __no_const;
36223
36224 static void cryptd_queue_worker(struct work_struct *work);
36225
36226diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36227index c305d41..a96de79 100644
36228--- a/crypto/pcrypt.c
36229+++ b/crypto/pcrypt.c
36230@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36231 int ret;
36232
36233 pinst->kobj.kset = pcrypt_kset;
36234- ret = kobject_add(&pinst->kobj, NULL, name);
36235+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36236 if (!ret)
36237 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36238
36239diff --git a/crypto/zlib.c b/crypto/zlib.c
36240index 0eefa9d..0fa3d29 100644
36241--- a/crypto/zlib.c
36242+++ b/crypto/zlib.c
36243@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36244 zlib_comp_exit(ctx);
36245
36246 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36247- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36248+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36249 : MAX_WBITS;
36250 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36251- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36252+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36253 : DEF_MEM_LEVEL;
36254
36255 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36256diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36257index 3b37676..898edfa 100644
36258--- a/drivers/acpi/acpica/hwxfsleep.c
36259+++ b/drivers/acpi/acpica/hwxfsleep.c
36260@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36261 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36262
36263 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36264- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36265- acpi_hw_extended_sleep},
36266- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36267- acpi_hw_extended_wake_prep},
36268- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36269+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36270+ .extended_function = acpi_hw_extended_sleep},
36271+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36272+ .extended_function = acpi_hw_extended_wake_prep},
36273+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36274+ .extended_function = acpi_hw_extended_wake}
36275 };
36276
36277 /*
36278diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36279index 16129c7..8b675cd 100644
36280--- a/drivers/acpi/apei/apei-internal.h
36281+++ b/drivers/acpi/apei/apei-internal.h
36282@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36283 struct apei_exec_ins_type {
36284 u32 flags;
36285 apei_exec_ins_func_t run;
36286-};
36287+} __do_const;
36288
36289 struct apei_exec_context {
36290 u32 ip;
36291diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36292index e82d097..0c855c1 100644
36293--- a/drivers/acpi/apei/ghes.c
36294+++ b/drivers/acpi/apei/ghes.c
36295@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36296 const struct acpi_hest_generic *generic,
36297 const struct acpi_hest_generic_status *estatus)
36298 {
36299- static atomic_t seqno;
36300+ static atomic_unchecked_t seqno;
36301 unsigned int curr_seqno;
36302 char pfx_seq[64];
36303
36304@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36305 else
36306 pfx = KERN_ERR;
36307 }
36308- curr_seqno = atomic_inc_return(&seqno);
36309+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36310 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36311 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36312 pfx_seq, generic->header.source_id);
36313diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36314index a83e3c6..c3d617f 100644
36315--- a/drivers/acpi/bgrt.c
36316+++ b/drivers/acpi/bgrt.c
36317@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36318 if (!bgrt_image)
36319 return -ENODEV;
36320
36321- bin_attr_image.private = bgrt_image;
36322- bin_attr_image.size = bgrt_image_size;
36323+ pax_open_kernel();
36324+ *(void **)&bin_attr_image.private = bgrt_image;
36325+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36326+ pax_close_kernel();
36327
36328 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36329 if (!bgrt_kobj)
36330diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36331index 1d17919..315e955 100644
36332--- a/drivers/acpi/blacklist.c
36333+++ b/drivers/acpi/blacklist.c
36334@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36335 u32 is_critical_error;
36336 };
36337
36338-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36339+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36340
36341 /*
36342 * POLICY: If *anything* doesn't work, put it on the blacklist.
36343@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36344 return 0;
36345 }
36346
36347-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36348+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36349 {
36350 .callback = dmi_disable_osi_vista,
36351 .ident = "Fujitsu Siemens",
36352diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36353index 513e7230e..802015a 100644
36354--- a/drivers/acpi/bus.c
36355+++ b/drivers/acpi/bus.c
36356@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36357 }
36358 #endif
36359
36360-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36361+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36362 /*
36363 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36364 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36365@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36366 {}
36367 };
36368 #else
36369-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36370+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36371 {}
36372 };
36373 #endif
36374diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36375index c68e724..e863008 100644
36376--- a/drivers/acpi/custom_method.c
36377+++ b/drivers/acpi/custom_method.c
36378@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36379 struct acpi_table_header table;
36380 acpi_status status;
36381
36382+#ifdef CONFIG_GRKERNSEC_KMEM
36383+ return -EPERM;
36384+#endif
36385+
36386 if (!(*ppos)) {
36387 /* parse the table header to get the table length */
36388 if (count <= sizeof(struct acpi_table_header))
36389diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36390index 8217e0b..3294cb6 100644
36391--- a/drivers/acpi/device_pm.c
36392+++ b/drivers/acpi/device_pm.c
36393@@ -1026,6 +1026,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36394
36395 #endif /* CONFIG_PM_SLEEP */
36396
36397+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36398+
36399 static struct dev_pm_domain acpi_general_pm_domain = {
36400 .ops = {
36401 .runtime_suspend = acpi_subsys_runtime_suspend,
36402@@ -1042,6 +1044,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36403 .restore_early = acpi_subsys_resume_early,
36404 #endif
36405 },
36406+ .detach = acpi_dev_pm_detach
36407 };
36408
36409 /**
36410@@ -1111,7 +1114,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36411 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36412 }
36413
36414- dev->pm_domain->detach = acpi_dev_pm_detach;
36415 return 0;
36416 }
36417 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36418diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36419index 5e8fed4..d9bb545 100644
36420--- a/drivers/acpi/ec.c
36421+++ b/drivers/acpi/ec.c
36422@@ -1293,7 +1293,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36423 return 0;
36424 }
36425
36426-static struct dmi_system_id ec_dmi_table[] __initdata = {
36427+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36428 {
36429 ec_skip_dsdt_scan, "Compal JFL92", {
36430 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36431diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36432index 139d9e4..9a9d799 100644
36433--- a/drivers/acpi/pci_slot.c
36434+++ b/drivers/acpi/pci_slot.c
36435@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36436 return 0;
36437 }
36438
36439-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36440+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36441 /*
36442 * Fujitsu Primequest machines will return 1023 to indicate an
36443 * error if the _SUN method is evaluated on SxFy objects that
36444diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36445index d9f7158..168e742 100644
36446--- a/drivers/acpi/processor_driver.c
36447+++ b/drivers/acpi/processor_driver.c
36448@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36449 return NOTIFY_OK;
36450 }
36451
36452-static struct notifier_block __refdata acpi_cpu_notifier = {
36453+static struct notifier_block __refconst acpi_cpu_notifier = {
36454 .notifier_call = acpi_cpu_soft_notify,
36455 };
36456
36457diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36458index 39e0c8e..b5ae20c 100644
36459--- a/drivers/acpi/processor_idle.c
36460+++ b/drivers/acpi/processor_idle.c
36461@@ -910,7 +910,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36462 {
36463 int i, count = CPUIDLE_DRIVER_STATE_START;
36464 struct acpi_processor_cx *cx;
36465- struct cpuidle_state *state;
36466+ cpuidle_state_no_const *state;
36467 struct cpuidle_driver *drv = &acpi_idle_driver;
36468
36469 if (!pr->flags.power_setup_done)
36470diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36471index e5dd808..1eceed1 100644
36472--- a/drivers/acpi/processor_pdc.c
36473+++ b/drivers/acpi/processor_pdc.c
36474@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36475 return 0;
36476 }
36477
36478-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36479+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36480 {
36481 set_no_mwait, "Extensa 5220", {
36482 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36483diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36484index 2f0d4db..b9e9b15 100644
36485--- a/drivers/acpi/sleep.c
36486+++ b/drivers/acpi/sleep.c
36487@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36488 return 0;
36489 }
36490
36491-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36492+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36493 {
36494 .callback = init_old_suspend_ordering,
36495 .ident = "Abit KN9 (nForce4 variant)",
36496diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36497index 0876d77b..3ba0127 100644
36498--- a/drivers/acpi/sysfs.c
36499+++ b/drivers/acpi/sysfs.c
36500@@ -423,11 +423,11 @@ static u32 num_counters;
36501 static struct attribute **all_attrs;
36502 static u32 acpi_gpe_count;
36503
36504-static struct attribute_group interrupt_stats_attr_group = {
36505+static attribute_group_no_const interrupt_stats_attr_group = {
36506 .name = "interrupts",
36507 };
36508
36509-static struct kobj_attribute *counter_attrs;
36510+static kobj_attribute_no_const *counter_attrs;
36511
36512 static void delete_gpe_attr_array(void)
36513 {
36514diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36515index d24fa19..782f1e6 100644
36516--- a/drivers/acpi/thermal.c
36517+++ b/drivers/acpi/thermal.c
36518@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36519 return 0;
36520 }
36521
36522-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36523+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36524 /*
36525 * Award BIOS on this AOpen makes thermal control almost worthless.
36526 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36527diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36528index cc79d3f..28adb33 100644
36529--- a/drivers/acpi/video.c
36530+++ b/drivers/acpi/video.c
36531@@ -431,7 +431,7 @@ static int __init video_enable_native_backlight(const struct dmi_system_id *d)
36532 return 0;
36533 }
36534
36535-static struct dmi_system_id video_dmi_table[] __initdata = {
36536+static const struct dmi_system_id video_dmi_table[] __initconst = {
36537 /*
36538 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36539 */
36540diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36541index 287c4ba..6a600bc 100644
36542--- a/drivers/ata/libahci.c
36543+++ b/drivers/ata/libahci.c
36544@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36545 }
36546 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36547
36548-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36549+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36550 struct ata_taskfile *tf, int is_cmd, u16 flags,
36551 unsigned long timeout_msec)
36552 {
36553diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36554index e0064d1..e53c75e 100644
36555--- a/drivers/ata/libata-core.c
36556+++ b/drivers/ata/libata-core.c
36557@@ -102,7 +102,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36558 static void ata_dev_xfermask(struct ata_device *dev);
36559 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36560
36561-atomic_t ata_print_id = ATOMIC_INIT(0);
36562+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36563
36564 struct ata_force_param {
36565 const char *name;
36566@@ -4800,7 +4800,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36567 struct ata_port *ap;
36568 unsigned int tag;
36569
36570- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36571+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36572 ap = qc->ap;
36573
36574 qc->flags = 0;
36575@@ -4817,7 +4817,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36576 struct ata_port *ap;
36577 struct ata_link *link;
36578
36579- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36580+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36581 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36582 ap = qc->ap;
36583 link = qc->dev->link;
36584@@ -5924,6 +5924,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36585 return;
36586
36587 spin_lock(&lock);
36588+ pax_open_kernel();
36589
36590 for (cur = ops->inherits; cur; cur = cur->inherits) {
36591 void **inherit = (void **)cur;
36592@@ -5937,8 +5938,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36593 if (IS_ERR(*pp))
36594 *pp = NULL;
36595
36596- ops->inherits = NULL;
36597+ *(struct ata_port_operations **)&ops->inherits = NULL;
36598
36599+ pax_close_kernel();
36600 spin_unlock(&lock);
36601 }
36602
36603@@ -6134,7 +6136,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36604
36605 /* give ports names and add SCSI hosts */
36606 for (i = 0; i < host->n_ports; i++) {
36607- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36608+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36609 host->ports[i]->local_port_no = i + 1;
36610 }
36611
36612diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36613index 0d7f0da..bc20aa6 100644
36614--- a/drivers/ata/libata-scsi.c
36615+++ b/drivers/ata/libata-scsi.c
36616@@ -4193,7 +4193,7 @@ int ata_sas_port_init(struct ata_port *ap)
36617
36618 if (rc)
36619 return rc;
36620- ap->print_id = atomic_inc_return(&ata_print_id);
36621+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36622 return 0;
36623 }
36624 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36625diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36626index f840ca1..edd6ef3 100644
36627--- a/drivers/ata/libata.h
36628+++ b/drivers/ata/libata.h
36629@@ -53,7 +53,7 @@ enum {
36630 ATA_DNXFER_QUIET = (1 << 31),
36631 };
36632
36633-extern atomic_t ata_print_id;
36634+extern atomic_unchecked_t ata_print_id;
36635 extern int atapi_passthru16;
36636 extern int libata_fua;
36637 extern int libata_noacpi;
36638diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36639index a9b0c82..207d97d 100644
36640--- a/drivers/ata/pata_arasan_cf.c
36641+++ b/drivers/ata/pata_arasan_cf.c
36642@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36643 /* Handle platform specific quirks */
36644 if (quirk) {
36645 if (quirk & CF_BROKEN_PIO) {
36646- ap->ops->set_piomode = NULL;
36647+ pax_open_kernel();
36648+ *(void **)&ap->ops->set_piomode = NULL;
36649+ pax_close_kernel();
36650 ap->pio_mask = 0;
36651 }
36652 if (quirk & CF_BROKEN_MWDMA)
36653diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36654index f9b983a..887b9d8 100644
36655--- a/drivers/atm/adummy.c
36656+++ b/drivers/atm/adummy.c
36657@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36658 vcc->pop(vcc, skb);
36659 else
36660 dev_kfree_skb_any(skb);
36661- atomic_inc(&vcc->stats->tx);
36662+ atomic_inc_unchecked(&vcc->stats->tx);
36663
36664 return 0;
36665 }
36666diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36667index f1a9198..f466a4a 100644
36668--- a/drivers/atm/ambassador.c
36669+++ b/drivers/atm/ambassador.c
36670@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36671 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36672
36673 // VC layer stats
36674- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36675+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36676
36677 // free the descriptor
36678 kfree (tx_descr);
36679@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36680 dump_skb ("<<<", vc, skb);
36681
36682 // VC layer stats
36683- atomic_inc(&atm_vcc->stats->rx);
36684+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36685 __net_timestamp(skb);
36686 // end of our responsibility
36687 atm_vcc->push (atm_vcc, skb);
36688@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36689 } else {
36690 PRINTK (KERN_INFO, "dropped over-size frame");
36691 // should we count this?
36692- atomic_inc(&atm_vcc->stats->rx_drop);
36693+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36694 }
36695
36696 } else {
36697@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36698 }
36699
36700 if (check_area (skb->data, skb->len)) {
36701- atomic_inc(&atm_vcc->stats->tx_err);
36702+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36703 return -ENOMEM; // ?
36704 }
36705
36706diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36707index 480fa6f..947067c 100644
36708--- a/drivers/atm/atmtcp.c
36709+++ b/drivers/atm/atmtcp.c
36710@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36711 if (vcc->pop) vcc->pop(vcc,skb);
36712 else dev_kfree_skb(skb);
36713 if (dev_data) return 0;
36714- atomic_inc(&vcc->stats->tx_err);
36715+ atomic_inc_unchecked(&vcc->stats->tx_err);
36716 return -ENOLINK;
36717 }
36718 size = skb->len+sizeof(struct atmtcp_hdr);
36719@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36720 if (!new_skb) {
36721 if (vcc->pop) vcc->pop(vcc,skb);
36722 else dev_kfree_skb(skb);
36723- atomic_inc(&vcc->stats->tx_err);
36724+ atomic_inc_unchecked(&vcc->stats->tx_err);
36725 return -ENOBUFS;
36726 }
36727 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36728@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36729 if (vcc->pop) vcc->pop(vcc,skb);
36730 else dev_kfree_skb(skb);
36731 out_vcc->push(out_vcc,new_skb);
36732- atomic_inc(&vcc->stats->tx);
36733- atomic_inc(&out_vcc->stats->rx);
36734+ atomic_inc_unchecked(&vcc->stats->tx);
36735+ atomic_inc_unchecked(&out_vcc->stats->rx);
36736 return 0;
36737 }
36738
36739@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36740 read_unlock(&vcc_sklist_lock);
36741 if (!out_vcc) {
36742 result = -EUNATCH;
36743- atomic_inc(&vcc->stats->tx_err);
36744+ atomic_inc_unchecked(&vcc->stats->tx_err);
36745 goto done;
36746 }
36747 skb_pull(skb,sizeof(struct atmtcp_hdr));
36748@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36749 __net_timestamp(new_skb);
36750 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36751 out_vcc->push(out_vcc,new_skb);
36752- atomic_inc(&vcc->stats->tx);
36753- atomic_inc(&out_vcc->stats->rx);
36754+ atomic_inc_unchecked(&vcc->stats->tx);
36755+ atomic_inc_unchecked(&out_vcc->stats->rx);
36756 done:
36757 if (vcc->pop) vcc->pop(vcc,skb);
36758 else dev_kfree_skb(skb);
36759diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36760index 6339efd..2b441d5 100644
36761--- a/drivers/atm/eni.c
36762+++ b/drivers/atm/eni.c
36763@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36764 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36765 vcc->dev->number);
36766 length = 0;
36767- atomic_inc(&vcc->stats->rx_err);
36768+ atomic_inc_unchecked(&vcc->stats->rx_err);
36769 }
36770 else {
36771 length = ATM_CELL_SIZE-1; /* no HEC */
36772@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36773 size);
36774 }
36775 eff = length = 0;
36776- atomic_inc(&vcc->stats->rx_err);
36777+ atomic_inc_unchecked(&vcc->stats->rx_err);
36778 }
36779 else {
36780 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36781@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36782 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36783 vcc->dev->number,vcc->vci,length,size << 2,descr);
36784 length = eff = 0;
36785- atomic_inc(&vcc->stats->rx_err);
36786+ atomic_inc_unchecked(&vcc->stats->rx_err);
36787 }
36788 }
36789 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36790@@ -770,7 +770,7 @@ rx_dequeued++;
36791 vcc->push(vcc,skb);
36792 pushed++;
36793 }
36794- atomic_inc(&vcc->stats->rx);
36795+ atomic_inc_unchecked(&vcc->stats->rx);
36796 }
36797 wake_up(&eni_dev->rx_wait);
36798 }
36799@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
36800 DMA_TO_DEVICE);
36801 if (vcc->pop) vcc->pop(vcc,skb);
36802 else dev_kfree_skb_irq(skb);
36803- atomic_inc(&vcc->stats->tx);
36804+ atomic_inc_unchecked(&vcc->stats->tx);
36805 wake_up(&eni_dev->tx_wait);
36806 dma_complete++;
36807 }
36808diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36809index 82f2ae0..f205c02 100644
36810--- a/drivers/atm/firestream.c
36811+++ b/drivers/atm/firestream.c
36812@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36813 }
36814 }
36815
36816- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36817+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36818
36819 fs_dprintk (FS_DEBUG_TXMEM, "i");
36820 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36821@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36822 #endif
36823 skb_put (skb, qe->p1 & 0xffff);
36824 ATM_SKB(skb)->vcc = atm_vcc;
36825- atomic_inc(&atm_vcc->stats->rx);
36826+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36827 __net_timestamp(skb);
36828 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36829 atm_vcc->push (atm_vcc, skb);
36830@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36831 kfree (pe);
36832 }
36833 if (atm_vcc)
36834- atomic_inc(&atm_vcc->stats->rx_drop);
36835+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36836 break;
36837 case 0x1f: /* Reassembly abort: no buffers. */
36838 /* Silently increment error counter. */
36839 if (atm_vcc)
36840- atomic_inc(&atm_vcc->stats->rx_drop);
36841+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36842 break;
36843 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36844 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36845diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36846index 75dde90..4309ead 100644
36847--- a/drivers/atm/fore200e.c
36848+++ b/drivers/atm/fore200e.c
36849@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36850 #endif
36851 /* check error condition */
36852 if (*entry->status & STATUS_ERROR)
36853- atomic_inc(&vcc->stats->tx_err);
36854+ atomic_inc_unchecked(&vcc->stats->tx_err);
36855 else
36856- atomic_inc(&vcc->stats->tx);
36857+ atomic_inc_unchecked(&vcc->stats->tx);
36858 }
36859 }
36860
36861@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36862 if (skb == NULL) {
36863 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36864
36865- atomic_inc(&vcc->stats->rx_drop);
36866+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36867 return -ENOMEM;
36868 }
36869
36870@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36871
36872 dev_kfree_skb_any(skb);
36873
36874- atomic_inc(&vcc->stats->rx_drop);
36875+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36876 return -ENOMEM;
36877 }
36878
36879 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36880
36881 vcc->push(vcc, skb);
36882- atomic_inc(&vcc->stats->rx);
36883+ atomic_inc_unchecked(&vcc->stats->rx);
36884
36885 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36886
36887@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36888 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36889 fore200e->atm_dev->number,
36890 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36891- atomic_inc(&vcc->stats->rx_err);
36892+ atomic_inc_unchecked(&vcc->stats->rx_err);
36893 }
36894 }
36895
36896@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36897 goto retry_here;
36898 }
36899
36900- atomic_inc(&vcc->stats->tx_err);
36901+ atomic_inc_unchecked(&vcc->stats->tx_err);
36902
36903 fore200e->tx_sat++;
36904 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36905diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36906index 93dca2e..c5daa69 100644
36907--- a/drivers/atm/he.c
36908+++ b/drivers/atm/he.c
36909@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36910
36911 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36912 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36913- atomic_inc(&vcc->stats->rx_drop);
36914+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36915 goto return_host_buffers;
36916 }
36917
36918@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36919 RBRQ_LEN_ERR(he_dev->rbrq_head)
36920 ? "LEN_ERR" : "",
36921 vcc->vpi, vcc->vci);
36922- atomic_inc(&vcc->stats->rx_err);
36923+ atomic_inc_unchecked(&vcc->stats->rx_err);
36924 goto return_host_buffers;
36925 }
36926
36927@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36928 vcc->push(vcc, skb);
36929 spin_lock(&he_dev->global_lock);
36930
36931- atomic_inc(&vcc->stats->rx);
36932+ atomic_inc_unchecked(&vcc->stats->rx);
36933
36934 return_host_buffers:
36935 ++pdus_assembled;
36936@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36937 tpd->vcc->pop(tpd->vcc, tpd->skb);
36938 else
36939 dev_kfree_skb_any(tpd->skb);
36940- atomic_inc(&tpd->vcc->stats->tx_err);
36941+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36942 }
36943 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36944 return;
36945@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36946 vcc->pop(vcc, skb);
36947 else
36948 dev_kfree_skb_any(skb);
36949- atomic_inc(&vcc->stats->tx_err);
36950+ atomic_inc_unchecked(&vcc->stats->tx_err);
36951 return -EINVAL;
36952 }
36953
36954@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36955 vcc->pop(vcc, skb);
36956 else
36957 dev_kfree_skb_any(skb);
36958- atomic_inc(&vcc->stats->tx_err);
36959+ atomic_inc_unchecked(&vcc->stats->tx_err);
36960 return -EINVAL;
36961 }
36962 #endif
36963@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36964 vcc->pop(vcc, skb);
36965 else
36966 dev_kfree_skb_any(skb);
36967- atomic_inc(&vcc->stats->tx_err);
36968+ atomic_inc_unchecked(&vcc->stats->tx_err);
36969 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36970 return -ENOMEM;
36971 }
36972@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36973 vcc->pop(vcc, skb);
36974 else
36975 dev_kfree_skb_any(skb);
36976- atomic_inc(&vcc->stats->tx_err);
36977+ atomic_inc_unchecked(&vcc->stats->tx_err);
36978 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36979 return -ENOMEM;
36980 }
36981@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36982 __enqueue_tpd(he_dev, tpd, cid);
36983 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36984
36985- atomic_inc(&vcc->stats->tx);
36986+ atomic_inc_unchecked(&vcc->stats->tx);
36987
36988 return 0;
36989 }
36990diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36991index 527bbd5..96570c8 100644
36992--- a/drivers/atm/horizon.c
36993+++ b/drivers/atm/horizon.c
36994@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36995 {
36996 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36997 // VC layer stats
36998- atomic_inc(&vcc->stats->rx);
36999+ atomic_inc_unchecked(&vcc->stats->rx);
37000 __net_timestamp(skb);
37001 // end of our responsibility
37002 vcc->push (vcc, skb);
37003@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37004 dev->tx_iovec = NULL;
37005
37006 // VC layer stats
37007- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37008+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37009
37010 // free the skb
37011 hrz_kfree_skb (skb);
37012diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37013index 074616b..d6b3d5f 100644
37014--- a/drivers/atm/idt77252.c
37015+++ b/drivers/atm/idt77252.c
37016@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37017 else
37018 dev_kfree_skb(skb);
37019
37020- atomic_inc(&vcc->stats->tx);
37021+ atomic_inc_unchecked(&vcc->stats->tx);
37022 }
37023
37024 atomic_dec(&scq->used);
37025@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37026 if ((sb = dev_alloc_skb(64)) == NULL) {
37027 printk("%s: Can't allocate buffers for aal0.\n",
37028 card->name);
37029- atomic_add(i, &vcc->stats->rx_drop);
37030+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37031 break;
37032 }
37033 if (!atm_charge(vcc, sb->truesize)) {
37034 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37035 card->name);
37036- atomic_add(i - 1, &vcc->stats->rx_drop);
37037+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37038 dev_kfree_skb(sb);
37039 break;
37040 }
37041@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37042 ATM_SKB(sb)->vcc = vcc;
37043 __net_timestamp(sb);
37044 vcc->push(vcc, sb);
37045- atomic_inc(&vcc->stats->rx);
37046+ atomic_inc_unchecked(&vcc->stats->rx);
37047
37048 cell += ATM_CELL_PAYLOAD;
37049 }
37050@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37051 "(CDC: %08x)\n",
37052 card->name, len, rpp->len, readl(SAR_REG_CDC));
37053 recycle_rx_pool_skb(card, rpp);
37054- atomic_inc(&vcc->stats->rx_err);
37055+ atomic_inc_unchecked(&vcc->stats->rx_err);
37056 return;
37057 }
37058 if (stat & SAR_RSQE_CRC) {
37059 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37060 recycle_rx_pool_skb(card, rpp);
37061- atomic_inc(&vcc->stats->rx_err);
37062+ atomic_inc_unchecked(&vcc->stats->rx_err);
37063 return;
37064 }
37065 if (skb_queue_len(&rpp->queue) > 1) {
37066@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37067 RXPRINTK("%s: Can't alloc RX skb.\n",
37068 card->name);
37069 recycle_rx_pool_skb(card, rpp);
37070- atomic_inc(&vcc->stats->rx_err);
37071+ atomic_inc_unchecked(&vcc->stats->rx_err);
37072 return;
37073 }
37074 if (!atm_charge(vcc, skb->truesize)) {
37075@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37076 __net_timestamp(skb);
37077
37078 vcc->push(vcc, skb);
37079- atomic_inc(&vcc->stats->rx);
37080+ atomic_inc_unchecked(&vcc->stats->rx);
37081
37082 return;
37083 }
37084@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37085 __net_timestamp(skb);
37086
37087 vcc->push(vcc, skb);
37088- atomic_inc(&vcc->stats->rx);
37089+ atomic_inc_unchecked(&vcc->stats->rx);
37090
37091 if (skb->truesize > SAR_FB_SIZE_3)
37092 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37093@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37094 if (vcc->qos.aal != ATM_AAL0) {
37095 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37096 card->name, vpi, vci);
37097- atomic_inc(&vcc->stats->rx_drop);
37098+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37099 goto drop;
37100 }
37101
37102 if ((sb = dev_alloc_skb(64)) == NULL) {
37103 printk("%s: Can't allocate buffers for AAL0.\n",
37104 card->name);
37105- atomic_inc(&vcc->stats->rx_err);
37106+ atomic_inc_unchecked(&vcc->stats->rx_err);
37107 goto drop;
37108 }
37109
37110@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37111 ATM_SKB(sb)->vcc = vcc;
37112 __net_timestamp(sb);
37113 vcc->push(vcc, sb);
37114- atomic_inc(&vcc->stats->rx);
37115+ atomic_inc_unchecked(&vcc->stats->rx);
37116
37117 drop:
37118 skb_pull(queue, 64);
37119@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37120
37121 if (vc == NULL) {
37122 printk("%s: NULL connection in send().\n", card->name);
37123- atomic_inc(&vcc->stats->tx_err);
37124+ atomic_inc_unchecked(&vcc->stats->tx_err);
37125 dev_kfree_skb(skb);
37126 return -EINVAL;
37127 }
37128 if (!test_bit(VCF_TX, &vc->flags)) {
37129 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37130- atomic_inc(&vcc->stats->tx_err);
37131+ atomic_inc_unchecked(&vcc->stats->tx_err);
37132 dev_kfree_skb(skb);
37133 return -EINVAL;
37134 }
37135@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37136 break;
37137 default:
37138 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37139- atomic_inc(&vcc->stats->tx_err);
37140+ atomic_inc_unchecked(&vcc->stats->tx_err);
37141 dev_kfree_skb(skb);
37142 return -EINVAL;
37143 }
37144
37145 if (skb_shinfo(skb)->nr_frags != 0) {
37146 printk("%s: No scatter-gather yet.\n", card->name);
37147- atomic_inc(&vcc->stats->tx_err);
37148+ atomic_inc_unchecked(&vcc->stats->tx_err);
37149 dev_kfree_skb(skb);
37150 return -EINVAL;
37151 }
37152@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37153
37154 err = queue_skb(card, vc, skb, oam);
37155 if (err) {
37156- atomic_inc(&vcc->stats->tx_err);
37157+ atomic_inc_unchecked(&vcc->stats->tx_err);
37158 dev_kfree_skb(skb);
37159 return err;
37160 }
37161@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37162 skb = dev_alloc_skb(64);
37163 if (!skb) {
37164 printk("%s: Out of memory in send_oam().\n", card->name);
37165- atomic_inc(&vcc->stats->tx_err);
37166+ atomic_inc_unchecked(&vcc->stats->tx_err);
37167 return -ENOMEM;
37168 }
37169 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37170diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37171index 924f8e2..3375a3e 100644
37172--- a/drivers/atm/iphase.c
37173+++ b/drivers/atm/iphase.c
37174@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37175 status = (u_short) (buf_desc_ptr->desc_mode);
37176 if (status & (RX_CER | RX_PTE | RX_OFL))
37177 {
37178- atomic_inc(&vcc->stats->rx_err);
37179+ atomic_inc_unchecked(&vcc->stats->rx_err);
37180 IF_ERR(printk("IA: bad packet, dropping it");)
37181 if (status & RX_CER) {
37182 IF_ERR(printk(" cause: packet CRC error\n");)
37183@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37184 len = dma_addr - buf_addr;
37185 if (len > iadev->rx_buf_sz) {
37186 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37187- atomic_inc(&vcc->stats->rx_err);
37188+ atomic_inc_unchecked(&vcc->stats->rx_err);
37189 goto out_free_desc;
37190 }
37191
37192@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37193 ia_vcc = INPH_IA_VCC(vcc);
37194 if (ia_vcc == NULL)
37195 {
37196- atomic_inc(&vcc->stats->rx_err);
37197+ atomic_inc_unchecked(&vcc->stats->rx_err);
37198 atm_return(vcc, skb->truesize);
37199 dev_kfree_skb_any(skb);
37200 goto INCR_DLE;
37201@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37202 if ((length > iadev->rx_buf_sz) || (length >
37203 (skb->len - sizeof(struct cpcs_trailer))))
37204 {
37205- atomic_inc(&vcc->stats->rx_err);
37206+ atomic_inc_unchecked(&vcc->stats->rx_err);
37207 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37208 length, skb->len);)
37209 atm_return(vcc, skb->truesize);
37210@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37211
37212 IF_RX(printk("rx_dle_intr: skb push");)
37213 vcc->push(vcc,skb);
37214- atomic_inc(&vcc->stats->rx);
37215+ atomic_inc_unchecked(&vcc->stats->rx);
37216 iadev->rx_pkt_cnt++;
37217 }
37218 INCR_DLE:
37219@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37220 {
37221 struct k_sonet_stats *stats;
37222 stats = &PRIV(_ia_dev[board])->sonet_stats;
37223- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37224- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37225- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37226- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37227- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37228- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37229- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37230- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37231- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37232+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37233+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37234+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37235+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37236+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37237+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37238+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37239+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37240+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37241 }
37242 ia_cmds.status = 0;
37243 break;
37244@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37245 if ((desc == 0) || (desc > iadev->num_tx_desc))
37246 {
37247 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37248- atomic_inc(&vcc->stats->tx);
37249+ atomic_inc_unchecked(&vcc->stats->tx);
37250 if (vcc->pop)
37251 vcc->pop(vcc, skb);
37252 else
37253@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37254 ATM_DESC(skb) = vcc->vci;
37255 skb_queue_tail(&iadev->tx_dma_q, skb);
37256
37257- atomic_inc(&vcc->stats->tx);
37258+ atomic_inc_unchecked(&vcc->stats->tx);
37259 iadev->tx_pkt_cnt++;
37260 /* Increment transaction counter */
37261 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37262
37263 #if 0
37264 /* add flow control logic */
37265- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37266+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37267 if (iavcc->vc_desc_cnt > 10) {
37268 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37269 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37270diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37271index ce43ae3..969de38 100644
37272--- a/drivers/atm/lanai.c
37273+++ b/drivers/atm/lanai.c
37274@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37275 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37276 lanai_endtx(lanai, lvcc);
37277 lanai_free_skb(lvcc->tx.atmvcc, skb);
37278- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37279+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37280 }
37281
37282 /* Try to fill the buffer - don't call unless there is backlog */
37283@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37284 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37285 __net_timestamp(skb);
37286 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37287- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37288+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37289 out:
37290 lvcc->rx.buf.ptr = end;
37291 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37292@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37293 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37294 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37295 lanai->stats.service_rxnotaal5++;
37296- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37297+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37298 return 0;
37299 }
37300 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37301@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37302 int bytes;
37303 read_unlock(&vcc_sklist_lock);
37304 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37305- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37306+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37307 lvcc->stats.x.aal5.service_trash++;
37308 bytes = (SERVICE_GET_END(s) * 16) -
37309 (((unsigned long) lvcc->rx.buf.ptr) -
37310@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37311 }
37312 if (s & SERVICE_STREAM) {
37313 read_unlock(&vcc_sklist_lock);
37314- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37315+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37316 lvcc->stats.x.aal5.service_stream++;
37317 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37318 "PDU on VCI %d!\n", lanai->number, vci);
37319@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37320 return 0;
37321 }
37322 DPRINTK("got rx crc error on vci %d\n", vci);
37323- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37324+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37325 lvcc->stats.x.aal5.service_rxcrc++;
37326 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37327 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37328diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37329index ddc4ceb..36e29aa 100644
37330--- a/drivers/atm/nicstar.c
37331+++ b/drivers/atm/nicstar.c
37332@@ -1632,7 +1632,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37333 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37334 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37335 card->index);
37336- atomic_inc(&vcc->stats->tx_err);
37337+ atomic_inc_unchecked(&vcc->stats->tx_err);
37338 dev_kfree_skb_any(skb);
37339 return -EINVAL;
37340 }
37341@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37342 if (!vc->tx) {
37343 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37344 card->index);
37345- atomic_inc(&vcc->stats->tx_err);
37346+ atomic_inc_unchecked(&vcc->stats->tx_err);
37347 dev_kfree_skb_any(skb);
37348 return -EINVAL;
37349 }
37350@@ -1648,14 +1648,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37351 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37352 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37353 card->index);
37354- atomic_inc(&vcc->stats->tx_err);
37355+ atomic_inc_unchecked(&vcc->stats->tx_err);
37356 dev_kfree_skb_any(skb);
37357 return -EINVAL;
37358 }
37359
37360 if (skb_shinfo(skb)->nr_frags != 0) {
37361 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37362- atomic_inc(&vcc->stats->tx_err);
37363+ atomic_inc_unchecked(&vcc->stats->tx_err);
37364 dev_kfree_skb_any(skb);
37365 return -EINVAL;
37366 }
37367@@ -1703,11 +1703,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37368 }
37369
37370 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37371- atomic_inc(&vcc->stats->tx_err);
37372+ atomic_inc_unchecked(&vcc->stats->tx_err);
37373 dev_kfree_skb_any(skb);
37374 return -EIO;
37375 }
37376- atomic_inc(&vcc->stats->tx);
37377+ atomic_inc_unchecked(&vcc->stats->tx);
37378
37379 return 0;
37380 }
37381@@ -2024,14 +2024,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37382 printk
37383 ("nicstar%d: Can't allocate buffers for aal0.\n",
37384 card->index);
37385- atomic_add(i, &vcc->stats->rx_drop);
37386+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37387 break;
37388 }
37389 if (!atm_charge(vcc, sb->truesize)) {
37390 RXPRINTK
37391 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37392 card->index);
37393- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37394+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37395 dev_kfree_skb_any(sb);
37396 break;
37397 }
37398@@ -2046,7 +2046,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37399 ATM_SKB(sb)->vcc = vcc;
37400 __net_timestamp(sb);
37401 vcc->push(vcc, sb);
37402- atomic_inc(&vcc->stats->rx);
37403+ atomic_inc_unchecked(&vcc->stats->rx);
37404 cell += ATM_CELL_PAYLOAD;
37405 }
37406
37407@@ -2063,7 +2063,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37408 if (iovb == NULL) {
37409 printk("nicstar%d: Out of iovec buffers.\n",
37410 card->index);
37411- atomic_inc(&vcc->stats->rx_drop);
37412+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37413 recycle_rx_buf(card, skb);
37414 return;
37415 }
37416@@ -2087,7 +2087,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37417 small or large buffer itself. */
37418 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37419 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37420- atomic_inc(&vcc->stats->rx_err);
37421+ atomic_inc_unchecked(&vcc->stats->rx_err);
37422 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37423 NS_MAX_IOVECS);
37424 NS_PRV_IOVCNT(iovb) = 0;
37425@@ -2107,7 +2107,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37426 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37427 card->index);
37428 which_list(card, skb);
37429- atomic_inc(&vcc->stats->rx_err);
37430+ atomic_inc_unchecked(&vcc->stats->rx_err);
37431 recycle_rx_buf(card, skb);
37432 vc->rx_iov = NULL;
37433 recycle_iov_buf(card, iovb);
37434@@ -2120,7 +2120,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37435 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37436 card->index);
37437 which_list(card, skb);
37438- atomic_inc(&vcc->stats->rx_err);
37439+ atomic_inc_unchecked(&vcc->stats->rx_err);
37440 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37441 NS_PRV_IOVCNT(iovb));
37442 vc->rx_iov = NULL;
37443@@ -2143,7 +2143,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37444 printk(" - PDU size mismatch.\n");
37445 else
37446 printk(".\n");
37447- atomic_inc(&vcc->stats->rx_err);
37448+ atomic_inc_unchecked(&vcc->stats->rx_err);
37449 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37450 NS_PRV_IOVCNT(iovb));
37451 vc->rx_iov = NULL;
37452@@ -2157,14 +2157,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37453 /* skb points to a small buffer */
37454 if (!atm_charge(vcc, skb->truesize)) {
37455 push_rxbufs(card, skb);
37456- atomic_inc(&vcc->stats->rx_drop);
37457+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37458 } else {
37459 skb_put(skb, len);
37460 dequeue_sm_buf(card, skb);
37461 ATM_SKB(skb)->vcc = vcc;
37462 __net_timestamp(skb);
37463 vcc->push(vcc, skb);
37464- atomic_inc(&vcc->stats->rx);
37465+ atomic_inc_unchecked(&vcc->stats->rx);
37466 }
37467 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37468 struct sk_buff *sb;
37469@@ -2175,14 +2175,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37470 if (len <= NS_SMBUFSIZE) {
37471 if (!atm_charge(vcc, sb->truesize)) {
37472 push_rxbufs(card, sb);
37473- atomic_inc(&vcc->stats->rx_drop);
37474+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37475 } else {
37476 skb_put(sb, len);
37477 dequeue_sm_buf(card, sb);
37478 ATM_SKB(sb)->vcc = vcc;
37479 __net_timestamp(sb);
37480 vcc->push(vcc, sb);
37481- atomic_inc(&vcc->stats->rx);
37482+ atomic_inc_unchecked(&vcc->stats->rx);
37483 }
37484
37485 push_rxbufs(card, skb);
37486@@ -2191,7 +2191,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37487
37488 if (!atm_charge(vcc, skb->truesize)) {
37489 push_rxbufs(card, skb);
37490- atomic_inc(&vcc->stats->rx_drop);
37491+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37492 } else {
37493 dequeue_lg_buf(card, skb);
37494 skb_push(skb, NS_SMBUFSIZE);
37495@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37496 ATM_SKB(skb)->vcc = vcc;
37497 __net_timestamp(skb);
37498 vcc->push(vcc, skb);
37499- atomic_inc(&vcc->stats->rx);
37500+ atomic_inc_unchecked(&vcc->stats->rx);
37501 }
37502
37503 push_rxbufs(card, sb);
37504@@ -2222,7 +2222,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37505 printk
37506 ("nicstar%d: Out of huge buffers.\n",
37507 card->index);
37508- atomic_inc(&vcc->stats->rx_drop);
37509+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37510 recycle_iovec_rx_bufs(card,
37511 (struct iovec *)
37512 iovb->data,
37513@@ -2273,7 +2273,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37514 card->hbpool.count++;
37515 } else
37516 dev_kfree_skb_any(hb);
37517- atomic_inc(&vcc->stats->rx_drop);
37518+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37519 } else {
37520 /* Copy the small buffer to the huge buffer */
37521 sb = (struct sk_buff *)iov->iov_base;
37522@@ -2307,7 +2307,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37523 ATM_SKB(hb)->vcc = vcc;
37524 __net_timestamp(hb);
37525 vcc->push(vcc, hb);
37526- atomic_inc(&vcc->stats->rx);
37527+ atomic_inc_unchecked(&vcc->stats->rx);
37528 }
37529 }
37530
37531diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37532index 74e18b0..f16afa0 100644
37533--- a/drivers/atm/solos-pci.c
37534+++ b/drivers/atm/solos-pci.c
37535@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37536 }
37537 atm_charge(vcc, skb->truesize);
37538 vcc->push(vcc, skb);
37539- atomic_inc(&vcc->stats->rx);
37540+ atomic_inc_unchecked(&vcc->stats->rx);
37541 break;
37542
37543 case PKT_STATUS:
37544@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37545 vcc = SKB_CB(oldskb)->vcc;
37546
37547 if (vcc) {
37548- atomic_inc(&vcc->stats->tx);
37549+ atomic_inc_unchecked(&vcc->stats->tx);
37550 solos_pop(vcc, oldskb);
37551 } else {
37552 dev_kfree_skb_irq(oldskb);
37553diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37554index 0215934..ce9f5b1 100644
37555--- a/drivers/atm/suni.c
37556+++ b/drivers/atm/suni.c
37557@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37558
37559
37560 #define ADD_LIMITED(s,v) \
37561- atomic_add((v),&stats->s); \
37562- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37563+ atomic_add_unchecked((v),&stats->s); \
37564+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37565
37566
37567 static void suni_hz(unsigned long from_timer)
37568diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37569index 5120a96..e2572bd 100644
37570--- a/drivers/atm/uPD98402.c
37571+++ b/drivers/atm/uPD98402.c
37572@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37573 struct sonet_stats tmp;
37574 int error = 0;
37575
37576- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37577+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37578 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37579 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37580 if (zero && !error) {
37581@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37582
37583
37584 #define ADD_LIMITED(s,v) \
37585- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37586- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37587- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37588+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37589+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37590+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37591
37592
37593 static void stat_event(struct atm_dev *dev)
37594@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37595 if (reason & uPD98402_INT_PFM) stat_event(dev);
37596 if (reason & uPD98402_INT_PCO) {
37597 (void) GET(PCOCR); /* clear interrupt cause */
37598- atomic_add(GET(HECCT),
37599+ atomic_add_unchecked(GET(HECCT),
37600 &PRIV(dev)->sonet_stats.uncorr_hcs);
37601 }
37602 if ((reason & uPD98402_INT_RFO) &&
37603@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37604 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37605 uPD98402_INT_LOS),PIMR); /* enable them */
37606 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37607- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37608- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37609- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37610+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37611+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37612+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37613 return 0;
37614 }
37615
37616diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37617index cecfb94..87009ec 100644
37618--- a/drivers/atm/zatm.c
37619+++ b/drivers/atm/zatm.c
37620@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37621 }
37622 if (!size) {
37623 dev_kfree_skb_irq(skb);
37624- if (vcc) atomic_inc(&vcc->stats->rx_err);
37625+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37626 continue;
37627 }
37628 if (!atm_charge(vcc,skb->truesize)) {
37629@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37630 skb->len = size;
37631 ATM_SKB(skb)->vcc = vcc;
37632 vcc->push(vcc,skb);
37633- atomic_inc(&vcc->stats->rx);
37634+ atomic_inc_unchecked(&vcc->stats->rx);
37635 }
37636 zout(pos & 0xffff,MTA(mbx));
37637 #if 0 /* probably a stupid idea */
37638@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37639 skb_queue_head(&zatm_vcc->backlog,skb);
37640 break;
37641 }
37642- atomic_inc(&vcc->stats->tx);
37643+ atomic_inc_unchecked(&vcc->stats->tx);
37644 wake_up(&zatm_vcc->tx_wait);
37645 }
37646
37647diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37648index 79bc203..fa3945b 100644
37649--- a/drivers/base/bus.c
37650+++ b/drivers/base/bus.c
37651@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37652 return -EINVAL;
37653
37654 mutex_lock(&subsys->p->mutex);
37655- list_add_tail(&sif->node, &subsys->p->interfaces);
37656+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37657 if (sif->add_dev) {
37658 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37659 while ((dev = subsys_dev_iter_next(&iter)))
37660@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37661 subsys = sif->subsys;
37662
37663 mutex_lock(&subsys->p->mutex);
37664- list_del_init(&sif->node);
37665+ pax_list_del_init((struct list_head *)&sif->node);
37666 if (sif->remove_dev) {
37667 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37668 while ((dev = subsys_dev_iter_next(&iter)))
37669diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37670index 68f0314..ca2a609 100644
37671--- a/drivers/base/devtmpfs.c
37672+++ b/drivers/base/devtmpfs.c
37673@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37674 if (!thread)
37675 return 0;
37676
37677- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37678+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37679 if (err)
37680 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37681 else
37682@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37683 *err = sys_unshare(CLONE_NEWNS);
37684 if (*err)
37685 goto out;
37686- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37687+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37688 if (*err)
37689 goto out;
37690- sys_chdir("/.."); /* will traverse into overmounted root */
37691- sys_chroot(".");
37692+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37693+ sys_chroot((char __force_user *)".");
37694 complete(&setup_done);
37695 while (1) {
37696 spin_lock(&req_lock);
37697diff --git a/drivers/base/node.c b/drivers/base/node.c
37698index a2aa65b..8831326 100644
37699--- a/drivers/base/node.c
37700+++ b/drivers/base/node.c
37701@@ -613,7 +613,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37702 struct node_attr {
37703 struct device_attribute attr;
37704 enum node_states state;
37705-};
37706+} __do_const;
37707
37708 static ssize_t show_node_state(struct device *dev,
37709 struct device_attribute *attr, char *buf)
37710diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37711index 2327613..211d7f5 100644
37712--- a/drivers/base/power/domain.c
37713+++ b/drivers/base/power/domain.c
37714@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37715 {
37716 struct cpuidle_driver *cpuidle_drv;
37717 struct gpd_cpuidle_data *cpuidle_data;
37718- struct cpuidle_state *idle_state;
37719+ cpuidle_state_no_const *idle_state;
37720 int ret = 0;
37721
37722 if (IS_ERR_OR_NULL(genpd) || state < 0)
37723@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37724 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37725 {
37726 struct gpd_cpuidle_data *cpuidle_data;
37727- struct cpuidle_state *idle_state;
37728+ cpuidle_state_no_const *idle_state;
37729 int ret = 0;
37730
37731 if (IS_ERR_OR_NULL(genpd))
37732@@ -2222,8 +2222,11 @@ int genpd_dev_pm_attach(struct device *dev)
37733 return ret;
37734 }
37735
37736- dev->pm_domain->detach = genpd_dev_pm_detach;
37737- dev->pm_domain->sync = genpd_dev_pm_sync;
37738+ pax_open_kernel();
37739+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37740+ *(void **)&dev->pm_domain->sync = genpd_dev_pm_sync;
37741+ pax_close_kernel();
37742+
37743 pm_genpd_poweron(pd);
37744
37745 return 0;
37746diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37747index d2be3f9..0a3167a 100644
37748--- a/drivers/base/power/sysfs.c
37749+++ b/drivers/base/power/sysfs.c
37750@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37751 return -EIO;
37752 }
37753 }
37754- return sprintf(buf, p);
37755+ return sprintf(buf, "%s", p);
37756 }
37757
37758 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37759diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37760index 7726200..a417da7 100644
37761--- a/drivers/base/power/wakeup.c
37762+++ b/drivers/base/power/wakeup.c
37763@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37764 * They need to be modified together atomically, so it's better to use one
37765 * atomic variable to hold them both.
37766 */
37767-static atomic_t combined_event_count = ATOMIC_INIT(0);
37768+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37769
37770 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37771 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37772
37773 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37774 {
37775- unsigned int comb = atomic_read(&combined_event_count);
37776+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37777
37778 *cnt = (comb >> IN_PROGRESS_BITS);
37779 *inpr = comb & MAX_IN_PROGRESS;
37780@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37781 ws->start_prevent_time = ws->last_time;
37782
37783 /* Increment the counter of events in progress. */
37784- cec = atomic_inc_return(&combined_event_count);
37785+ cec = atomic_inc_return_unchecked(&combined_event_count);
37786
37787 trace_wakeup_source_activate(ws->name, cec);
37788 }
37789@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37790 * Increment the counter of registered wakeup events and decrement the
37791 * couter of wakeup events in progress simultaneously.
37792 */
37793- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37794+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37795 trace_wakeup_source_deactivate(ws->name, cec);
37796
37797 split_counters(&cnt, &inpr);
37798diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37799index 8d98a32..61d3165 100644
37800--- a/drivers/base/syscore.c
37801+++ b/drivers/base/syscore.c
37802@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37803 void register_syscore_ops(struct syscore_ops *ops)
37804 {
37805 mutex_lock(&syscore_ops_lock);
37806- list_add_tail(&ops->node, &syscore_ops_list);
37807+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37808 mutex_unlock(&syscore_ops_lock);
37809 }
37810 EXPORT_SYMBOL_GPL(register_syscore_ops);
37811@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37812 void unregister_syscore_ops(struct syscore_ops *ops)
37813 {
37814 mutex_lock(&syscore_ops_lock);
37815- list_del(&ops->node);
37816+ pax_list_del((struct list_head *)&ops->node);
37817 mutex_unlock(&syscore_ops_lock);
37818 }
37819 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37820diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37821index ff20f19..018f1da 100644
37822--- a/drivers/block/cciss.c
37823+++ b/drivers/block/cciss.c
37824@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37825 while (!list_empty(&h->reqQ)) {
37826 c = list_entry(h->reqQ.next, CommandList_struct, list);
37827 /* can't do anything if fifo is full */
37828- if ((h->access.fifo_full(h))) {
37829+ if ((h->access->fifo_full(h))) {
37830 dev_warn(&h->pdev->dev, "fifo full\n");
37831 break;
37832 }
37833@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37834 h->Qdepth--;
37835
37836 /* Tell the controller execute command */
37837- h->access.submit_command(h, c);
37838+ h->access->submit_command(h, c);
37839
37840 /* Put job onto the completed Q */
37841 addQ(&h->cmpQ, c);
37842@@ -3444,17 +3444,17 @@ startio:
37843
37844 static inline unsigned long get_next_completion(ctlr_info_t *h)
37845 {
37846- return h->access.command_completed(h);
37847+ return h->access->command_completed(h);
37848 }
37849
37850 static inline int interrupt_pending(ctlr_info_t *h)
37851 {
37852- return h->access.intr_pending(h);
37853+ return h->access->intr_pending(h);
37854 }
37855
37856 static inline long interrupt_not_for_us(ctlr_info_t *h)
37857 {
37858- return ((h->access.intr_pending(h) == 0) ||
37859+ return ((h->access->intr_pending(h) == 0) ||
37860 (h->interrupts_enabled == 0));
37861 }
37862
37863@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37864 u32 a;
37865
37866 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37867- return h->access.command_completed(h);
37868+ return h->access->command_completed(h);
37869
37870 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37871 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37872@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37873 trans_support & CFGTBL_Trans_use_short_tags);
37874
37875 /* Change the access methods to the performant access methods */
37876- h->access = SA5_performant_access;
37877+ h->access = &SA5_performant_access;
37878 h->transMethod = CFGTBL_Trans_Performant;
37879
37880 return;
37881@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37882 if (prod_index < 0)
37883 return -ENODEV;
37884 h->product_name = products[prod_index].product_name;
37885- h->access = *(products[prod_index].access);
37886+ h->access = products[prod_index].access;
37887
37888 if (cciss_board_disabled(h)) {
37889 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37890@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37891 }
37892
37893 /* make sure the board interrupts are off */
37894- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37895+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37896 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37897 if (rc)
37898 goto clean2;
37899@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37900 * fake ones to scoop up any residual completions.
37901 */
37902 spin_lock_irqsave(&h->lock, flags);
37903- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37904+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37905 spin_unlock_irqrestore(&h->lock, flags);
37906 free_irq(h->intr[h->intr_mode], h);
37907 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37908@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37909 dev_info(&h->pdev->dev, "Board READY.\n");
37910 dev_info(&h->pdev->dev,
37911 "Waiting for stale completions to drain.\n");
37912- h->access.set_intr_mask(h, CCISS_INTR_ON);
37913+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37914 msleep(10000);
37915- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37916+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37917
37918 rc = controller_reset_failed(h->cfgtable);
37919 if (rc)
37920@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37921 cciss_scsi_setup(h);
37922
37923 /* Turn the interrupts on so we can service requests */
37924- h->access.set_intr_mask(h, CCISS_INTR_ON);
37925+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37926
37927 /* Get the firmware version */
37928 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37929@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37930 kfree(flush_buf);
37931 if (return_code != IO_OK)
37932 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37933- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37934+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37935 free_irq(h->intr[h->intr_mode], h);
37936 }
37937
37938diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37939index 7fda30e..2f27946 100644
37940--- a/drivers/block/cciss.h
37941+++ b/drivers/block/cciss.h
37942@@ -101,7 +101,7 @@ struct ctlr_info
37943 /* information about each logical volume */
37944 drive_info_struct *drv[CISS_MAX_LUN];
37945
37946- struct access_method access;
37947+ struct access_method *access;
37948
37949 /* queue and queue Info */
37950 struct list_head reqQ;
37951@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37952 }
37953
37954 static struct access_method SA5_access = {
37955- SA5_submit_command,
37956- SA5_intr_mask,
37957- SA5_fifo_full,
37958- SA5_intr_pending,
37959- SA5_completed,
37960+ .submit_command = SA5_submit_command,
37961+ .set_intr_mask = SA5_intr_mask,
37962+ .fifo_full = SA5_fifo_full,
37963+ .intr_pending = SA5_intr_pending,
37964+ .command_completed = SA5_completed,
37965 };
37966
37967 static struct access_method SA5B_access = {
37968- SA5_submit_command,
37969- SA5B_intr_mask,
37970- SA5_fifo_full,
37971- SA5B_intr_pending,
37972- SA5_completed,
37973+ .submit_command = SA5_submit_command,
37974+ .set_intr_mask = SA5B_intr_mask,
37975+ .fifo_full = SA5_fifo_full,
37976+ .intr_pending = SA5B_intr_pending,
37977+ .command_completed = SA5_completed,
37978 };
37979
37980 static struct access_method SA5_performant_access = {
37981- SA5_submit_command,
37982- SA5_performant_intr_mask,
37983- SA5_fifo_full,
37984- SA5_performant_intr_pending,
37985- SA5_performant_completed,
37986+ .submit_command = SA5_submit_command,
37987+ .set_intr_mask = SA5_performant_intr_mask,
37988+ .fifo_full = SA5_fifo_full,
37989+ .intr_pending = SA5_performant_intr_pending,
37990+ .command_completed = SA5_performant_completed,
37991 };
37992
37993 struct board_type {
37994diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37995index f749df9..5f8b9c4 100644
37996--- a/drivers/block/cpqarray.c
37997+++ b/drivers/block/cpqarray.c
37998@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37999 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38000 goto Enomem4;
38001 }
38002- hba[i]->access.set_intr_mask(hba[i], 0);
38003+ hba[i]->access->set_intr_mask(hba[i], 0);
38004 if (request_irq(hba[i]->intr, do_ida_intr, IRQF_SHARED,
38005 hba[i]->devname, hba[i]))
38006 {
38007@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38008 add_timer(&hba[i]->timer);
38009
38010 /* Enable IRQ now that spinlock and rate limit timer are set up */
38011- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38012+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38013
38014 for(j=0; j<NWD; j++) {
38015 struct gendisk *disk = ida_gendisk[i][j];
38016@@ -694,7 +694,7 @@ DBGINFO(
38017 for(i=0; i<NR_PRODUCTS; i++) {
38018 if (board_id == products[i].board_id) {
38019 c->product_name = products[i].product_name;
38020- c->access = *(products[i].access);
38021+ c->access = products[i].access;
38022 break;
38023 }
38024 }
38025@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38026 hba[ctlr]->intr = intr;
38027 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38028 hba[ctlr]->product_name = products[j].product_name;
38029- hba[ctlr]->access = *(products[j].access);
38030+ hba[ctlr]->access = products[j].access;
38031 hba[ctlr]->ctlr = ctlr;
38032 hba[ctlr]->board_id = board_id;
38033 hba[ctlr]->pci_dev = NULL; /* not PCI */
38034@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38035
38036 while((c = h->reqQ) != NULL) {
38037 /* Can't do anything if we're busy */
38038- if (h->access.fifo_full(h) == 0)
38039+ if (h->access->fifo_full(h) == 0)
38040 return;
38041
38042 /* Get the first entry from the request Q */
38043@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38044 h->Qdepth--;
38045
38046 /* Tell the controller to do our bidding */
38047- h->access.submit_command(h, c);
38048+ h->access->submit_command(h, c);
38049
38050 /* Get onto the completion Q */
38051 addQ(&h->cmpQ, c);
38052@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38053 unsigned long flags;
38054 __u32 a,a1;
38055
38056- istat = h->access.intr_pending(h);
38057+ istat = h->access->intr_pending(h);
38058 /* Is this interrupt for us? */
38059 if (istat == 0)
38060 return IRQ_NONE;
38061@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38062 */
38063 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38064 if (istat & FIFO_NOT_EMPTY) {
38065- while((a = h->access.command_completed(h))) {
38066+ while((a = h->access->command_completed(h))) {
38067 a1 = a; a &= ~3;
38068 if ((c = h->cmpQ) == NULL)
38069 {
38070@@ -1448,11 +1448,11 @@ static int sendcmd(
38071 /*
38072 * Disable interrupt
38073 */
38074- info_p->access.set_intr_mask(info_p, 0);
38075+ info_p->access->set_intr_mask(info_p, 0);
38076 /* Make sure there is room in the command FIFO */
38077 /* Actually it should be completely empty at this time. */
38078 for (i = 200000; i > 0; i--) {
38079- temp = info_p->access.fifo_full(info_p);
38080+ temp = info_p->access->fifo_full(info_p);
38081 if (temp != 0) {
38082 break;
38083 }
38084@@ -1465,7 +1465,7 @@ DBG(
38085 /*
38086 * Send the cmd
38087 */
38088- info_p->access.submit_command(info_p, c);
38089+ info_p->access->submit_command(info_p, c);
38090 complete = pollcomplete(ctlr);
38091
38092 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38093@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38094 * we check the new geometry. Then turn interrupts back on when
38095 * we're done.
38096 */
38097- host->access.set_intr_mask(host, 0);
38098+ host->access->set_intr_mask(host, 0);
38099 getgeometry(ctlr);
38100- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38101+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38102
38103 for(i=0; i<NWD; i++) {
38104 struct gendisk *disk = ida_gendisk[ctlr][i];
38105@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38106 /* Wait (up to 2 seconds) for a command to complete */
38107
38108 for (i = 200000; i > 0; i--) {
38109- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38110+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38111 if (done == 0) {
38112 udelay(10); /* a short fixed delay */
38113 } else
38114diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38115index be73e9d..7fbf140 100644
38116--- a/drivers/block/cpqarray.h
38117+++ b/drivers/block/cpqarray.h
38118@@ -99,7 +99,7 @@ struct ctlr_info {
38119 drv_info_t drv[NWD];
38120 struct proc_dir_entry *proc;
38121
38122- struct access_method access;
38123+ struct access_method *access;
38124
38125 cmdlist_t *reqQ;
38126 cmdlist_t *cmpQ;
38127diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38128index 434c77d..6d3219a 100644
38129--- a/drivers/block/drbd/drbd_bitmap.c
38130+++ b/drivers/block/drbd/drbd_bitmap.c
38131@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38132 submit_bio(rw, bio);
38133 /* this should not count as user activity and cause the
38134 * resync to throttle -- see drbd_rs_should_slow_down(). */
38135- atomic_add(len >> 9, &device->rs_sect_ev);
38136+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38137 }
38138 }
38139
38140diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38141index b905e98..0812ed8 100644
38142--- a/drivers/block/drbd/drbd_int.h
38143+++ b/drivers/block/drbd/drbd_int.h
38144@@ -385,7 +385,7 @@ struct drbd_epoch {
38145 struct drbd_connection *connection;
38146 struct list_head list;
38147 unsigned int barrier_nr;
38148- atomic_t epoch_size; /* increased on every request added. */
38149+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38150 atomic_t active; /* increased on every req. added, and dec on every finished. */
38151 unsigned long flags;
38152 };
38153@@ -946,7 +946,7 @@ struct drbd_device {
38154 unsigned int al_tr_number;
38155 int al_tr_cycle;
38156 wait_queue_head_t seq_wait;
38157- atomic_t packet_seq;
38158+ atomic_unchecked_t packet_seq;
38159 unsigned int peer_seq;
38160 spinlock_t peer_seq_lock;
38161 unsigned long comm_bm_set; /* communicated number of set bits. */
38162@@ -955,8 +955,8 @@ struct drbd_device {
38163 struct mutex own_state_mutex;
38164 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38165 char congestion_reason; /* Why we where congested... */
38166- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38167- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38168+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38169+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38170 int rs_last_sect_ev; /* counter to compare with */
38171 int rs_last_events; /* counter of read or write "events" (unit sectors)
38172 * on the lower level device when we last looked. */
38173diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38174index 81fde9e..9948c05 100644
38175--- a/drivers/block/drbd/drbd_main.c
38176+++ b/drivers/block/drbd/drbd_main.c
38177@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38178 p->sector = sector;
38179 p->block_id = block_id;
38180 p->blksize = blksize;
38181- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38182+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38183 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38184 }
38185
38186@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38187 return -EIO;
38188 p->sector = cpu_to_be64(req->i.sector);
38189 p->block_id = (unsigned long)req;
38190- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38191+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38192 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38193 if (device->state.conn >= C_SYNC_SOURCE &&
38194 device->state.conn <= C_PAUSED_SYNC_T)
38195@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38196 atomic_set(&device->unacked_cnt, 0);
38197 atomic_set(&device->local_cnt, 0);
38198 atomic_set(&device->pp_in_use_by_net, 0);
38199- atomic_set(&device->rs_sect_in, 0);
38200- atomic_set(&device->rs_sect_ev, 0);
38201+ atomic_set_unchecked(&device->rs_sect_in, 0);
38202+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38203 atomic_set(&device->ap_in_flight, 0);
38204 atomic_set(&device->md_io.in_use, 0);
38205
38206@@ -2683,8 +2683,8 @@ void drbd_destroy_connection(struct kref *kref)
38207 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38208 struct drbd_resource *resource = connection->resource;
38209
38210- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38211- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38212+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38213+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38214 kfree(connection->current_epoch);
38215
38216 idr_destroy(&connection->peer_devices);
38217diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38218index 74df8cf..e41fc24 100644
38219--- a/drivers/block/drbd/drbd_nl.c
38220+++ b/drivers/block/drbd/drbd_nl.c
38221@@ -3637,13 +3637,13 @@ finish:
38222
38223 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38224 {
38225- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38226+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38227 struct sk_buff *msg;
38228 struct drbd_genlmsghdr *d_out;
38229 unsigned seq;
38230 int err = -ENOMEM;
38231
38232- seq = atomic_inc_return(&drbd_genl_seq);
38233+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38234 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38235 if (!msg)
38236 goto failed;
38237diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38238index cee2035..22f66bd 100644
38239--- a/drivers/block/drbd/drbd_receiver.c
38240+++ b/drivers/block/drbd/drbd_receiver.c
38241@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38242 struct drbd_device *device = peer_device->device;
38243 int err;
38244
38245- atomic_set(&device->packet_seq, 0);
38246+ atomic_set_unchecked(&device->packet_seq, 0);
38247 device->peer_seq = 0;
38248
38249 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38250@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38251 do {
38252 next_epoch = NULL;
38253
38254- epoch_size = atomic_read(&epoch->epoch_size);
38255+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38256
38257 switch (ev & ~EV_CLEANUP) {
38258 case EV_PUT:
38259@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38260 rv = FE_DESTROYED;
38261 } else {
38262 epoch->flags = 0;
38263- atomic_set(&epoch->epoch_size, 0);
38264+ atomic_set_unchecked(&epoch->epoch_size, 0);
38265 /* atomic_set(&epoch->active, 0); is already zero */
38266 if (rv == FE_STILL_LIVE)
38267 rv = FE_RECYCLED;
38268@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38269 conn_wait_active_ee_empty(connection);
38270 drbd_flush(connection);
38271
38272- if (atomic_read(&connection->current_epoch->epoch_size)) {
38273+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38274 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38275 if (epoch)
38276 break;
38277@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38278 }
38279
38280 epoch->flags = 0;
38281- atomic_set(&epoch->epoch_size, 0);
38282+ atomic_set_unchecked(&epoch->epoch_size, 0);
38283 atomic_set(&epoch->active, 0);
38284
38285 spin_lock(&connection->epoch_lock);
38286- if (atomic_read(&connection->current_epoch->epoch_size)) {
38287+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38288 list_add(&epoch->list, &connection->current_epoch->list);
38289 connection->current_epoch = epoch;
38290 connection->epochs++;
38291@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38292 list_add_tail(&peer_req->w.list, &device->sync_ee);
38293 spin_unlock_irq(&device->resource->req_lock);
38294
38295- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38296+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38297 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38298 return 0;
38299
38300@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38301 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38302 }
38303
38304- atomic_add(pi->size >> 9, &device->rs_sect_in);
38305+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38306
38307 return err;
38308 }
38309@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38310
38311 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38312 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38313- atomic_inc(&connection->current_epoch->epoch_size);
38314+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38315 err2 = drbd_drain_block(peer_device, pi->size);
38316 if (!err)
38317 err = err2;
38318@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38319
38320 spin_lock(&connection->epoch_lock);
38321 peer_req->epoch = connection->current_epoch;
38322- atomic_inc(&peer_req->epoch->epoch_size);
38323+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38324 atomic_inc(&peer_req->epoch->active);
38325 spin_unlock(&connection->epoch_lock);
38326
38327@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38328
38329 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38330 (int)part_stat_read(&disk->part0, sectors[1]) -
38331- atomic_read(&device->rs_sect_ev);
38332+ atomic_read_unchecked(&device->rs_sect_ev);
38333
38334 if (atomic_read(&device->ap_actlog_cnt)
38335 || curr_events - device->rs_last_events > 64) {
38336@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38337 device->use_csums = true;
38338 } else if (pi->cmd == P_OV_REPLY) {
38339 /* track progress, we may need to throttle */
38340- atomic_add(size >> 9, &device->rs_sect_in);
38341+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38342 peer_req->w.cb = w_e_end_ov_reply;
38343 dec_rs_pending(device);
38344 /* drbd_rs_begin_io done when we sent this request,
38345@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38346 goto out_free_e;
38347
38348 submit_for_resync:
38349- atomic_add(size >> 9, &device->rs_sect_ev);
38350+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38351
38352 submit:
38353 update_receiver_timing_details(connection, drbd_submit_peer_request);
38354@@ -4564,7 +4564,7 @@ struct data_cmd {
38355 int expect_payload;
38356 size_t pkt_size;
38357 int (*fn)(struct drbd_connection *, struct packet_info *);
38358-};
38359+} __do_const;
38360
38361 static struct data_cmd drbd_cmd_handler[] = {
38362 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38363@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38364 if (!list_empty(&connection->current_epoch->list))
38365 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38366 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38367- atomic_set(&connection->current_epoch->epoch_size, 0);
38368+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38369 connection->send.seen_any_write_yet = false;
38370
38371 drbd_info(connection, "Connection closed\n");
38372@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38373 put_ldev(device);
38374 }
38375 dec_rs_pending(device);
38376- atomic_add(blksize >> 9, &device->rs_sect_in);
38377+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38378
38379 return 0;
38380 }
38381@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38382 struct asender_cmd {
38383 size_t pkt_size;
38384 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38385-};
38386+} __do_const;
38387
38388 static struct asender_cmd asender_tbl[] = {
38389 [P_PING] = { 0, got_Ping },
38390diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38391index d0fae55..4469096 100644
38392--- a/drivers/block/drbd/drbd_worker.c
38393+++ b/drivers/block/drbd/drbd_worker.c
38394@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38395 list_add_tail(&peer_req->w.list, &device->read_ee);
38396 spin_unlock_irq(&device->resource->req_lock);
38397
38398- atomic_add(size >> 9, &device->rs_sect_ev);
38399+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38400 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38401 return 0;
38402
38403@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38404 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38405 int number, mxb;
38406
38407- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38408+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38409 device->rs_in_flight -= sect_in;
38410
38411 rcu_read_lock();
38412@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38413 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38414 struct fifo_buffer *plan;
38415
38416- atomic_set(&device->rs_sect_in, 0);
38417- atomic_set(&device->rs_sect_ev, 0);
38418+ atomic_set_unchecked(&device->rs_sect_in, 0);
38419+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38420 device->rs_in_flight = 0;
38421 device->rs_last_events =
38422 (int)part_stat_read(&disk->part0, sectors[0]) +
38423diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38424index 09e628da..7607aaa 100644
38425--- a/drivers/block/pktcdvd.c
38426+++ b/drivers/block/pktcdvd.c
38427@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38428
38429 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38430 {
38431- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38432+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38433 }
38434
38435 /*
38436@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38437 return -EROFS;
38438 }
38439 pd->settings.fp = ti.fp;
38440- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38441+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38442
38443 if (ti.nwa_v) {
38444 pd->nwa = be32_to_cpu(ti.next_writable);
38445diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38446index 010ce0b..7c0049e 100644
38447--- a/drivers/block/rbd.c
38448+++ b/drivers/block/rbd.c
38449@@ -64,7 +64,7 @@
38450 * If the counter is already at its maximum value returns
38451 * -EINVAL without updating it.
38452 */
38453-static int atomic_inc_return_safe(atomic_t *v)
38454+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38455 {
38456 unsigned int counter;
38457
38458diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38459index e5565fb..71be10b4 100644
38460--- a/drivers/block/smart1,2.h
38461+++ b/drivers/block/smart1,2.h
38462@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38463 }
38464
38465 static struct access_method smart4_access = {
38466- smart4_submit_command,
38467- smart4_intr_mask,
38468- smart4_fifo_full,
38469- smart4_intr_pending,
38470- smart4_completed,
38471+ .submit_command = smart4_submit_command,
38472+ .set_intr_mask = smart4_intr_mask,
38473+ .fifo_full = smart4_fifo_full,
38474+ .intr_pending = smart4_intr_pending,
38475+ .command_completed = smart4_completed,
38476 };
38477
38478 /*
38479@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38480 }
38481
38482 static struct access_method smart2_access = {
38483- smart2_submit_command,
38484- smart2_intr_mask,
38485- smart2_fifo_full,
38486- smart2_intr_pending,
38487- smart2_completed,
38488+ .submit_command = smart2_submit_command,
38489+ .set_intr_mask = smart2_intr_mask,
38490+ .fifo_full = smart2_fifo_full,
38491+ .intr_pending = smart2_intr_pending,
38492+ .command_completed = smart2_completed,
38493 };
38494
38495 /*
38496@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38497 }
38498
38499 static struct access_method smart2e_access = {
38500- smart2e_submit_command,
38501- smart2e_intr_mask,
38502- smart2e_fifo_full,
38503- smart2e_intr_pending,
38504- smart2e_completed,
38505+ .submit_command = smart2e_submit_command,
38506+ .set_intr_mask = smart2e_intr_mask,
38507+ .fifo_full = smart2e_fifo_full,
38508+ .intr_pending = smart2e_intr_pending,
38509+ .command_completed = smart2e_completed,
38510 };
38511
38512 /*
38513@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38514 }
38515
38516 static struct access_method smart1_access = {
38517- smart1_submit_command,
38518- smart1_intr_mask,
38519- smart1_fifo_full,
38520- smart1_intr_pending,
38521- smart1_completed,
38522+ .submit_command = smart1_submit_command,
38523+ .set_intr_mask = smart1_intr_mask,
38524+ .fifo_full = smart1_fifo_full,
38525+ .intr_pending = smart1_intr_pending,
38526+ .command_completed = smart1_completed,
38527 };
38528diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38529index 55c135b..9f8d60c 100644
38530--- a/drivers/bluetooth/btwilink.c
38531+++ b/drivers/bluetooth/btwilink.c
38532@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38533
38534 static int bt_ti_probe(struct platform_device *pdev)
38535 {
38536- static struct ti_st *hst;
38537+ struct ti_st *hst;
38538 struct hci_dev *hdev;
38539 int err;
38540
38541diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38542index 5d28a45..a538f90 100644
38543--- a/drivers/cdrom/cdrom.c
38544+++ b/drivers/cdrom/cdrom.c
38545@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38546 ENSURE(reset, CDC_RESET);
38547 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38548 cdi->mc_flags = 0;
38549- cdo->n_minors = 0;
38550 cdi->options = CDO_USE_FFLAGS;
38551
38552 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38553@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38554 else
38555 cdi->cdda_method = CDDA_OLD;
38556
38557- if (!cdo->generic_packet)
38558- cdo->generic_packet = cdrom_dummy_generic_packet;
38559+ if (!cdo->generic_packet) {
38560+ pax_open_kernel();
38561+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38562+ pax_close_kernel();
38563+ }
38564
38565 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38566 mutex_lock(&cdrom_mutex);
38567@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38568 if (cdi->exit)
38569 cdi->exit(cdi);
38570
38571- cdi->ops->n_minors--;
38572 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38573 }
38574
38575@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38576 */
38577 nr = nframes;
38578 do {
38579- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38580+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38581 if (cgc.buffer)
38582 break;
38583
38584@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38585 struct cdrom_device_info *cdi;
38586 int ret;
38587
38588- ret = scnprintf(info + *pos, max_size - *pos, header);
38589+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38590 if (!ret)
38591 return 1;
38592
38593diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38594index 584bc31..e64a12c 100644
38595--- a/drivers/cdrom/gdrom.c
38596+++ b/drivers/cdrom/gdrom.c
38597@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38598 .audio_ioctl = gdrom_audio_ioctl,
38599 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38600 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38601- .n_minors = 1,
38602 };
38603
38604 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38605diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38606index a4af822..ed58cd1 100644
38607--- a/drivers/char/Kconfig
38608+++ b/drivers/char/Kconfig
38609@@ -17,7 +17,8 @@ config DEVMEM
38610
38611 config DEVKMEM
38612 bool "/dev/kmem virtual device support"
38613- default y
38614+ default n
38615+ depends on !GRKERNSEC_KMEM
38616 help
38617 Say Y here if you want to support the /dev/kmem device. The
38618 /dev/kmem device is rarely used, but can be used for certain
38619@@ -586,6 +587,7 @@ config DEVPORT
38620 bool
38621 depends on !M68K
38622 depends on ISA || PCI
38623+ depends on !GRKERNSEC_KMEM
38624 default y
38625
38626 source "drivers/s390/char/Kconfig"
38627diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38628index a48e05b..6bac831 100644
38629--- a/drivers/char/agp/compat_ioctl.c
38630+++ b/drivers/char/agp/compat_ioctl.c
38631@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38632 return -ENOMEM;
38633 }
38634
38635- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38636+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38637 sizeof(*usegment) * ureserve.seg_count)) {
38638 kfree(usegment);
38639 kfree(ksegment);
38640diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38641index 09f17eb..8531d2f 100644
38642--- a/drivers/char/agp/frontend.c
38643+++ b/drivers/char/agp/frontend.c
38644@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38645 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38646 return -EFAULT;
38647
38648- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38649+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38650 return -EFAULT;
38651
38652 client = agp_find_client_by_pid(reserve.pid);
38653@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38654 if (segment == NULL)
38655 return -ENOMEM;
38656
38657- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38658+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38659 sizeof(struct agp_segment) * reserve.seg_count)) {
38660 kfree(segment);
38661 return -EFAULT;
38662diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38663index 4f94375..413694e 100644
38664--- a/drivers/char/genrtc.c
38665+++ b/drivers/char/genrtc.c
38666@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38667 switch (cmd) {
38668
38669 case RTC_PLL_GET:
38670+ memset(&pll, 0, sizeof(pll));
38671 if (get_rtc_pll(&pll))
38672 return -EINVAL;
38673 else
38674diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38675index 5c0baa9..44011b1 100644
38676--- a/drivers/char/hpet.c
38677+++ b/drivers/char/hpet.c
38678@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38679 }
38680
38681 static int
38682-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38683+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38684 struct hpet_info *info)
38685 {
38686 struct hpet_timer __iomem *timer;
38687diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38688index 3c1a123..a33c99f 100644
38689--- a/drivers/char/i8k.c
38690+++ b/drivers/char/i8k.c
38691@@ -790,7 +790,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38692 },
38693 };
38694
38695-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38696+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38697 {
38698 .ident = "Dell Inspiron",
38699 .matches = {
38700diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38701index bf75f63..359fa10 100644
38702--- a/drivers/char/ipmi/ipmi_msghandler.c
38703+++ b/drivers/char/ipmi/ipmi_msghandler.c
38704@@ -436,7 +436,7 @@ struct ipmi_smi {
38705 struct proc_dir_entry *proc_dir;
38706 char proc_dir_name[10];
38707
38708- atomic_t stats[IPMI_NUM_STATS];
38709+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38710
38711 /*
38712 * run_to_completion duplicate of smb_info, smi_info
38713@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38714 static DEFINE_MUTEX(smi_watchers_mutex);
38715
38716 #define ipmi_inc_stat(intf, stat) \
38717- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38718+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38719 #define ipmi_get_stat(intf, stat) \
38720- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38721+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38722
38723 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38724 "ACPI", "SMBIOS", "PCI",
38725@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38726 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38727 init_waitqueue_head(&intf->waitq);
38728 for (i = 0; i < IPMI_NUM_STATS; i++)
38729- atomic_set(&intf->stats[i], 0);
38730+ atomic_set_unchecked(&intf->stats[i], 0);
38731
38732 intf->proc_dir = NULL;
38733
38734diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38735index 8a45e92..e41b1c7 100644
38736--- a/drivers/char/ipmi/ipmi_si_intf.c
38737+++ b/drivers/char/ipmi/ipmi_si_intf.c
38738@@ -289,7 +289,7 @@ struct smi_info {
38739 unsigned char slave_addr;
38740
38741 /* Counters and things for the proc filesystem. */
38742- atomic_t stats[SI_NUM_STATS];
38743+ atomic_unchecked_t stats[SI_NUM_STATS];
38744
38745 struct task_struct *thread;
38746
38747@@ -298,9 +298,9 @@ struct smi_info {
38748 };
38749
38750 #define smi_inc_stat(smi, stat) \
38751- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38752+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38753 #define smi_get_stat(smi, stat) \
38754- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38755+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38756
38757 #define SI_MAX_PARMS 4
38758
38759@@ -3500,7 +3500,7 @@ static int try_smi_init(struct smi_info *new_smi)
38760 atomic_set(&new_smi->req_events, 0);
38761 new_smi->run_to_completion = false;
38762 for (i = 0; i < SI_NUM_STATS; i++)
38763- atomic_set(&new_smi->stats[i], 0);
38764+ atomic_set_unchecked(&new_smi->stats[i], 0);
38765
38766 new_smi->interrupt_disabled = true;
38767 atomic_set(&new_smi->need_watch, 0);
38768diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38769index 6b1721f..fda9398 100644
38770--- a/drivers/char/mem.c
38771+++ b/drivers/char/mem.c
38772@@ -18,6 +18,7 @@
38773 #include <linux/raw.h>
38774 #include <linux/tty.h>
38775 #include <linux/capability.h>
38776+#include <linux/security.h>
38777 #include <linux/ptrace.h>
38778 #include <linux/device.h>
38779 #include <linux/highmem.h>
38780@@ -36,6 +37,10 @@
38781
38782 #define DEVPORT_MINOR 4
38783
38784+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38785+extern const struct file_operations grsec_fops;
38786+#endif
38787+
38788 static inline unsigned long size_inside_page(unsigned long start,
38789 unsigned long size)
38790 {
38791@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38792
38793 while (cursor < to) {
38794 if (!devmem_is_allowed(pfn)) {
38795+#ifdef CONFIG_GRKERNSEC_KMEM
38796+ gr_handle_mem_readwrite(from, to);
38797+#else
38798 printk(KERN_INFO
38799 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38800 current->comm, from, to);
38801+#endif
38802 return 0;
38803 }
38804 cursor += PAGE_SIZE;
38805@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38806 }
38807 return 1;
38808 }
38809+#elif defined(CONFIG_GRKERNSEC_KMEM)
38810+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38811+{
38812+ return 0;
38813+}
38814 #else
38815 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38816 {
38817@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38818 #endif
38819
38820 while (count > 0) {
38821- unsigned long remaining;
38822+ unsigned long remaining = 0;
38823+ char *temp;
38824
38825 sz = size_inside_page(p, count);
38826
38827@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38828 if (!ptr)
38829 return -EFAULT;
38830
38831- remaining = copy_to_user(buf, ptr, sz);
38832+#ifdef CONFIG_PAX_USERCOPY
38833+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38834+ if (!temp) {
38835+ unxlate_dev_mem_ptr(p, ptr);
38836+ return -ENOMEM;
38837+ }
38838+ remaining = probe_kernel_read(temp, ptr, sz);
38839+#else
38840+ temp = ptr;
38841+#endif
38842+
38843+ if (!remaining)
38844+ remaining = copy_to_user(buf, temp, sz);
38845+
38846+#ifdef CONFIG_PAX_USERCOPY
38847+ kfree(temp);
38848+#endif
38849+
38850 unxlate_dev_mem_ptr(p, ptr);
38851 if (remaining)
38852 return -EFAULT;
38853@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38854 size_t count, loff_t *ppos)
38855 {
38856 unsigned long p = *ppos;
38857- ssize_t low_count, read, sz;
38858+ ssize_t low_count, read, sz, err = 0;
38859 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38860- int err = 0;
38861
38862 read = 0;
38863 if (p < (unsigned long) high_memory) {
38864@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38865 }
38866 #endif
38867 while (low_count > 0) {
38868+ char *temp;
38869+
38870 sz = size_inside_page(p, low_count);
38871
38872 /*
38873@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38874 */
38875 kbuf = xlate_dev_kmem_ptr((void *)p);
38876
38877- if (copy_to_user(buf, kbuf, sz))
38878+#ifdef CONFIG_PAX_USERCOPY
38879+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38880+ if (!temp)
38881+ return -ENOMEM;
38882+ err = probe_kernel_read(temp, kbuf, sz);
38883+#else
38884+ temp = kbuf;
38885+#endif
38886+
38887+ if (!err)
38888+ err = copy_to_user(buf, temp, sz);
38889+
38890+#ifdef CONFIG_PAX_USERCOPY
38891+ kfree(temp);
38892+#endif
38893+
38894+ if (err)
38895 return -EFAULT;
38896 buf += sz;
38897 p += sz;
38898@@ -802,6 +851,9 @@ static const struct memdev {
38899 #ifdef CONFIG_PRINTK
38900 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
38901 #endif
38902+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38903+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
38904+#endif
38905 };
38906
38907 static int memory_open(struct inode *inode, struct file *filp)
38908@@ -863,7 +915,7 @@ static int __init chr_dev_init(void)
38909 continue;
38910
38911 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38912- NULL, devlist[minor].name);
38913+ NULL, "%s", devlist[minor].name);
38914 }
38915
38916 return tty_init();
38917diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38918index 9df78e2..01ba9ae 100644
38919--- a/drivers/char/nvram.c
38920+++ b/drivers/char/nvram.c
38921@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38922
38923 spin_unlock_irq(&rtc_lock);
38924
38925- if (copy_to_user(buf, contents, tmp - contents))
38926+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38927 return -EFAULT;
38928
38929 *ppos = i;
38930diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38931index 0ea9986..e7b07e4 100644
38932--- a/drivers/char/pcmcia/synclink_cs.c
38933+++ b/drivers/char/pcmcia/synclink_cs.c
38934@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38935
38936 if (debug_level >= DEBUG_LEVEL_INFO)
38937 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38938- __FILE__, __LINE__, info->device_name, port->count);
38939+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38940
38941 if (tty_port_close_start(port, tty, filp) == 0)
38942 goto cleanup;
38943@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38944 cleanup:
38945 if (debug_level >= DEBUG_LEVEL_INFO)
38946 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38947- tty->driver->name, port->count);
38948+ tty->driver->name, atomic_read(&port->count));
38949 }
38950
38951 /* Wait until the transmitter is empty.
38952@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38953
38954 if (debug_level >= DEBUG_LEVEL_INFO)
38955 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38956- __FILE__, __LINE__, tty->driver->name, port->count);
38957+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38958
38959 /* If port is closing, signal caller to try again */
38960 if (port->flags & ASYNC_CLOSING){
38961@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38962 goto cleanup;
38963 }
38964 spin_lock(&port->lock);
38965- port->count++;
38966+ atomic_inc(&port->count);
38967 spin_unlock(&port->lock);
38968 spin_unlock_irqrestore(&info->netlock, flags);
38969
38970- if (port->count == 1) {
38971+ if (atomic_read(&port->count) == 1) {
38972 /* 1st open on this device, init hardware */
38973 retval = startup(info, tty);
38974 if (retval < 0)
38975@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38976 unsigned short new_crctype;
38977
38978 /* return error if TTY interface open */
38979- if (info->port.count)
38980+ if (atomic_read(&info->port.count))
38981 return -EBUSY;
38982
38983 switch (encoding)
38984@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
38985
38986 /* arbitrate between network and tty opens */
38987 spin_lock_irqsave(&info->netlock, flags);
38988- if (info->port.count != 0 || info->netcount != 0) {
38989+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38990 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38991 spin_unlock_irqrestore(&info->netlock, flags);
38992 return -EBUSY;
38993@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38994 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38995
38996 /* return error if TTY interface open */
38997- if (info->port.count)
38998+ if (atomic_read(&info->port.count))
38999 return -EBUSY;
39000
39001 if (cmd != SIOCWANDEV)
39002diff --git a/drivers/char/random.c b/drivers/char/random.c
39003index 9cd6968..6416f00 100644
39004--- a/drivers/char/random.c
39005+++ b/drivers/char/random.c
39006@@ -289,9 +289,6 @@
39007 /*
39008 * To allow fractional bits to be tracked, the entropy_count field is
39009 * denominated in units of 1/8th bits.
39010- *
39011- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39012- * credit_entropy_bits() needs to be 64 bits wide.
39013 */
39014 #define ENTROPY_SHIFT 3
39015 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39016@@ -439,9 +436,9 @@ struct entropy_store {
39017 };
39018
39019 static void push_to_pool(struct work_struct *work);
39020-static __u32 input_pool_data[INPUT_POOL_WORDS];
39021-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39022-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39023+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39024+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39025+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39026
39027 static struct entropy_store input_pool = {
39028 .poolinfo = &poolinfo_table[0],
39029@@ -635,7 +632,7 @@ retry:
39030 /* The +2 corresponds to the /4 in the denominator */
39031
39032 do {
39033- unsigned int anfrac = min(pnfrac, pool_size/2);
39034+ u64 anfrac = min(pnfrac, pool_size/2);
39035 unsigned int add =
39036 ((pool_size - entropy_count)*anfrac*3) >> s;
39037
39038@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39039
39040 extract_buf(r, tmp);
39041 i = min_t(int, nbytes, EXTRACT_SIZE);
39042- if (copy_to_user(buf, tmp, i)) {
39043+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39044 ret = -EFAULT;
39045 break;
39046 }
39047@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39048 static int proc_do_uuid(struct ctl_table *table, int write,
39049 void __user *buffer, size_t *lenp, loff_t *ppos)
39050 {
39051- struct ctl_table fake_table;
39052+ ctl_table_no_const fake_table;
39053 unsigned char buf[64], tmp_uuid[16], *uuid;
39054
39055 uuid = table->data;
39056@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39057 static int proc_do_entropy(struct ctl_table *table, int write,
39058 void __user *buffer, size_t *lenp, loff_t *ppos)
39059 {
39060- struct ctl_table fake_table;
39061+ ctl_table_no_const fake_table;
39062 int entropy_count;
39063
39064 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39065diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39066index e496dae..3db53b6 100644
39067--- a/drivers/char/sonypi.c
39068+++ b/drivers/char/sonypi.c
39069@@ -54,6 +54,7 @@
39070
39071 #include <asm/uaccess.h>
39072 #include <asm/io.h>
39073+#include <asm/local.h>
39074
39075 #include <linux/sonypi.h>
39076
39077@@ -490,7 +491,7 @@ static struct sonypi_device {
39078 spinlock_t fifo_lock;
39079 wait_queue_head_t fifo_proc_list;
39080 struct fasync_struct *fifo_async;
39081- int open_count;
39082+ local_t open_count;
39083 int model;
39084 struct input_dev *input_jog_dev;
39085 struct input_dev *input_key_dev;
39086@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39087 static int sonypi_misc_release(struct inode *inode, struct file *file)
39088 {
39089 mutex_lock(&sonypi_device.lock);
39090- sonypi_device.open_count--;
39091+ local_dec(&sonypi_device.open_count);
39092 mutex_unlock(&sonypi_device.lock);
39093 return 0;
39094 }
39095@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39096 {
39097 mutex_lock(&sonypi_device.lock);
39098 /* Flush input queue on first open */
39099- if (!sonypi_device.open_count)
39100+ if (!local_read(&sonypi_device.open_count))
39101 kfifo_reset(&sonypi_device.fifo);
39102- sonypi_device.open_count++;
39103+ local_inc(&sonypi_device.open_count);
39104 mutex_unlock(&sonypi_device.lock);
39105
39106 return 0;
39107@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39108
39109 static struct platform_device *sonypi_platform_device;
39110
39111-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39112+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39113 {
39114 .ident = "Sony Vaio",
39115 .matches = {
39116diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39117index 565a947..dcdc06e 100644
39118--- a/drivers/char/tpm/tpm_acpi.c
39119+++ b/drivers/char/tpm/tpm_acpi.c
39120@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39121 virt = acpi_os_map_iomem(start, len);
39122 if (!virt) {
39123 kfree(log->bios_event_log);
39124+ log->bios_event_log = NULL;
39125 printk("%s: ERROR - Unable to map memory\n", __func__);
39126 return -EIO;
39127 }
39128
39129- memcpy_fromio(log->bios_event_log, virt, len);
39130+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39131
39132 acpi_os_unmap_iomem(virt, len);
39133 return 0;
39134diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39135index 3a56a13..f8cbd25 100644
39136--- a/drivers/char/tpm/tpm_eventlog.c
39137+++ b/drivers/char/tpm/tpm_eventlog.c
39138@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39139 event = addr;
39140
39141 if ((event->event_type == 0 && event->event_size == 0) ||
39142- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39143+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39144 return NULL;
39145
39146 return addr;
39147@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39148 return NULL;
39149
39150 if ((event->event_type == 0 && event->event_size == 0) ||
39151- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39152+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39153 return NULL;
39154
39155 (*pos)++;
39156@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39157 int i;
39158
39159 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39160- seq_putc(m, data[i]);
39161+ if (!seq_putc(m, data[i]))
39162+ return -EFAULT;
39163
39164 return 0;
39165 }
39166diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39167index 50754d20..9561cdc 100644
39168--- a/drivers/char/virtio_console.c
39169+++ b/drivers/char/virtio_console.c
39170@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39171 if (to_user) {
39172 ssize_t ret;
39173
39174- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39175+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39176 if (ret)
39177 return -EFAULT;
39178 } else {
39179@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39180 if (!port_has_data(port) && !port->host_connected)
39181 return 0;
39182
39183- return fill_readbuf(port, ubuf, count, true);
39184+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39185 }
39186
39187 static int wait_port_writable(struct port *port, bool nonblock)
39188diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39189index 956b7e5..b655045 100644
39190--- a/drivers/clk/clk-composite.c
39191+++ b/drivers/clk/clk-composite.c
39192@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39193 struct clk *clk;
39194 struct clk_init_data init;
39195 struct clk_composite *composite;
39196- struct clk_ops *clk_composite_ops;
39197+ clk_ops_no_const *clk_composite_ops;
39198
39199 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39200 if (!composite) {
39201diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
39202index 69a094c..1fa2a8d 100644
39203--- a/drivers/clk/clk-mux.c
39204+++ b/drivers/clk/clk-mux.c
39205@@ -114,7 +114,7 @@ const struct clk_ops clk_mux_ro_ops = {
39206 EXPORT_SYMBOL_GPL(clk_mux_ro_ops);
39207
39208 struct clk *clk_register_mux_table(struct device *dev, const char *name,
39209- const char **parent_names, u8 num_parents, unsigned long flags,
39210+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39211 void __iomem *reg, u8 shift, u32 mask,
39212 u8 clk_mux_flags, u32 *table, spinlock_t *lock)
39213 {
39214@@ -166,7 +166,7 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name,
39215 EXPORT_SYMBOL_GPL(clk_register_mux_table);
39216
39217 struct clk *clk_register_mux(struct device *dev, const char *name,
39218- const char **parent_names, u8 num_parents, unsigned long flags,
39219+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39220 void __iomem *reg, u8 shift, u8 width,
39221 u8 clk_mux_flags, spinlock_t *lock)
39222 {
39223diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39224index e4c7538..9d5c18a 100644
39225--- a/drivers/clk/samsung/clk.h
39226+++ b/drivers/clk/samsung/clk.h
39227@@ -121,7 +121,7 @@ struct samsung_mux_clock {
39228 unsigned int id;
39229 const char *dev_name;
39230 const char *name;
39231- const char **parent_names;
39232+ const char * const *parent_names;
39233 u8 num_parents;
39234 unsigned long flags;
39235 unsigned long offset;
39236@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39237 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39238 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39239
39240-#define PNAME(x) static const char *x[] __initdata
39241+#define PNAME(x) static const char * const x[] __initconst
39242
39243 /**
39244 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39245diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39246index dd3a78c..386d49c 100644
39247--- a/drivers/clk/socfpga/clk-gate.c
39248+++ b/drivers/clk/socfpga/clk-gate.c
39249@@ -22,6 +22,7 @@
39250 #include <linux/mfd/syscon.h>
39251 #include <linux/of.h>
39252 #include <linux/regmap.h>
39253+#include <asm/pgtable.h>
39254
39255 #include "clk.h"
39256
39257@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39258 return 0;
39259 }
39260
39261-static struct clk_ops gateclk_ops = {
39262+static clk_ops_no_const gateclk_ops __read_only = {
39263 .prepare = socfpga_clk_prepare,
39264 .recalc_rate = socfpga_clk_recalc_rate,
39265 .get_parent = socfpga_clk_get_parent,
39266@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39267 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39268 socfpga_clk->hw.bit_idx = clk_gate[1];
39269
39270- gateclk_ops.enable = clk_gate_ops.enable;
39271- gateclk_ops.disable = clk_gate_ops.disable;
39272+ pax_open_kernel();
39273+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39274+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39275+ pax_close_kernel();
39276 }
39277
39278 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39279diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39280index de6da95..c98278b 100644
39281--- a/drivers/clk/socfpga/clk-pll.c
39282+++ b/drivers/clk/socfpga/clk-pll.c
39283@@ -21,6 +21,7 @@
39284 #include <linux/io.h>
39285 #include <linux/of.h>
39286 #include <linux/of_address.h>
39287+#include <asm/pgtable.h>
39288
39289 #include "clk.h"
39290
39291@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39292 CLK_MGR_PLL_CLK_SRC_MASK;
39293 }
39294
39295-static struct clk_ops clk_pll_ops = {
39296+static clk_ops_no_const clk_pll_ops __read_only = {
39297 .recalc_rate = clk_pll_recalc_rate,
39298 .get_parent = clk_pll_get_parent,
39299 };
39300@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39301 pll_clk->hw.hw.init = &init;
39302
39303 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39304- clk_pll_ops.enable = clk_gate_ops.enable;
39305- clk_pll_ops.disable = clk_gate_ops.disable;
39306+ pax_open_kernel();
39307+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39308+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39309+ pax_close_kernel();
39310
39311 clk = clk_register(NULL, &pll_clk->hw.hw);
39312 if (WARN_ON(IS_ERR(clk))) {
39313diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39314index b0c18ed..1713a80 100644
39315--- a/drivers/cpufreq/acpi-cpufreq.c
39316+++ b/drivers/cpufreq/acpi-cpufreq.c
39317@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39318 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39319 per_cpu(acfreq_data, cpu) = data;
39320
39321- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39322- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39323+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39324+ pax_open_kernel();
39325+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39326+ pax_close_kernel();
39327+ }
39328
39329 result = acpi_processor_register_performance(data->acpi_data, cpu);
39330 if (result)
39331@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39332 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39333 break;
39334 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39335- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39336+ pax_open_kernel();
39337+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39338+ pax_close_kernel();
39339 break;
39340 default:
39341 break;
39342@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39343 if (!msrs)
39344 return;
39345
39346- acpi_cpufreq_driver.boost_supported = true;
39347- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39348+ pax_open_kernel();
39349+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39350+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39351+ pax_close_kernel();
39352
39353 cpu_notifier_register_begin();
39354
39355diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39356index bab67db..91af7e3 100644
39357--- a/drivers/cpufreq/cpufreq-dt.c
39358+++ b/drivers/cpufreq/cpufreq-dt.c
39359@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39360 if (!IS_ERR(cpu_reg))
39361 regulator_put(cpu_reg);
39362
39363- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39364+ pax_open_kernel();
39365+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39366+ pax_close_kernel();
39367
39368 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39369 if (ret)
39370diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39371index 8ae655c..3141442 100644
39372--- a/drivers/cpufreq/cpufreq.c
39373+++ b/drivers/cpufreq/cpufreq.c
39374@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39375 }
39376
39377 mutex_lock(&cpufreq_governor_mutex);
39378- list_del(&governor->governor_list);
39379+ pax_list_del(&governor->governor_list);
39380 mutex_unlock(&cpufreq_governor_mutex);
39381 return;
39382 }
39383@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39384 return NOTIFY_OK;
39385 }
39386
39387-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39388+static struct notifier_block cpufreq_cpu_notifier = {
39389 .notifier_call = cpufreq_cpu_callback,
39390 };
39391
39392@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39393 return 0;
39394
39395 write_lock_irqsave(&cpufreq_driver_lock, flags);
39396- cpufreq_driver->boost_enabled = state;
39397+ pax_open_kernel();
39398+ *(bool *)&cpufreq_driver->boost_enabled = state;
39399+ pax_close_kernel();
39400 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39401
39402 ret = cpufreq_driver->set_boost(state);
39403 if (ret) {
39404 write_lock_irqsave(&cpufreq_driver_lock, flags);
39405- cpufreq_driver->boost_enabled = !state;
39406+ pax_open_kernel();
39407+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39408+ pax_close_kernel();
39409 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39410
39411 pr_err("%s: Cannot %s BOOST\n",
39412@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39413 cpufreq_driver = driver_data;
39414 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39415
39416- if (driver_data->setpolicy)
39417- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39418+ if (driver_data->setpolicy) {
39419+ pax_open_kernel();
39420+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39421+ pax_close_kernel();
39422+ }
39423
39424 if (cpufreq_boost_supported()) {
39425 /*
39426 * Check if driver provides function to enable boost -
39427 * if not, use cpufreq_boost_set_sw as default
39428 */
39429- if (!cpufreq_driver->set_boost)
39430- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39431+ if (!cpufreq_driver->set_boost) {
39432+ pax_open_kernel();
39433+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39434+ pax_close_kernel();
39435+ }
39436
39437 ret = cpufreq_sysfs_create_file(&boost.attr);
39438 if (ret) {
39439diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39440index 1b44496..b80ff5e 100644
39441--- a/drivers/cpufreq/cpufreq_governor.c
39442+++ b/drivers/cpufreq/cpufreq_governor.c
39443@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39444 struct dbs_data *dbs_data;
39445 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39446 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39447- struct od_ops *od_ops = NULL;
39448+ const struct od_ops *od_ops = NULL;
39449 struct od_dbs_tuners *od_tuners = NULL;
39450 struct cs_dbs_tuners *cs_tuners = NULL;
39451 struct cpu_dbs_common_info *cpu_cdbs;
39452@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39453
39454 if ((cdata->governor == GOV_CONSERVATIVE) &&
39455 (!policy->governor->initialized)) {
39456- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39457+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39458
39459 cpufreq_register_notifier(cs_ops->notifier_block,
39460 CPUFREQ_TRANSITION_NOTIFIER);
39461@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39462
39463 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39464 (policy->governor->initialized == 1)) {
39465- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39466+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39467
39468 cpufreq_unregister_notifier(cs_ops->notifier_block,
39469 CPUFREQ_TRANSITION_NOTIFIER);
39470diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39471index cc401d1..8197340 100644
39472--- a/drivers/cpufreq/cpufreq_governor.h
39473+++ b/drivers/cpufreq/cpufreq_governor.h
39474@@ -212,7 +212,7 @@ struct common_dbs_data {
39475 void (*exit)(struct dbs_data *dbs_data);
39476
39477 /* Governor specific ops, see below */
39478- void *gov_ops;
39479+ const void *gov_ops;
39480 };
39481
39482 /* Governor Per policy data */
39483@@ -232,7 +232,7 @@ struct od_ops {
39484 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39485 unsigned int freq_next, unsigned int relation);
39486 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39487-};
39488+} __no_const;
39489
39490 struct cs_ops {
39491 struct notifier_block *notifier_block;
39492diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39493index ad3f38f..8f086cd 100644
39494--- a/drivers/cpufreq/cpufreq_ondemand.c
39495+++ b/drivers/cpufreq/cpufreq_ondemand.c
39496@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39497
39498 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39499
39500-static struct od_ops od_ops = {
39501+static struct od_ops od_ops __read_only = {
39502 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39503 .powersave_bias_target = generic_powersave_bias_target,
39504 .freq_increase = dbs_freq_increase,
39505@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39506 (struct cpufreq_policy *, unsigned int, unsigned int),
39507 unsigned int powersave_bias)
39508 {
39509- od_ops.powersave_bias_target = f;
39510+ pax_open_kernel();
39511+ *(void **)&od_ops.powersave_bias_target = f;
39512+ pax_close_kernel();
39513 od_set_powersave_bias(powersave_bias);
39514 }
39515 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39516
39517 void od_unregister_powersave_bias_handler(void)
39518 {
39519- od_ops.powersave_bias_target = generic_powersave_bias_target;
39520+ pax_open_kernel();
39521+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39522+ pax_close_kernel();
39523 od_set_powersave_bias(0);
39524 }
39525 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39526diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39527index 6f9d27f..14385d1 100644
39528--- a/drivers/cpufreq/intel_pstate.c
39529+++ b/drivers/cpufreq/intel_pstate.c
39530@@ -134,10 +134,10 @@ struct pstate_funcs {
39531 struct cpu_defaults {
39532 struct pstate_adjust_policy pid_policy;
39533 struct pstate_funcs funcs;
39534-};
39535+} __do_const;
39536
39537 static struct pstate_adjust_policy pid_params;
39538-static struct pstate_funcs pstate_funcs;
39539+static struct pstate_funcs *pstate_funcs;
39540 static int hwp_active;
39541
39542 struct perf_limits {
39543@@ -722,18 +722,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39544
39545 cpu->pstate.current_pstate = pstate;
39546
39547- pstate_funcs.set(cpu, pstate);
39548+ pstate_funcs->set(cpu, pstate);
39549 }
39550
39551 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39552 {
39553- cpu->pstate.min_pstate = pstate_funcs.get_min();
39554- cpu->pstate.max_pstate = pstate_funcs.get_max();
39555- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39556- cpu->pstate.scaling = pstate_funcs.get_scaling();
39557+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39558+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39559+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39560+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39561
39562- if (pstate_funcs.get_vid)
39563- pstate_funcs.get_vid(cpu);
39564+ if (pstate_funcs->get_vid)
39565+ pstate_funcs->get_vid(cpu);
39566 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39567 }
39568
39569@@ -1057,15 +1057,15 @@ static unsigned int force_load;
39570
39571 static int intel_pstate_msrs_not_valid(void)
39572 {
39573- if (!pstate_funcs.get_max() ||
39574- !pstate_funcs.get_min() ||
39575- !pstate_funcs.get_turbo())
39576+ if (!pstate_funcs->get_max() ||
39577+ !pstate_funcs->get_min() ||
39578+ !pstate_funcs->get_turbo())
39579 return -ENODEV;
39580
39581 return 0;
39582 }
39583
39584-static void copy_pid_params(struct pstate_adjust_policy *policy)
39585+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39586 {
39587 pid_params.sample_rate_ms = policy->sample_rate_ms;
39588 pid_params.p_gain_pct = policy->p_gain_pct;
39589@@ -1077,12 +1077,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39590
39591 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39592 {
39593- pstate_funcs.get_max = funcs->get_max;
39594- pstate_funcs.get_min = funcs->get_min;
39595- pstate_funcs.get_turbo = funcs->get_turbo;
39596- pstate_funcs.get_scaling = funcs->get_scaling;
39597- pstate_funcs.set = funcs->set;
39598- pstate_funcs.get_vid = funcs->get_vid;
39599+ pstate_funcs = funcs;
39600 }
39601
39602 #if IS_ENABLED(CONFIG_ACPI)
39603diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39604index 529cfd9..0e28fff 100644
39605--- a/drivers/cpufreq/p4-clockmod.c
39606+++ b/drivers/cpufreq/p4-clockmod.c
39607@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39608 case 0x0F: /* Core Duo */
39609 case 0x16: /* Celeron Core */
39610 case 0x1C: /* Atom */
39611- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39612+ pax_open_kernel();
39613+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39614+ pax_close_kernel();
39615 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39616 case 0x0D: /* Pentium M (Dothan) */
39617- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39618+ pax_open_kernel();
39619+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39620+ pax_close_kernel();
39621 /* fall through */
39622 case 0x09: /* Pentium M (Banias) */
39623 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39624@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39625
39626 /* on P-4s, the TSC runs with constant frequency independent whether
39627 * throttling is active or not. */
39628- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39629+ pax_open_kernel();
39630+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39631+ pax_close_kernel();
39632
39633 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39634 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39635diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39636index 9bb42ba..b01b4a2 100644
39637--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39638+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39639@@ -18,14 +18,12 @@
39640 #include <asm/head.h>
39641 #include <asm/timer.h>
39642
39643-static struct cpufreq_driver *cpufreq_us3_driver;
39644-
39645 struct us3_freq_percpu_info {
39646 struct cpufreq_frequency_table table[4];
39647 };
39648
39649 /* Indexed by cpu number. */
39650-static struct us3_freq_percpu_info *us3_freq_table;
39651+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39652
39653 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39654 * in the Safari config register.
39655@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39656
39657 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39658 {
39659- if (cpufreq_us3_driver)
39660- us3_freq_target(policy, 0);
39661+ us3_freq_target(policy, 0);
39662
39663 return 0;
39664 }
39665
39666+static int __init us3_freq_init(void);
39667+static void __exit us3_freq_exit(void);
39668+
39669+static struct cpufreq_driver cpufreq_us3_driver = {
39670+ .init = us3_freq_cpu_init,
39671+ .verify = cpufreq_generic_frequency_table_verify,
39672+ .target_index = us3_freq_target,
39673+ .get = us3_freq_get,
39674+ .exit = us3_freq_cpu_exit,
39675+ .name = "UltraSPARC-III",
39676+
39677+};
39678+
39679 static int __init us3_freq_init(void)
39680 {
39681 unsigned long manuf, impl, ver;
39682- int ret;
39683
39684 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39685 return -ENODEV;
39686@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39687 (impl == CHEETAH_IMPL ||
39688 impl == CHEETAH_PLUS_IMPL ||
39689 impl == JAGUAR_IMPL ||
39690- impl == PANTHER_IMPL)) {
39691- struct cpufreq_driver *driver;
39692-
39693- ret = -ENOMEM;
39694- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39695- if (!driver)
39696- goto err_out;
39697-
39698- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39699- GFP_KERNEL);
39700- if (!us3_freq_table)
39701- goto err_out;
39702-
39703- driver->init = us3_freq_cpu_init;
39704- driver->verify = cpufreq_generic_frequency_table_verify;
39705- driver->target_index = us3_freq_target;
39706- driver->get = us3_freq_get;
39707- driver->exit = us3_freq_cpu_exit;
39708- strcpy(driver->name, "UltraSPARC-III");
39709-
39710- cpufreq_us3_driver = driver;
39711- ret = cpufreq_register_driver(driver);
39712- if (ret)
39713- goto err_out;
39714-
39715- return 0;
39716-
39717-err_out:
39718- if (driver) {
39719- kfree(driver);
39720- cpufreq_us3_driver = NULL;
39721- }
39722- kfree(us3_freq_table);
39723- us3_freq_table = NULL;
39724- return ret;
39725- }
39726+ impl == PANTHER_IMPL))
39727+ return cpufreq_register_driver(&cpufreq_us3_driver);
39728
39729 return -ENODEV;
39730 }
39731
39732 static void __exit us3_freq_exit(void)
39733 {
39734- if (cpufreq_us3_driver) {
39735- cpufreq_unregister_driver(cpufreq_us3_driver);
39736- kfree(cpufreq_us3_driver);
39737- cpufreq_us3_driver = NULL;
39738- kfree(us3_freq_table);
39739- us3_freq_table = NULL;
39740- }
39741+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39742 }
39743
39744 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39745diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39746index 7d4a315..21bb886 100644
39747--- a/drivers/cpufreq/speedstep-centrino.c
39748+++ b/drivers/cpufreq/speedstep-centrino.c
39749@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39750 !cpu_has(cpu, X86_FEATURE_EST))
39751 return -ENODEV;
39752
39753- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39754- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39755+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39756+ pax_open_kernel();
39757+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39758+ pax_close_kernel();
39759+ }
39760
39761 if (policy->cpu != 0)
39762 return -ENODEV;
39763diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39764index 5db1478..e90e25e 100644
39765--- a/drivers/cpuidle/driver.c
39766+++ b/drivers/cpuidle/driver.c
39767@@ -193,7 +193,7 @@ static int poll_idle(struct cpuidle_device *dev,
39768
39769 static void poll_idle_init(struct cpuidle_driver *drv)
39770 {
39771- struct cpuidle_state *state = &drv->states[0];
39772+ cpuidle_state_no_const *state = &drv->states[0];
39773
39774 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39775 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39776diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39777index fb9f511..213e6cc 100644
39778--- a/drivers/cpuidle/governor.c
39779+++ b/drivers/cpuidle/governor.c
39780@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39781 mutex_lock(&cpuidle_lock);
39782 if (__cpuidle_find_governor(gov->name) == NULL) {
39783 ret = 0;
39784- list_add_tail(&gov->governor_list, &cpuidle_governors);
39785+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39786 if (!cpuidle_curr_governor ||
39787 cpuidle_curr_governor->rating < gov->rating)
39788 cpuidle_switch_governor(gov);
39789diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39790index 832a2c3..1794080 100644
39791--- a/drivers/cpuidle/sysfs.c
39792+++ b/drivers/cpuidle/sysfs.c
39793@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39794 NULL
39795 };
39796
39797-static struct attribute_group cpuidle_attr_group = {
39798+static attribute_group_no_const cpuidle_attr_group = {
39799 .attrs = cpuidle_default_attrs,
39800 .name = "cpuidle",
39801 };
39802diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39803index 8d2a772..33826c9 100644
39804--- a/drivers/crypto/hifn_795x.c
39805+++ b/drivers/crypto/hifn_795x.c
39806@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39807 MODULE_PARM_DESC(hifn_pll_ref,
39808 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39809
39810-static atomic_t hifn_dev_number;
39811+static atomic_unchecked_t hifn_dev_number;
39812
39813 #define ACRYPTO_OP_DECRYPT 0
39814 #define ACRYPTO_OP_ENCRYPT 1
39815@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39816 goto err_out_disable_pci_device;
39817
39818 snprintf(name, sizeof(name), "hifn%d",
39819- atomic_inc_return(&hifn_dev_number)-1);
39820+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39821
39822 err = pci_request_regions(pdev, name);
39823 if (err)
39824diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39825index ca1b362..01cae6a 100644
39826--- a/drivers/devfreq/devfreq.c
39827+++ b/drivers/devfreq/devfreq.c
39828@@ -672,7 +672,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39829 goto err_out;
39830 }
39831
39832- list_add(&governor->node, &devfreq_governor_list);
39833+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39834
39835 list_for_each_entry(devfreq, &devfreq_list, node) {
39836 int ret = 0;
39837@@ -760,7 +760,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39838 }
39839 }
39840
39841- list_del(&governor->node);
39842+ pax_list_del((struct list_head *)&governor->node);
39843 err_out:
39844 mutex_unlock(&devfreq_list_lock);
39845
39846diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39847index 10fcaba..326f709 100644
39848--- a/drivers/dma/sh/shdma-base.c
39849+++ b/drivers/dma/sh/shdma-base.c
39850@@ -227,8 +227,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39851 schan->slave_id = -EINVAL;
39852 }
39853
39854- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39855- sdev->desc_size, GFP_KERNEL);
39856+ schan->desc = kcalloc(sdev->desc_size,
39857+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39858 if (!schan->desc) {
39859 ret = -ENOMEM;
39860 goto edescalloc;
39861diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39862index 11707df..2ea96f7 100644
39863--- a/drivers/dma/sh/shdmac.c
39864+++ b/drivers/dma/sh/shdmac.c
39865@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39866 return ret;
39867 }
39868
39869-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39870+static struct notifier_block sh_dmae_nmi_notifier = {
39871 .notifier_call = sh_dmae_nmi_handler,
39872
39873 /* Run before NMI debug handler and KGDB */
39874diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39875index 592af5f..bb1d583 100644
39876--- a/drivers/edac/edac_device.c
39877+++ b/drivers/edac/edac_device.c
39878@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39879 */
39880 int edac_device_alloc_index(void)
39881 {
39882- static atomic_t device_indexes = ATOMIC_INIT(0);
39883+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39884
39885- return atomic_inc_return(&device_indexes) - 1;
39886+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39887 }
39888 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39889
39890diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39891index 112d63a..5443a61 100644
39892--- a/drivers/edac/edac_mc_sysfs.c
39893+++ b/drivers/edac/edac_mc_sysfs.c
39894@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39895 struct dev_ch_attribute {
39896 struct device_attribute attr;
39897 int channel;
39898-};
39899+} __do_const;
39900
39901 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39902 static struct dev_ch_attribute dev_attr_legacy_##_name = \
39903diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39904index 2cf44b4d..6dd2dc7 100644
39905--- a/drivers/edac/edac_pci.c
39906+++ b/drivers/edac/edac_pci.c
39907@@ -29,7 +29,7 @@
39908
39909 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39910 static LIST_HEAD(edac_pci_list);
39911-static atomic_t pci_indexes = ATOMIC_INIT(0);
39912+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39913
39914 /*
39915 * edac_pci_alloc_ctl_info
39916@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39917 */
39918 int edac_pci_alloc_index(void)
39919 {
39920- return atomic_inc_return(&pci_indexes) - 1;
39921+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
39922 }
39923 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39924
39925diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39926index 24d877f..4e30133 100644
39927--- a/drivers/edac/edac_pci_sysfs.c
39928+++ b/drivers/edac/edac_pci_sysfs.c
39929@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39930 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39931 static int edac_pci_poll_msec = 1000; /* one second workq period */
39932
39933-static atomic_t pci_parity_count = ATOMIC_INIT(0);
39934-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39935+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39936+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39937
39938 static struct kobject *edac_pci_top_main_kobj;
39939 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39940@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
39941 void *value;
39942 ssize_t(*show) (void *, char *);
39943 ssize_t(*store) (void *, const char *, size_t);
39944-};
39945+} __do_const;
39946
39947 /* Set of show/store abstract level functions for PCI Parity object */
39948 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39949@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39950 edac_printk(KERN_CRIT, EDAC_PCI,
39951 "Signaled System Error on %s\n",
39952 pci_name(dev));
39953- atomic_inc(&pci_nonparity_count);
39954+ atomic_inc_unchecked(&pci_nonparity_count);
39955 }
39956
39957 if (status & (PCI_STATUS_PARITY)) {
39958@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39959 "Master Data Parity Error on %s\n",
39960 pci_name(dev));
39961
39962- atomic_inc(&pci_parity_count);
39963+ atomic_inc_unchecked(&pci_parity_count);
39964 }
39965
39966 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39967@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39968 "Detected Parity Error on %s\n",
39969 pci_name(dev));
39970
39971- atomic_inc(&pci_parity_count);
39972+ atomic_inc_unchecked(&pci_parity_count);
39973 }
39974 }
39975
39976@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39977 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39978 "Signaled System Error on %s\n",
39979 pci_name(dev));
39980- atomic_inc(&pci_nonparity_count);
39981+ atomic_inc_unchecked(&pci_nonparity_count);
39982 }
39983
39984 if (status & (PCI_STATUS_PARITY)) {
39985@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39986 "Master Data Parity Error on "
39987 "%s\n", pci_name(dev));
39988
39989- atomic_inc(&pci_parity_count);
39990+ atomic_inc_unchecked(&pci_parity_count);
39991 }
39992
39993 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39994@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39995 "Detected Parity Error on %s\n",
39996 pci_name(dev));
39997
39998- atomic_inc(&pci_parity_count);
39999+ atomic_inc_unchecked(&pci_parity_count);
40000 }
40001 }
40002 }
40003@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40004 if (!check_pci_errors)
40005 return;
40006
40007- before_count = atomic_read(&pci_parity_count);
40008+ before_count = atomic_read_unchecked(&pci_parity_count);
40009
40010 /* scan all PCI devices looking for a Parity Error on devices and
40011 * bridges.
40012@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40013 /* Only if operator has selected panic on PCI Error */
40014 if (edac_pci_get_panic_on_pe()) {
40015 /* If the count is different 'after' from 'before' */
40016- if (before_count != atomic_read(&pci_parity_count))
40017+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40018 panic("EDAC: PCI Parity Error");
40019 }
40020 }
40021diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40022index c2359a1..8bd119d 100644
40023--- a/drivers/edac/mce_amd.h
40024+++ b/drivers/edac/mce_amd.h
40025@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40026 bool (*mc0_mce)(u16, u8);
40027 bool (*mc1_mce)(u16, u8);
40028 bool (*mc2_mce)(u16, u8);
40029-};
40030+} __no_const;
40031
40032 void amd_report_gart_errors(bool);
40033 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40034diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40035index 57ea7f4..af06b76 100644
40036--- a/drivers/firewire/core-card.c
40037+++ b/drivers/firewire/core-card.c
40038@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40039 const struct fw_card_driver *driver,
40040 struct device *device)
40041 {
40042- static atomic_t index = ATOMIC_INIT(-1);
40043+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40044
40045- card->index = atomic_inc_return(&index);
40046+ card->index = atomic_inc_return_unchecked(&index);
40047 card->driver = driver;
40048 card->device = device;
40049 card->current_tlabel = 0;
40050@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40051
40052 void fw_core_remove_card(struct fw_card *card)
40053 {
40054- struct fw_card_driver dummy_driver = dummy_driver_template;
40055+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40056
40057 card->driver->update_phy_reg(card, 4,
40058 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40059diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40060index f9e3aee..269dbdb 100644
40061--- a/drivers/firewire/core-device.c
40062+++ b/drivers/firewire/core-device.c
40063@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40064 struct config_rom_attribute {
40065 struct device_attribute attr;
40066 u32 key;
40067-};
40068+} __do_const;
40069
40070 static ssize_t show_immediate(struct device *dev,
40071 struct device_attribute *dattr, char *buf)
40072diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40073index d6a09b9..18e90dd 100644
40074--- a/drivers/firewire/core-transaction.c
40075+++ b/drivers/firewire/core-transaction.c
40076@@ -38,6 +38,7 @@
40077 #include <linux/timer.h>
40078 #include <linux/types.h>
40079 #include <linux/workqueue.h>
40080+#include <linux/sched.h>
40081
40082 #include <asm/byteorder.h>
40083
40084diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40085index e1480ff6..1a429bd 100644
40086--- a/drivers/firewire/core.h
40087+++ b/drivers/firewire/core.h
40088@@ -111,6 +111,7 @@ struct fw_card_driver {
40089
40090 int (*stop_iso)(struct fw_iso_context *ctx);
40091 };
40092+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40093
40094 void fw_card_initialize(struct fw_card *card,
40095 const struct fw_card_driver *driver, struct device *device);
40096diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40097index f51d376..b118e40 100644
40098--- a/drivers/firewire/ohci.c
40099+++ b/drivers/firewire/ohci.c
40100@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40101 be32_to_cpu(ohci->next_header));
40102 }
40103
40104+#ifndef CONFIG_GRKERNSEC
40105 if (param_remote_dma) {
40106 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40107 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40108 }
40109+#endif
40110
40111 spin_unlock_irq(&ohci->lock);
40112
40113@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40114 unsigned long flags;
40115 int n, ret = 0;
40116
40117+#ifndef CONFIG_GRKERNSEC
40118 if (param_remote_dma)
40119 return 0;
40120+#endif
40121
40122 /*
40123 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40124diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40125index 94a58a0..f5eba42 100644
40126--- a/drivers/firmware/dmi-id.c
40127+++ b/drivers/firmware/dmi-id.c
40128@@ -16,7 +16,7 @@
40129 struct dmi_device_attribute{
40130 struct device_attribute dev_attr;
40131 int field;
40132-};
40133+} __do_const;
40134 #define to_dmi_dev_attr(_dev_attr) \
40135 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40136
40137diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40138index d425374..1da1716 100644
40139--- a/drivers/firmware/efi/cper.c
40140+++ b/drivers/firmware/efi/cper.c
40141@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40142 */
40143 u64 cper_next_record_id(void)
40144 {
40145- static atomic64_t seq;
40146+ static atomic64_unchecked_t seq;
40147
40148- if (!atomic64_read(&seq))
40149- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40150+ if (!atomic64_read_unchecked(&seq))
40151+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40152
40153- return atomic64_inc_return(&seq);
40154+ return atomic64_inc_return_unchecked(&seq);
40155 }
40156 EXPORT_SYMBOL_GPL(cper_next_record_id);
40157
40158diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40159index 63226e9..302716e 100644
40160--- a/drivers/firmware/efi/efi.c
40161+++ b/drivers/firmware/efi/efi.c
40162@@ -164,14 +164,16 @@ static struct attribute_group efi_subsys_attr_group = {
40163 };
40164
40165 static struct efivars generic_efivars;
40166-static struct efivar_operations generic_ops;
40167+static efivar_operations_no_const generic_ops __read_only;
40168
40169 static int generic_ops_register(void)
40170 {
40171- generic_ops.get_variable = efi.get_variable;
40172- generic_ops.set_variable = efi.set_variable;
40173- generic_ops.get_next_variable = efi.get_next_variable;
40174- generic_ops.query_variable_store = efi_query_variable_store;
40175+ pax_open_kernel();
40176+ *(void **)&generic_ops.get_variable = efi.get_variable;
40177+ *(void **)&generic_ops.set_variable = efi.set_variable;
40178+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40179+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40180+ pax_close_kernel();
40181
40182 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40183 }
40184diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40185index 7b2e049..a253334 100644
40186--- a/drivers/firmware/efi/efivars.c
40187+++ b/drivers/firmware/efi/efivars.c
40188@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40189 static int
40190 create_efivars_bin_attributes(void)
40191 {
40192- struct bin_attribute *attr;
40193+ bin_attribute_no_const *attr;
40194 int error;
40195
40196 /* new_var */
40197diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40198index 5c55227..97f4978 100644
40199--- a/drivers/firmware/efi/runtime-map.c
40200+++ b/drivers/firmware/efi/runtime-map.c
40201@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40202 kfree(entry);
40203 }
40204
40205-static struct kobj_type __refdata map_ktype = {
40206+static const struct kobj_type __refconst map_ktype = {
40207 .sysfs_ops = &map_attr_ops,
40208 .default_attrs = def_attrs,
40209 .release = map_release,
40210diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40211index f1ab05e..ab51228 100644
40212--- a/drivers/firmware/google/gsmi.c
40213+++ b/drivers/firmware/google/gsmi.c
40214@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40215 return local_hash_64(input, 32);
40216 }
40217
40218-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40219+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40220 {
40221 .ident = "Google Board",
40222 .matches = {
40223diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40224index 2f569aa..26e4f39 100644
40225--- a/drivers/firmware/google/memconsole.c
40226+++ b/drivers/firmware/google/memconsole.c
40227@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40228 return false;
40229 }
40230
40231-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40232+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40233 {
40234 .ident = "Google Board",
40235 .matches = {
40236@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40237 if (!found_memconsole())
40238 return -ENODEV;
40239
40240- memconsole_bin_attr.size = memconsole_length;
40241+ pax_open_kernel();
40242+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40243+ pax_close_kernel();
40244+
40245 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40246 }
40247
40248diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40249index cc016c61..d35279e 100644
40250--- a/drivers/firmware/memmap.c
40251+++ b/drivers/firmware/memmap.c
40252@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40253 kfree(entry);
40254 }
40255
40256-static struct kobj_type __refdata memmap_ktype = {
40257+static const struct kobj_type __refconst memmap_ktype = {
40258 .release = release_firmware_map_entry,
40259 .sysfs_ops = &memmap_attr_ops,
40260 .default_attrs = def_attrs,
40261diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40262index 3cfcfc6..09d6f117 100644
40263--- a/drivers/gpio/gpio-em.c
40264+++ b/drivers/gpio/gpio-em.c
40265@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40266 struct em_gio_priv *p;
40267 struct resource *io[2], *irq[2];
40268 struct gpio_chip *gpio_chip;
40269- struct irq_chip *irq_chip;
40270+ irq_chip_no_const *irq_chip;
40271 const char *name = dev_name(&pdev->dev);
40272 int ret;
40273
40274diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40275index 4ba7ed5..1536b5d 100644
40276--- a/drivers/gpio/gpio-ich.c
40277+++ b/drivers/gpio/gpio-ich.c
40278@@ -94,7 +94,7 @@ struct ichx_desc {
40279 * this option allows driver caching written output values
40280 */
40281 bool use_outlvl_cache;
40282-};
40283+} __do_const;
40284
40285 static struct {
40286 spinlock_t lock;
40287diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40288index b232397..ce8c4dc 100644
40289--- a/drivers/gpio/gpio-omap.c
40290+++ b/drivers/gpio/gpio-omap.c
40291@@ -1054,7 +1054,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
40292 dev_err(bank->dev, "Could not get gpio dbck\n");
40293 }
40294
40295-static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
40296+static int omap_gpio_chip_init(struct gpio_bank *bank, irq_chip_no_const *irqc)
40297 {
40298 static int gpio;
40299 int irq_base = 0;
40300@@ -1137,7 +1137,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40301 const struct omap_gpio_platform_data *pdata;
40302 struct resource *res;
40303 struct gpio_bank *bank;
40304- struct irq_chip *irqc;
40305+ irq_chip_no_const *irqc;
40306 int ret;
40307
40308 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40309diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40310index 1e14a6c..0442450 100644
40311--- a/drivers/gpio/gpio-rcar.c
40312+++ b/drivers/gpio/gpio-rcar.c
40313@@ -379,7 +379,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40314 struct gpio_rcar_priv *p;
40315 struct resource *io, *irq;
40316 struct gpio_chip *gpio_chip;
40317- struct irq_chip *irq_chip;
40318+ irq_chip_no_const *irq_chip;
40319 struct device *dev = &pdev->dev;
40320 const char *name = dev_name(dev);
40321 int ret;
40322diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40323index c1caa45..f0f97d2 100644
40324--- a/drivers/gpio/gpio-vr41xx.c
40325+++ b/drivers/gpio/gpio-vr41xx.c
40326@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40327 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40328 maskl, pendl, maskh, pendh);
40329
40330- atomic_inc(&irq_err_count);
40331+ atomic_inc_unchecked(&irq_err_count);
40332
40333 return -EINVAL;
40334 }
40335diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40336index 6bc612b..3932464 100644
40337--- a/drivers/gpio/gpiolib.c
40338+++ b/drivers/gpio/gpiolib.c
40339@@ -558,8 +558,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40340 }
40341
40342 if (gpiochip->irqchip) {
40343- gpiochip->irqchip->irq_request_resources = NULL;
40344- gpiochip->irqchip->irq_release_resources = NULL;
40345+ pax_open_kernel();
40346+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40347+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40348+ pax_close_kernel();
40349 gpiochip->irqchip = NULL;
40350 }
40351 }
40352@@ -625,8 +627,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40353 gpiochip->irqchip = NULL;
40354 return -EINVAL;
40355 }
40356- irqchip->irq_request_resources = gpiochip_irq_reqres;
40357- irqchip->irq_release_resources = gpiochip_irq_relres;
40358+
40359+ pax_open_kernel();
40360+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40361+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40362+ pax_close_kernel();
40363
40364 /*
40365 * Prepare the mapping since the irqchip shall be orthogonal to
40366diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40367index 488f51d..301d462 100644
40368--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40369+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40370@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40371 enum cache_policy alternate_policy,
40372 void __user *alternate_aperture_base,
40373 uint64_t alternate_aperture_size);
40374-};
40375+} __no_const;
40376
40377 /**
40378 * struct device_queue_manager
40379diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40380index 5940531..a75b0e5 100644
40381--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40382+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40383@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40384
40385 void (*submit_packet)(struct kernel_queue *kq);
40386 void (*rollback_packet)(struct kernel_queue *kq);
40387-};
40388+} __no_const;
40389
40390 struct kernel_queue {
40391 struct kernel_queue_ops ops;
40392diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40393index 9b23525..65f4110 100644
40394--- a/drivers/gpu/drm/drm_context.c
40395+++ b/drivers/gpu/drm/drm_context.c
40396@@ -53,6 +53,9 @@ struct drm_ctx_list {
40397 */
40398 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40399 {
40400+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40401+ return;
40402+
40403 mutex_lock(&dev->struct_mutex);
40404 idr_remove(&dev->ctx_idr, ctx_handle);
40405 mutex_unlock(&dev->struct_mutex);
40406@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40407 */
40408 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40409 {
40410+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40411+ return -EINVAL;
40412+
40413 idr_init(&dev->ctx_idr);
40414 return 0;
40415 }
40416@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40417 */
40418 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40419 {
40420+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40421+ return;
40422+
40423 mutex_lock(&dev->struct_mutex);
40424 idr_destroy(&dev->ctx_idr);
40425 mutex_unlock(&dev->struct_mutex);
40426@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40427 {
40428 struct drm_ctx_list *pos, *tmp;
40429
40430+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40431+ return;
40432+
40433 mutex_lock(&dev->ctxlist_mutex);
40434
40435 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40436 if (pos->tag == file &&
40437- pos->handle != DRM_KERNEL_CONTEXT) {
40438+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40439 if (dev->driver->context_dtor)
40440 dev->driver->context_dtor(dev, pos->handle);
40441
40442@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40443 struct drm_local_map *map;
40444 struct drm_map_list *_entry;
40445
40446+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40447+ return -EINVAL;
40448+
40449 mutex_lock(&dev->struct_mutex);
40450
40451 map = idr_find(&dev->ctx_idr, request->ctx_id);
40452@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40453 struct drm_local_map *map = NULL;
40454 struct drm_map_list *r_list = NULL;
40455
40456+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40457+ return -EINVAL;
40458+
40459 mutex_lock(&dev->struct_mutex);
40460 list_for_each_entry(r_list, &dev->maplist, head) {
40461 if (r_list->map
40462@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40463 {
40464 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40465
40466- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40467+ if (file_priv->master->lock.hw_lock == NULL) {
40468+ DRM_ERROR(
40469+ "Device has been unregistered. Hard exit. Process %d\n",
40470+ task_pid_nr(current));
40471+ send_sig(SIGTERM, current, 0);
40472+ return -EPERM;
40473+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40474 DRM_ERROR("Lock isn't held after context switch\n");
40475 }
40476
40477@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40478 struct drm_ctx ctx;
40479 int i;
40480
40481+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40482+ return -EINVAL;
40483+
40484 if (res->count >= DRM_RESERVED_CONTEXTS) {
40485 memset(&ctx, 0, sizeof(ctx));
40486 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40487@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40488 struct drm_ctx_list *ctx_entry;
40489 struct drm_ctx *ctx = data;
40490
40491+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40492+ return -EINVAL;
40493+
40494 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40495- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40496+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40497 /* Skip kernel's context and get a new one. */
40498 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40499 }
40500@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40501 {
40502 struct drm_ctx *ctx = data;
40503
40504+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40505+ return -EINVAL;
40506+
40507 /* This is 0, because we don't handle any context flags */
40508 ctx->flags = 0;
40509
40510@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40511 {
40512 struct drm_ctx *ctx = data;
40513
40514+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40515+ return -EINVAL;
40516+
40517 DRM_DEBUG("%d\n", ctx->handle);
40518 return drm_context_switch(dev, dev->last_context, ctx->handle);
40519 }
40520@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40521 {
40522 struct drm_ctx *ctx = data;
40523
40524+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40525+ return -EINVAL;
40526+
40527 DRM_DEBUG("%d\n", ctx->handle);
40528 drm_context_switch_complete(dev, file_priv, ctx->handle);
40529
40530@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40531 {
40532 struct drm_ctx *ctx = data;
40533
40534+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40535+ return -EINVAL;
40536+
40537 DRM_DEBUG("%d\n", ctx->handle);
40538- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40539+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40540 if (dev->driver->context_dtor)
40541 dev->driver->context_dtor(dev, ctx->handle);
40542 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40543diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40544index 800a025..c88f1a4 100644
40545--- a/drivers/gpu/drm/drm_crtc.c
40546+++ b/drivers/gpu/drm/drm_crtc.c
40547@@ -4179,7 +4179,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40548 goto done;
40549 }
40550
40551- if (copy_to_user(&enum_ptr[copied].name,
40552+ if (copy_to_user(enum_ptr[copied].name,
40553 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40554 ret = -EFAULT;
40555 goto done;
40556diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40557index 48f7359..8c3b594 100644
40558--- a/drivers/gpu/drm/drm_drv.c
40559+++ b/drivers/gpu/drm/drm_drv.c
40560@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40561
40562 drm_device_set_unplugged(dev);
40563
40564- if (dev->open_count == 0) {
40565+ if (local_read(&dev->open_count) == 0) {
40566 drm_put_dev(dev);
40567 }
40568 mutex_unlock(&drm_global_mutex);
40569@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40570 if (drm_ht_create(&dev->map_hash, 12))
40571 goto err_minors;
40572
40573- ret = drm_legacy_ctxbitmap_init(dev);
40574- if (ret) {
40575- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40576- goto err_ht;
40577+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40578+ ret = drm_legacy_ctxbitmap_init(dev);
40579+ if (ret) {
40580+ DRM_ERROR(
40581+ "Cannot allocate memory for context bitmap.\n");
40582+ goto err_ht;
40583+ }
40584 }
40585
40586 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40587diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40588index 076dd60..e4a4ba7 100644
40589--- a/drivers/gpu/drm/drm_fops.c
40590+++ b/drivers/gpu/drm/drm_fops.c
40591@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40592 return PTR_ERR(minor);
40593
40594 dev = minor->dev;
40595- if (!dev->open_count++)
40596+ if (local_inc_return(&dev->open_count) == 1)
40597 need_setup = 1;
40598
40599 /* share address_space across all char-devs of a single device */
40600@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40601 return 0;
40602
40603 err_undo:
40604- dev->open_count--;
40605+ local_dec(&dev->open_count);
40606 drm_minor_release(minor);
40607 return retcode;
40608 }
40609@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40610
40611 mutex_lock(&drm_global_mutex);
40612
40613- DRM_DEBUG("open_count = %d\n", dev->open_count);
40614+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40615
40616 mutex_lock(&dev->struct_mutex);
40617 list_del(&file_priv->lhead);
40618@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40619 * Begin inline drm_release
40620 */
40621
40622- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40623+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40624 task_pid_nr(current),
40625 (long)old_encode_dev(file_priv->minor->kdev->devt),
40626- dev->open_count);
40627+ local_read(&dev->open_count));
40628
40629 /* Release any auth tokens that might point to this file_priv,
40630 (do that under the drm_global_mutex) */
40631@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40632 * End inline drm_release
40633 */
40634
40635- if (!--dev->open_count) {
40636+ if (local_dec_and_test(&dev->open_count)) {
40637 retcode = drm_lastclose(dev);
40638 if (drm_device_is_unplugged(dev))
40639 drm_put_dev(dev);
40640diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40641index 3d2e91c..d31c4c9 100644
40642--- a/drivers/gpu/drm/drm_global.c
40643+++ b/drivers/gpu/drm/drm_global.c
40644@@ -36,7 +36,7 @@
40645 struct drm_global_item {
40646 struct mutex mutex;
40647 void *object;
40648- int refcount;
40649+ atomic_t refcount;
40650 };
40651
40652 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40653@@ -49,7 +49,7 @@ void drm_global_init(void)
40654 struct drm_global_item *item = &glob[i];
40655 mutex_init(&item->mutex);
40656 item->object = NULL;
40657- item->refcount = 0;
40658+ atomic_set(&item->refcount, 0);
40659 }
40660 }
40661
40662@@ -59,7 +59,7 @@ void drm_global_release(void)
40663 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40664 struct drm_global_item *item = &glob[i];
40665 BUG_ON(item->object != NULL);
40666- BUG_ON(item->refcount != 0);
40667+ BUG_ON(atomic_read(&item->refcount) != 0);
40668 }
40669 }
40670
40671@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40672 struct drm_global_item *item = &glob[ref->global_type];
40673
40674 mutex_lock(&item->mutex);
40675- if (item->refcount == 0) {
40676+ if (atomic_read(&item->refcount) == 0) {
40677 item->object = kzalloc(ref->size, GFP_KERNEL);
40678 if (unlikely(item->object == NULL)) {
40679 ret = -ENOMEM;
40680@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40681 goto out_err;
40682
40683 }
40684- ++item->refcount;
40685+ atomic_inc(&item->refcount);
40686 ref->object = item->object;
40687 mutex_unlock(&item->mutex);
40688 return 0;
40689@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40690 struct drm_global_item *item = &glob[ref->global_type];
40691
40692 mutex_lock(&item->mutex);
40693- BUG_ON(item->refcount == 0);
40694+ BUG_ON(atomic_read(&item->refcount) == 0);
40695 BUG_ON(ref->object != item->object);
40696- if (--item->refcount == 0) {
40697+ if (atomic_dec_and_test(&item->refcount)) {
40698 ref->release(ref);
40699 item->object = NULL;
40700 }
40701diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40702index cbb4fc0..5c756cb9 100644
40703--- a/drivers/gpu/drm/drm_info.c
40704+++ b/drivers/gpu/drm/drm_info.c
40705@@ -77,10 +77,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40706 struct drm_local_map *map;
40707 struct drm_map_list *r_list;
40708
40709- /* Hardcoded from _DRM_FRAME_BUFFER,
40710- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40711- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40712- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40713+ static const char * const types[] = {
40714+ [_DRM_FRAME_BUFFER] = "FB",
40715+ [_DRM_REGISTERS] = "REG",
40716+ [_DRM_SHM] = "SHM",
40717+ [_DRM_AGP] = "AGP",
40718+ [_DRM_SCATTER_GATHER] = "SG",
40719+ [_DRM_CONSISTENT] = "PCI"};
40720 const char *type;
40721 int i;
40722
40723@@ -91,7 +94,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40724 map = r_list->map;
40725 if (!map)
40726 continue;
40727- if (map->type < 0 || map->type > 5)
40728+ if (map->type >= ARRAY_SIZE(types))
40729 type = "??";
40730 else
40731 type = types[map->type];
40732diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40733index 9cfcd0a..7142a7f 100644
40734--- a/drivers/gpu/drm/drm_ioc32.c
40735+++ b/drivers/gpu/drm/drm_ioc32.c
40736@@ -459,7 +459,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40737 request = compat_alloc_user_space(nbytes);
40738 if (!access_ok(VERIFY_WRITE, request, nbytes))
40739 return -EFAULT;
40740- list = (struct drm_buf_desc *) (request + 1);
40741+ list = (struct drm_buf_desc __user *) (request + 1);
40742
40743 if (__put_user(count, &request->count)
40744 || __put_user(list, &request->list))
40745@@ -520,7 +520,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40746 request = compat_alloc_user_space(nbytes);
40747 if (!access_ok(VERIFY_WRITE, request, nbytes))
40748 return -EFAULT;
40749- list = (struct drm_buf_pub *) (request + 1);
40750+ list = (struct drm_buf_pub __user *) (request + 1);
40751
40752 if (__put_user(count, &request->count)
40753 || __put_user(list, &request->list))
40754@@ -1075,7 +1075,7 @@ static int compat_drm_mode_addfb2(struct file *file, unsigned int cmd,
40755 return 0;
40756 }
40757
40758-static drm_ioctl_compat_t *drm_compat_ioctls[] = {
40759+static drm_ioctl_compat_t drm_compat_ioctls[] = {
40760 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40761 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40762 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40763@@ -1122,7 +1122,6 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = {
40764 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40765 {
40766 unsigned int nr = DRM_IOCTL_NR(cmd);
40767- drm_ioctl_compat_t *fn;
40768 int ret;
40769
40770 /* Assume that ioctls without an explicit compat routine will just
40771@@ -1132,10 +1131,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40772 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40773 return drm_ioctl(filp, cmd, arg);
40774
40775- fn = drm_compat_ioctls[nr];
40776-
40777- if (fn != NULL)
40778- ret = (*fn) (filp, cmd, arg);
40779+ if (drm_compat_ioctls[nr] != NULL)
40780+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40781 else
40782 ret = drm_ioctl(filp, cmd, arg);
40783
40784diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40785index 266dcd6..d0194d9 100644
40786--- a/drivers/gpu/drm/drm_ioctl.c
40787+++ b/drivers/gpu/drm/drm_ioctl.c
40788@@ -663,7 +663,7 @@ long drm_ioctl(struct file *filp,
40789 struct drm_file *file_priv = filp->private_data;
40790 struct drm_device *dev;
40791 const struct drm_ioctl_desc *ioctl = NULL;
40792- drm_ioctl_t *func;
40793+ drm_ioctl_no_const_t func;
40794 unsigned int nr = DRM_IOCTL_NR(cmd);
40795 int retcode = -EINVAL;
40796 char stack_kdata[128];
40797diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
40798index f861361..b61d4c7 100644
40799--- a/drivers/gpu/drm/drm_lock.c
40800+++ b/drivers/gpu/drm/drm_lock.c
40801@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
40802 struct drm_master *master = file_priv->master;
40803 int ret = 0;
40804
40805+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40806+ return -EINVAL;
40807+
40808 ++file_priv->lock_count;
40809
40810- if (lock->context == DRM_KERNEL_CONTEXT) {
40811+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
40812 DRM_ERROR("Process %d using kernel context %d\n",
40813 task_pid_nr(current), lock->context);
40814 return -EINVAL;
40815@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
40816 struct drm_lock *lock = data;
40817 struct drm_master *master = file_priv->master;
40818
40819- if (lock->context == DRM_KERNEL_CONTEXT) {
40820+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40821+ return -EINVAL;
40822+
40823+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
40824 DRM_ERROR("Process %d using kernel context %d\n",
40825 task_pid_nr(current), lock->context);
40826 return -EINVAL;
40827 }
40828
40829+ if (!master->lock.hw_lock) {
40830+ DRM_ERROR(
40831+ "Device has been unregistered. Hard exit. Process %d\n",
40832+ task_pid_nr(current));
40833+ send_sig(SIGTERM, current, 0);
40834+ return -EPERM;
40835+ }
40836+
40837 if (drm_legacy_lock_free(&master->lock, lock->context)) {
40838 /* FIXME: Should really bail out here. */
40839 }
40840diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40841index d4813e0..6c1ab4d 100644
40842--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40843+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40844@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
40845 u32 pipeconf_reg = PIPEACONF;
40846 u32 dspcntr_reg = DSPACNTR;
40847
40848- u32 pipeconf = dev_priv->pipeconf[pipe];
40849- u32 dspcntr = dev_priv->dspcntr[pipe];
40850+ u32 pipeconf;
40851+ u32 dspcntr;
40852 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
40853
40854+ if (pipe == -1)
40855+ return;
40856+
40857+ pipeconf = dev_priv->pipeconf[pipe];
40858+ dspcntr = dev_priv->dspcntr[pipe];
40859+
40860 if (pipe) {
40861 pipeconf_reg = PIPECCONF;
40862 dspcntr_reg = DSPCCNTR;
40863diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40864index 93ec5dc..82acbaf 100644
40865--- a/drivers/gpu/drm/i810/i810_drv.h
40866+++ b/drivers/gpu/drm/i810/i810_drv.h
40867@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40868 int page_flipping;
40869
40870 wait_queue_head_t irq_queue;
40871- atomic_t irq_received;
40872- atomic_t irq_emitted;
40873+ atomic_unchecked_t irq_received;
40874+ atomic_unchecked_t irq_emitted;
40875
40876 int front_offset;
40877 } drm_i810_private_t;
40878diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40879index 68e0c85..3303192 100644
40880--- a/drivers/gpu/drm/i915/i915_dma.c
40881+++ b/drivers/gpu/drm/i915/i915_dma.c
40882@@ -162,6 +162,8 @@ static int i915_getparam(struct drm_device *dev, void *data,
40883 value = INTEL_INFO(dev)->eu_total;
40884 if (!value)
40885 return -ENODEV;
40886+ case I915_PARAM_HAS_LEGACY_CONTEXT:
40887+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
40888 break;
40889 default:
40890 DRM_DEBUG("Unknown parameter %d\n", param->param);
40891@@ -376,7 +378,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40892 * locking inversion with the driver load path. And the access here is
40893 * completely racy anyway. So don't bother with locking for now.
40894 */
40895- return dev->open_count == 0;
40896+ return local_read(&dev->open_count) == 0;
40897 }
40898
40899 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40900diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40901index a3190e79..86b06cb 100644
40902--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40903+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40904@@ -936,12 +936,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40905 static int
40906 validate_exec_list(struct drm_device *dev,
40907 struct drm_i915_gem_exec_object2 *exec,
40908- int count)
40909+ unsigned int count)
40910 {
40911 unsigned relocs_total = 0;
40912 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40913 unsigned invalid_flags;
40914- int i;
40915+ unsigned int i;
40916
40917 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40918 if (USES_FULL_PPGTT(dev))
40919diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40920index 23aa04c..1d25960 100644
40921--- a/drivers/gpu/drm/i915/i915_ioc32.c
40922+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40923@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
40924 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
40925 || __put_user(batchbuffer32.num_cliprects,
40926 &batchbuffer->num_cliprects)
40927- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
40928+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
40929 &batchbuffer->cliprects))
40930 return -EFAULT;
40931
40932@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
40933
40934 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
40935 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
40936- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
40937+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
40938 &cmdbuffer->buf)
40939 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
40940 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
40941 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
40942 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
40943- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
40944+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
40945 &cmdbuffer->cliprects))
40946 return -EFAULT;
40947
40948@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40949 (unsigned long)request);
40950 }
40951
40952-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40953+static drm_ioctl_compat_t i915_compat_ioctls[] = {
40954 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40955 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40956 [DRM_I915_GETPARAM] = compat_i915_getparam,
40957@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40958 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40959 {
40960 unsigned int nr = DRM_IOCTL_NR(cmd);
40961- drm_ioctl_compat_t *fn = NULL;
40962 int ret;
40963
40964 if (nr < DRM_COMMAND_BASE || nr >= DRM_COMMAND_END)
40965 return drm_compat_ioctl(filp, cmd, arg);
40966
40967- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40968- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40969-
40970- if (fn != NULL)
40971- ret = (*fn) (filp, cmd, arg);
40972+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
40973+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
40974 else
40975 ret = drm_ioctl(filp, cmd, arg);
40976
40977diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40978index 57c8878..8ef38a7 100644
40979--- a/drivers/gpu/drm/i915/intel_display.c
40980+++ b/drivers/gpu/drm/i915/intel_display.c
40981@@ -13617,13 +13617,13 @@ struct intel_quirk {
40982 int subsystem_vendor;
40983 int subsystem_device;
40984 void (*hook)(struct drm_device *dev);
40985-};
40986+} __do_const;
40987
40988 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40989 struct intel_dmi_quirk {
40990 void (*hook)(struct drm_device *dev);
40991 const struct dmi_system_id (*dmi_id_list)[];
40992-};
40993+} __do_const;
40994
40995 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40996 {
40997@@ -13631,18 +13631,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40998 return 1;
40999 }
41000
41001-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41002+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41003 {
41004- .dmi_id_list = &(const struct dmi_system_id[]) {
41005- {
41006- .callback = intel_dmi_reverse_brightness,
41007- .ident = "NCR Corporation",
41008- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41009- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41010- },
41011- },
41012- { } /* terminating entry */
41013+ .callback = intel_dmi_reverse_brightness,
41014+ .ident = "NCR Corporation",
41015+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41016+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41017 },
41018+ },
41019+ { } /* terminating entry */
41020+};
41021+
41022+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41023+ {
41024+ .dmi_id_list = &intel_dmi_quirks_table,
41025 .hook = quirk_invert_brightness,
41026 },
41027 };
41028diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41029index 74f505b..21f6914 100644
41030--- a/drivers/gpu/drm/imx/imx-drm-core.c
41031+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41032@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41033 if (imxdrm->pipes >= MAX_CRTC)
41034 return -EINVAL;
41035
41036- if (imxdrm->drm->open_count)
41037+ if (local_read(&imxdrm->drm->open_count))
41038 return -EBUSY;
41039
41040 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41041diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41042index b4a20149..219ab78 100644
41043--- a/drivers/gpu/drm/mga/mga_drv.h
41044+++ b/drivers/gpu/drm/mga/mga_drv.h
41045@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41046 u32 clear_cmd;
41047 u32 maccess;
41048
41049- atomic_t vbl_received; /**< Number of vblanks received. */
41050+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41051 wait_queue_head_t fence_queue;
41052- atomic_t last_fence_retired;
41053+ atomic_unchecked_t last_fence_retired;
41054 u32 next_fence_to_post;
41055
41056 unsigned int fb_cpp;
41057diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41058index 729bfd5..14bae78 100644
41059--- a/drivers/gpu/drm/mga/mga_ioc32.c
41060+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41061@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41062 return 0;
41063 }
41064
41065-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41066+drm_ioctl_compat_t mga_compat_ioctls[] = {
41067 [DRM_MGA_INIT] = compat_mga_init,
41068 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41069 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41070@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41071 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41072 {
41073 unsigned int nr = DRM_IOCTL_NR(cmd);
41074- drm_ioctl_compat_t *fn = NULL;
41075 int ret;
41076
41077 if (nr < DRM_COMMAND_BASE)
41078 return drm_compat_ioctl(filp, cmd, arg);
41079
41080- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41081- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41082-
41083- if (fn != NULL)
41084- ret = (*fn) (filp, cmd, arg);
41085+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41086+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41087 else
41088 ret = drm_ioctl(filp, cmd, arg);
41089
41090diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41091index 1b071b8..de8601a 100644
41092--- a/drivers/gpu/drm/mga/mga_irq.c
41093+++ b/drivers/gpu/drm/mga/mga_irq.c
41094@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41095 if (crtc != 0)
41096 return 0;
41097
41098- return atomic_read(&dev_priv->vbl_received);
41099+ return atomic_read_unchecked(&dev_priv->vbl_received);
41100 }
41101
41102
41103@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41104 /* VBLANK interrupt */
41105 if (status & MGA_VLINEPEN) {
41106 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41107- atomic_inc(&dev_priv->vbl_received);
41108+ atomic_inc_unchecked(&dev_priv->vbl_received);
41109 drm_handle_vblank(dev, 0);
41110 handled = 1;
41111 }
41112@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41113 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41114 MGA_WRITE(MGA_PRIMEND, prim_end);
41115
41116- atomic_inc(&dev_priv->last_fence_retired);
41117+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41118 wake_up(&dev_priv->fence_queue);
41119 handled = 1;
41120 }
41121@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41122 * using fences.
41123 */
41124 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41125- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41126+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41127 - *sequence) <= (1 << 23)));
41128
41129 *sequence = cur_fence;
41130diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41131index 0190b69..60c3eaf 100644
41132--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41133+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41134@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41135 struct bit_table {
41136 const char id;
41137 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41138-};
41139+} __no_const;
41140
41141 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41142
41143diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41144index cd6dae0..f25eb48 100644
41145--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41146+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41147@@ -943,7 +943,8 @@ static struct drm_driver
41148 driver_stub = {
41149 .driver_features =
41150 DRIVER_USE_AGP |
41151- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41152+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41153+ DRIVER_KMS_LEGACY_CONTEXT,
41154
41155 .load = nouveau_drm_load,
41156 .unload = nouveau_drm_unload,
41157diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41158index dd72652..1fd2368 100644
41159--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41160+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41161@@ -123,7 +123,6 @@ struct nouveau_drm {
41162 struct drm_global_reference mem_global_ref;
41163 struct ttm_bo_global_ref bo_global_ref;
41164 struct ttm_bo_device bdev;
41165- atomic_t validate_sequence;
41166 int (*move)(struct nouveau_channel *,
41167 struct ttm_buffer_object *,
41168 struct ttm_mem_reg *, struct ttm_mem_reg *);
41169diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41170index 462679a..88e32a7 100644
41171--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41172+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41173@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41174 unsigned long arg)
41175 {
41176 unsigned int nr = DRM_IOCTL_NR(cmd);
41177- drm_ioctl_compat_t *fn = NULL;
41178+ drm_ioctl_compat_t fn = NULL;
41179 int ret;
41180
41181 if (nr < DRM_COMMAND_BASE)
41182diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41183index 18f4497..10f6025 100644
41184--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41185+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41186@@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41187 }
41188
41189 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41190- nouveau_vram_manager_init,
41191- nouveau_vram_manager_fini,
41192- nouveau_vram_manager_new,
41193- nouveau_vram_manager_del,
41194- nouveau_vram_manager_debug
41195+ .init = nouveau_vram_manager_init,
41196+ .takedown = nouveau_vram_manager_fini,
41197+ .get_node = nouveau_vram_manager_new,
41198+ .put_node = nouveau_vram_manager_del,
41199+ .debug = nouveau_vram_manager_debug
41200 };
41201
41202 static int
41203@@ -198,11 +198,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41204 }
41205
41206 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41207- nouveau_gart_manager_init,
41208- nouveau_gart_manager_fini,
41209- nouveau_gart_manager_new,
41210- nouveau_gart_manager_del,
41211- nouveau_gart_manager_debug
41212+ .init = nouveau_gart_manager_init,
41213+ .takedown = nouveau_gart_manager_fini,
41214+ .get_node = nouveau_gart_manager_new,
41215+ .put_node = nouveau_gart_manager_del,
41216+ .debug = nouveau_gart_manager_debug
41217 };
41218
41219 /*XXX*/
41220@@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41221 }
41222
41223 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41224- nv04_gart_manager_init,
41225- nv04_gart_manager_fini,
41226- nv04_gart_manager_new,
41227- nv04_gart_manager_del,
41228- nv04_gart_manager_debug
41229+ .init = nv04_gart_manager_init,
41230+ .takedown = nv04_gart_manager_fini,
41231+ .get_node = nv04_gart_manager_new,
41232+ .put_node = nv04_gart_manager_del,
41233+ .debug = nv04_gart_manager_debug
41234 };
41235
41236 int
41237diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41238index c7592ec..dd45ebc 100644
41239--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41240+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41241@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41242 * locking inversion with the driver load path. And the access here is
41243 * completely racy anyway. So don't bother with locking for now.
41244 */
41245- return dev->open_count == 0;
41246+ return local_read(&dev->open_count) == 0;
41247 }
41248
41249 static const struct vga_switcheroo_client_ops
41250diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41251index f33251d..22f6cb1 100644
41252--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41253+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41254@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41255 int ret;
41256
41257 mutex_lock(&qdev->async_io_mutex);
41258- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41259+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41260 if (qdev->last_sent_io_cmd > irq_num) {
41261 if (intr)
41262 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41263- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41264+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41265 else
41266 ret = wait_event_timeout(qdev->io_cmd_event,
41267- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41268+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41269 /* 0 is timeout, just bail the "hw" has gone away */
41270 if (ret <= 0)
41271 goto out;
41272- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41273+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41274 }
41275 outb(val, addr);
41276 qdev->last_sent_io_cmd = irq_num + 1;
41277 if (intr)
41278 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41279- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41280+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41281 else
41282 ret = wait_event_timeout(qdev->io_cmd_event,
41283- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41284+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41285 out:
41286 if (ret > 0)
41287 ret = 0;
41288diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41289index 6911b8c..89d6867 100644
41290--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41291+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41292@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41293 struct drm_info_node *node = (struct drm_info_node *) m->private;
41294 struct qxl_device *qdev = node->minor->dev->dev_private;
41295
41296- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41297- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41298- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41299- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41300+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41301+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41302+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41303+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41304 seq_printf(m, "%d\n", qdev->irq_received_error);
41305 return 0;
41306 }
41307diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41308index 7c6cafe..460f542 100644
41309--- a/drivers/gpu/drm/qxl/qxl_drv.h
41310+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41311@@ -290,10 +290,10 @@ struct qxl_device {
41312 unsigned int last_sent_io_cmd;
41313
41314 /* interrupt handling */
41315- atomic_t irq_received;
41316- atomic_t irq_received_display;
41317- atomic_t irq_received_cursor;
41318- atomic_t irq_received_io_cmd;
41319+ atomic_unchecked_t irq_received;
41320+ atomic_unchecked_t irq_received_display;
41321+ atomic_unchecked_t irq_received_cursor;
41322+ atomic_unchecked_t irq_received_io_cmd;
41323 unsigned irq_received_error;
41324 wait_queue_head_t display_event;
41325 wait_queue_head_t cursor_event;
41326diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41327index 7354a4c..f37d7f9 100644
41328--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41329+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41330@@ -183,7 +183,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41331
41332 /* TODO copy slow path code from i915 */
41333 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41334- 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);
41335+ 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);
41336
41337 {
41338 struct qxl_drawable *draw = fb_cmd;
41339@@ -203,7 +203,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41340 struct drm_qxl_reloc reloc;
41341
41342 if (copy_from_user(&reloc,
41343- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41344+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41345 sizeof(reloc))) {
41346 ret = -EFAULT;
41347 goto out_free_bos;
41348@@ -296,10 +296,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41349
41350 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41351
41352- struct drm_qxl_command *commands =
41353- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41354+ struct drm_qxl_command __user *commands =
41355+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41356
41357- if (copy_from_user(&user_cmd, &commands[cmd_num],
41358+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41359 sizeof(user_cmd)))
41360 return -EFAULT;
41361
41362diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41363index 0bf1e20..42a7310 100644
41364--- a/drivers/gpu/drm/qxl/qxl_irq.c
41365+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41366@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41367 if (!pending)
41368 return IRQ_NONE;
41369
41370- atomic_inc(&qdev->irq_received);
41371+ atomic_inc_unchecked(&qdev->irq_received);
41372
41373 if (pending & QXL_INTERRUPT_DISPLAY) {
41374- atomic_inc(&qdev->irq_received_display);
41375+ atomic_inc_unchecked(&qdev->irq_received_display);
41376 wake_up_all(&qdev->display_event);
41377 qxl_queue_garbage_collect(qdev, false);
41378 }
41379 if (pending & QXL_INTERRUPT_CURSOR) {
41380- atomic_inc(&qdev->irq_received_cursor);
41381+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41382 wake_up_all(&qdev->cursor_event);
41383 }
41384 if (pending & QXL_INTERRUPT_IO_CMD) {
41385- atomic_inc(&qdev->irq_received_io_cmd);
41386+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41387 wake_up_all(&qdev->io_cmd_event);
41388 }
41389 if (pending & QXL_INTERRUPT_ERROR) {
41390@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41391 init_waitqueue_head(&qdev->io_cmd_event);
41392 INIT_WORK(&qdev->client_monitors_config_work,
41393 qxl_client_monitors_config_work_func);
41394- atomic_set(&qdev->irq_received, 0);
41395- atomic_set(&qdev->irq_received_display, 0);
41396- atomic_set(&qdev->irq_received_cursor, 0);
41397- atomic_set(&qdev->irq_received_io_cmd, 0);
41398+ atomic_set_unchecked(&qdev->irq_received, 0);
41399+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41400+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41401+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41402 qdev->irq_received_error = 0;
41403 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41404 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41405diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41406index 0cbc4c9..0e46686 100644
41407--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41408+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41409@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41410 }
41411 }
41412
41413-static struct vm_operations_struct qxl_ttm_vm_ops;
41414+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41415 static const struct vm_operations_struct *ttm_vm_ops;
41416
41417 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41418@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41419 return r;
41420 if (unlikely(ttm_vm_ops == NULL)) {
41421 ttm_vm_ops = vma->vm_ops;
41422+ pax_open_kernel();
41423 qxl_ttm_vm_ops = *ttm_vm_ops;
41424 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41425+ pax_close_kernel();
41426 }
41427 vma->vm_ops = &qxl_ttm_vm_ops;
41428 return 0;
41429@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41430 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41431 {
41432 #if defined(CONFIG_DEBUG_FS)
41433- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41434- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41435- unsigned i;
41436+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41437+ {
41438+ .name = "qxl_mem_mm",
41439+ .show = &qxl_mm_dump_table,
41440+ },
41441+ {
41442+ .name = "qxl_surf_mm",
41443+ .show = &qxl_mm_dump_table,
41444+ }
41445+ };
41446
41447- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41448- if (i == 0)
41449- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41450- else
41451- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41452- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41453- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41454- qxl_mem_types_list[i].driver_features = 0;
41455- if (i == 0)
41456- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41457- else
41458- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41459+ pax_open_kernel();
41460+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41461+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41462+ pax_close_kernel();
41463
41464- }
41465- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41466+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41467 #else
41468 return 0;
41469 #endif
41470diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41471index 2c45ac9..5d740f8 100644
41472--- a/drivers/gpu/drm/r128/r128_cce.c
41473+++ b/drivers/gpu/drm/r128/r128_cce.c
41474@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41475
41476 /* GH: Simple idle check.
41477 */
41478- atomic_set(&dev_priv->idle_count, 0);
41479+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41480
41481 /* We don't support anything other than bus-mastering ring mode,
41482 * but the ring can be in either AGP or PCI space for the ring
41483diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41484index 723e5d6..102dbaf 100644
41485--- a/drivers/gpu/drm/r128/r128_drv.h
41486+++ b/drivers/gpu/drm/r128/r128_drv.h
41487@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41488 int is_pci;
41489 unsigned long cce_buffers_offset;
41490
41491- atomic_t idle_count;
41492+ atomic_unchecked_t idle_count;
41493
41494 int page_flipping;
41495 int current_page;
41496 u32 crtc_offset;
41497 u32 crtc_offset_cntl;
41498
41499- atomic_t vbl_received;
41500+ atomic_unchecked_t vbl_received;
41501
41502 u32 color_fmt;
41503 unsigned int front_offset;
41504diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41505index 663f38c..ec159a1 100644
41506--- a/drivers/gpu/drm/r128/r128_ioc32.c
41507+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41508@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41509 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41510 }
41511
41512-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41513+drm_ioctl_compat_t r128_compat_ioctls[] = {
41514 [DRM_R128_INIT] = compat_r128_init,
41515 [DRM_R128_DEPTH] = compat_r128_depth,
41516 [DRM_R128_STIPPLE] = compat_r128_stipple,
41517@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41518 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41519 {
41520 unsigned int nr = DRM_IOCTL_NR(cmd);
41521- drm_ioctl_compat_t *fn = NULL;
41522 int ret;
41523
41524 if (nr < DRM_COMMAND_BASE)
41525 return drm_compat_ioctl(filp, cmd, arg);
41526
41527- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41528- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41529-
41530- if (fn != NULL)
41531- ret = (*fn) (filp, cmd, arg);
41532+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41533+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41534 else
41535 ret = drm_ioctl(filp, cmd, arg);
41536
41537diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41538index c2ae496..30b5993 100644
41539--- a/drivers/gpu/drm/r128/r128_irq.c
41540+++ b/drivers/gpu/drm/r128/r128_irq.c
41541@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41542 if (crtc != 0)
41543 return 0;
41544
41545- return atomic_read(&dev_priv->vbl_received);
41546+ return atomic_read_unchecked(&dev_priv->vbl_received);
41547 }
41548
41549 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41550@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41551 /* VBLANK interrupt */
41552 if (status & R128_CRTC_VBLANK_INT) {
41553 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41554- atomic_inc(&dev_priv->vbl_received);
41555+ atomic_inc_unchecked(&dev_priv->vbl_received);
41556 drm_handle_vblank(dev, 0);
41557 return IRQ_HANDLED;
41558 }
41559diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41560index 8fd2d9f..18c9660 100644
41561--- a/drivers/gpu/drm/r128/r128_state.c
41562+++ b/drivers/gpu/drm/r128/r128_state.c
41563@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41564
41565 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41566 {
41567- if (atomic_read(&dev_priv->idle_count) == 0)
41568+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41569 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41570 else
41571- atomic_set(&dev_priv->idle_count, 0);
41572+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41573 }
41574
41575 #endif
41576diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41577index b928c17..e5d9400 100644
41578--- a/drivers/gpu/drm/radeon/mkregtable.c
41579+++ b/drivers/gpu/drm/radeon/mkregtable.c
41580@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41581 regex_t mask_rex;
41582 regmatch_t match[4];
41583 char buf[1024];
41584- size_t end;
41585+ long end;
41586 int len;
41587 int done = 0;
41588 int r;
41589 unsigned o;
41590 struct offset *offset;
41591 char last_reg_s[10];
41592- int last_reg;
41593+ unsigned long last_reg;
41594
41595 if (regcomp
41596 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41597diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41598index 604c44d..6eb6c4b 100644
41599--- a/drivers/gpu/drm/radeon/radeon_device.c
41600+++ b/drivers/gpu/drm/radeon/radeon_device.c
41601@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41602 * locking inversion with the driver load path. And the access here is
41603 * completely racy anyway. So don't bother with locking for now.
41604 */
41605- return dev->open_count == 0;
41606+ return local_read(&dev->open_count) == 0;
41607 }
41608
41609 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41610diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41611index 46bd393..6ae4719 100644
41612--- a/drivers/gpu/drm/radeon/radeon_drv.h
41613+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41614@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41615
41616 /* SW interrupt */
41617 wait_queue_head_t swi_queue;
41618- atomic_t swi_emitted;
41619+ atomic_unchecked_t swi_emitted;
41620 int vblank_crtc;
41621 uint32_t irq_enable_reg;
41622 uint32_t r500_disp_irq_reg;
41623diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41624index 0b98ea1..a3c770f 100644
41625--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41626+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41627@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41628 request = compat_alloc_user_space(sizeof(*request));
41629 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41630 || __put_user(req32.param, &request->param)
41631- || __put_user((void __user *)(unsigned long)req32.value,
41632+ || __put_user((unsigned long)req32.value,
41633 &request->value))
41634 return -EFAULT;
41635
41636@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41637 #define compat_radeon_cp_setparam NULL
41638 #endif /* X86_64 || IA64 */
41639
41640-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41641+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41642 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41643 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41644 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41645@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41646 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41647 {
41648 unsigned int nr = DRM_IOCTL_NR(cmd);
41649- drm_ioctl_compat_t *fn = NULL;
41650 int ret;
41651
41652 if (nr < DRM_COMMAND_BASE)
41653 return drm_compat_ioctl(filp, cmd, arg);
41654
41655- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41656- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41657-
41658- if (fn != NULL)
41659- ret = (*fn) (filp, cmd, arg);
41660+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
41661+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41662 else
41663 ret = drm_ioctl(filp, cmd, arg);
41664
41665diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41666index 244b19b..c19226d 100644
41667--- a/drivers/gpu/drm/radeon/radeon_irq.c
41668+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41669@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41670 unsigned int ret;
41671 RING_LOCALS;
41672
41673- atomic_inc(&dev_priv->swi_emitted);
41674- ret = atomic_read(&dev_priv->swi_emitted);
41675+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41676+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41677
41678 BEGIN_RING(4);
41679 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41680@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41681 drm_radeon_private_t *dev_priv =
41682 (drm_radeon_private_t *) dev->dev_private;
41683
41684- atomic_set(&dev_priv->swi_emitted, 0);
41685+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41686 init_waitqueue_head(&dev_priv->swi_queue);
41687
41688 dev->max_vblank_count = 0x001fffff;
41689diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41690index 15aee72..cda326e 100644
41691--- a/drivers/gpu/drm/radeon/radeon_state.c
41692+++ b/drivers/gpu/drm/radeon/radeon_state.c
41693@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41694 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41695 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41696
41697- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41698+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41699 sarea_priv->nbox * sizeof(depth_boxes[0])))
41700 return -EFAULT;
41701
41702@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41703 {
41704 drm_radeon_private_t *dev_priv = dev->dev_private;
41705 drm_radeon_getparam_t *param = data;
41706- int value;
41707+ int value = 0;
41708
41709 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41710
41711diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41712index edafd3c..3af7c9c 100644
41713--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41714+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41715@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41716 man->size = size >> PAGE_SHIFT;
41717 }
41718
41719-static struct vm_operations_struct radeon_ttm_vm_ops;
41720+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41721 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41722
41723 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41724@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41725 }
41726 if (unlikely(ttm_vm_ops == NULL)) {
41727 ttm_vm_ops = vma->vm_ops;
41728+ pax_open_kernel();
41729 radeon_ttm_vm_ops = *ttm_vm_ops;
41730 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41731+ pax_close_kernel();
41732 }
41733 vma->vm_ops = &radeon_ttm_vm_ops;
41734 return 0;
41735diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41736index a287e4f..df1d5dd 100644
41737--- a/drivers/gpu/drm/tegra/dc.c
41738+++ b/drivers/gpu/drm/tegra/dc.c
41739@@ -1594,7 +1594,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41740 }
41741
41742 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41743- dc->debugfs_files[i].data = dc;
41744+ *(void **)&dc->debugfs_files[i].data = dc;
41745
41746 err = drm_debugfs_create_files(dc->debugfs_files,
41747 ARRAY_SIZE(debugfs_files),
41748diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41749index ed970f6..4eeea42 100644
41750--- a/drivers/gpu/drm/tegra/dsi.c
41751+++ b/drivers/gpu/drm/tegra/dsi.c
41752@@ -62,7 +62,7 @@ struct tegra_dsi {
41753 struct clk *clk_lp;
41754 struct clk *clk;
41755
41756- struct drm_info_list *debugfs_files;
41757+ drm_info_list_no_const *debugfs_files;
41758 struct drm_minor *minor;
41759 struct dentry *debugfs;
41760
41761diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41762index 06ab178..b5324e4 100644
41763--- a/drivers/gpu/drm/tegra/hdmi.c
41764+++ b/drivers/gpu/drm/tegra/hdmi.c
41765@@ -64,7 +64,7 @@ struct tegra_hdmi {
41766 bool stereo;
41767 bool dvi;
41768
41769- struct drm_info_list *debugfs_files;
41770+ drm_info_list_no_const *debugfs_files;
41771 struct drm_minor *minor;
41772 struct dentry *debugfs;
41773 };
41774diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
41775index 7591d89..463e2b6 100644
41776--- a/drivers/gpu/drm/tegra/sor.c
41777+++ b/drivers/gpu/drm/tegra/sor.c
41778@@ -826,8 +826,11 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor,
41779 goto remove;
41780 }
41781
41782- for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41783- sor->debugfs_files[i].data = sor;
41784+ for (i = 0; i < ARRAY_SIZE(debugfs_files); i++) {
41785+ pax_open_kernel();
41786+ *(void **)&sor->debugfs_files[i].data = sor;
41787+ pax_close_kernel();
41788+ }
41789
41790 err = drm_debugfs_create_files(sor->debugfs_files,
41791 ARRAY_SIZE(debugfs_files),
41792diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41793index aa0bd054..aea6a01 100644
41794--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41795+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41796@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41797 }
41798
41799 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41800- ttm_bo_man_init,
41801- ttm_bo_man_takedown,
41802- ttm_bo_man_get_node,
41803- ttm_bo_man_put_node,
41804- ttm_bo_man_debug
41805+ .init = ttm_bo_man_init,
41806+ .takedown = ttm_bo_man_takedown,
41807+ .get_node = ttm_bo_man_get_node,
41808+ .put_node = ttm_bo_man_put_node,
41809+ .debug = ttm_bo_man_debug
41810 };
41811 EXPORT_SYMBOL(ttm_bo_manager_func);
41812diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41813index a1803fb..c53f6b0 100644
41814--- a/drivers/gpu/drm/ttm/ttm_memory.c
41815+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41816@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41817 zone->glob = glob;
41818 glob->zone_kernel = zone;
41819 ret = kobject_init_and_add(
41820- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41821+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41822 if (unlikely(ret != 0)) {
41823 kobject_put(&zone->kobj);
41824 return ret;
41825@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41826 zone->glob = glob;
41827 glob->zone_dma32 = zone;
41828 ret = kobject_init_and_add(
41829- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41830+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41831 if (unlikely(ret != 0)) {
41832 kobject_put(&zone->kobj);
41833 return ret;
41834diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41835index 025c429..314062f 100644
41836--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41837+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41838@@ -54,7 +54,7 @@
41839
41840 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41841 #define SMALL_ALLOCATION 16
41842-#define FREE_ALL_PAGES (~0U)
41843+#define FREE_ALL_PAGES (~0UL)
41844 /* times are in msecs */
41845 #define PAGE_FREE_INTERVAL 1000
41846
41847@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41848 * @free_all: If set to true will free all pages in pool
41849 * @use_static: Safe to use static buffer
41850 **/
41851-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41852+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41853 bool use_static)
41854 {
41855 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41856 unsigned long irq_flags;
41857 struct page *p;
41858 struct page **pages_to_free;
41859- unsigned freed_pages = 0,
41860- npages_to_free = nr_free;
41861+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41862
41863 if (NUM_PAGES_TO_ALLOC < nr_free)
41864 npages_to_free = NUM_PAGES_TO_ALLOC;
41865@@ -371,7 +370,8 @@ restart:
41866 __list_del(&p->lru, &pool->list);
41867
41868 ttm_pool_update_free_locked(pool, freed_pages);
41869- nr_free -= freed_pages;
41870+ if (likely(nr_free != FREE_ALL_PAGES))
41871+ nr_free -= freed_pages;
41872 }
41873
41874 spin_unlock_irqrestore(&pool->lock, irq_flags);
41875@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41876 unsigned i;
41877 unsigned pool_offset;
41878 struct ttm_page_pool *pool;
41879- int shrink_pages = sc->nr_to_scan;
41880+ unsigned long shrink_pages = sc->nr_to_scan;
41881 unsigned long freed = 0;
41882
41883 if (!mutex_trylock(&lock))
41884@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41885 pool_offset = ++start_pool % NUM_POOLS;
41886 /* select start pool in round robin fashion */
41887 for (i = 0; i < NUM_POOLS; ++i) {
41888- unsigned nr_free = shrink_pages;
41889+ unsigned long nr_free = shrink_pages;
41890 if (shrink_pages == 0)
41891 break;
41892 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41893@@ -673,7 +673,7 @@ out:
41894 }
41895
41896 /* Put all pages in pages list to correct pool to wait for reuse */
41897-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41898+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41899 enum ttm_caching_state cstate)
41900 {
41901 unsigned long irq_flags;
41902@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41903 struct list_head plist;
41904 struct page *p = NULL;
41905 gfp_t gfp_flags = GFP_USER;
41906- unsigned count;
41907+ unsigned long count;
41908 int r;
41909
41910 /* set zero flag for page allocation if required */
41911diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41912index 01e1d27..aaa018a 100644
41913--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41914+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41915@@ -56,7 +56,7 @@
41916
41917 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41918 #define SMALL_ALLOCATION 4
41919-#define FREE_ALL_PAGES (~0U)
41920+#define FREE_ALL_PAGES (~0UL)
41921 /* times are in msecs */
41922 #define IS_UNDEFINED (0)
41923 #define IS_WC (1<<1)
41924@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41925 * @nr_free: If set to true will free all pages in pool
41926 * @use_static: Safe to use static buffer
41927 **/
41928-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41929+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41930 bool use_static)
41931 {
41932 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41933@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41934 struct dma_page *dma_p, *tmp;
41935 struct page **pages_to_free;
41936 struct list_head d_pages;
41937- unsigned freed_pages = 0,
41938- npages_to_free = nr_free;
41939+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41940
41941 if (NUM_PAGES_TO_ALLOC < nr_free)
41942 npages_to_free = NUM_PAGES_TO_ALLOC;
41943@@ -499,7 +498,8 @@ restart:
41944 /* remove range of pages from the pool */
41945 if (freed_pages) {
41946 ttm_pool_update_free_locked(pool, freed_pages);
41947- nr_free -= freed_pages;
41948+ if (likely(nr_free != FREE_ALL_PAGES))
41949+ nr_free -= freed_pages;
41950 }
41951
41952 spin_unlock_irqrestore(&pool->lock, irq_flags);
41953@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41954 struct dma_page *d_page, *next;
41955 enum pool_type type;
41956 bool is_cached = false;
41957- unsigned count = 0, i, npages = 0;
41958+ unsigned long count = 0, i, npages = 0;
41959 unsigned long irq_flags;
41960
41961 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41962@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41963 static unsigned start_pool;
41964 unsigned idx = 0;
41965 unsigned pool_offset;
41966- unsigned shrink_pages = sc->nr_to_scan;
41967+ unsigned long shrink_pages = sc->nr_to_scan;
41968 struct device_pools *p;
41969 unsigned long freed = 0;
41970
41971@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41972 goto out;
41973 pool_offset = ++start_pool % _manager->npools;
41974 list_for_each_entry(p, &_manager->pools, pools) {
41975- unsigned nr_free;
41976+ unsigned long nr_free;
41977
41978 if (!p->dev)
41979 continue;
41980@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41981 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
41982 freed += nr_free - shrink_pages;
41983
41984- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41985+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41986 p->pool->dev_name, p->pool->name, current->pid,
41987 nr_free, shrink_pages);
41988 }
41989diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41990index 5fc16ce..1bd84ec 100644
41991--- a/drivers/gpu/drm/udl/udl_fb.c
41992+++ b/drivers/gpu/drm/udl/udl_fb.c
41993@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41994 fb_deferred_io_cleanup(info);
41995 kfree(info->fbdefio);
41996 info->fbdefio = NULL;
41997- info->fbops->fb_mmap = udl_fb_mmap;
41998 }
41999
42000 pr_warn("released /dev/fb%d user=%d count=%d\n",
42001diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42002index ef8c500..01030c8 100644
42003--- a/drivers/gpu/drm/via/via_drv.h
42004+++ b/drivers/gpu/drm/via/via_drv.h
42005@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42006 typedef uint32_t maskarray_t[5];
42007
42008 typedef struct drm_via_irq {
42009- atomic_t irq_received;
42010+ atomic_unchecked_t irq_received;
42011 uint32_t pending_mask;
42012 uint32_t enable_mask;
42013 wait_queue_head_t irq_queue;
42014@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42015 struct timeval last_vblank;
42016 int last_vblank_valid;
42017 unsigned usec_per_vblank;
42018- atomic_t vbl_received;
42019+ atomic_unchecked_t vbl_received;
42020 drm_via_state_t hc_state;
42021 char pci_buf[VIA_PCI_BUF_SIZE];
42022 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42023diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42024index 1319433..a993b0c 100644
42025--- a/drivers/gpu/drm/via/via_irq.c
42026+++ b/drivers/gpu/drm/via/via_irq.c
42027@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42028 if (crtc != 0)
42029 return 0;
42030
42031- return atomic_read(&dev_priv->vbl_received);
42032+ return atomic_read_unchecked(&dev_priv->vbl_received);
42033 }
42034
42035 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42036@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42037
42038 status = VIA_READ(VIA_REG_INTERRUPT);
42039 if (status & VIA_IRQ_VBLANK_PENDING) {
42040- atomic_inc(&dev_priv->vbl_received);
42041- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42042+ atomic_inc_unchecked(&dev_priv->vbl_received);
42043+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42044 do_gettimeofday(&cur_vblank);
42045 if (dev_priv->last_vblank_valid) {
42046 dev_priv->usec_per_vblank =
42047@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42048 dev_priv->last_vblank = cur_vblank;
42049 dev_priv->last_vblank_valid = 1;
42050 }
42051- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42052+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42053 DRM_DEBUG("US per vblank is: %u\n",
42054 dev_priv->usec_per_vblank);
42055 }
42056@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42057
42058 for (i = 0; i < dev_priv->num_irqs; ++i) {
42059 if (status & cur_irq->pending_mask) {
42060- atomic_inc(&cur_irq->irq_received);
42061+ atomic_inc_unchecked(&cur_irq->irq_received);
42062 wake_up(&cur_irq->irq_queue);
42063 handled = 1;
42064 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42065@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42066 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42067 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42068 masks[irq][4]));
42069- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42070+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42071 } else {
42072 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42073 (((cur_irq_sequence =
42074- atomic_read(&cur_irq->irq_received)) -
42075+ atomic_read_unchecked(&cur_irq->irq_received)) -
42076 *sequence) <= (1 << 23)));
42077 }
42078 *sequence = cur_irq_sequence;
42079@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42080 }
42081
42082 for (i = 0; i < dev_priv->num_irqs; ++i) {
42083- atomic_set(&cur_irq->irq_received, 0);
42084+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42085 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42086 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42087 init_waitqueue_head(&cur_irq->irq_queue);
42088@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42089 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42090 case VIA_IRQ_RELATIVE:
42091 irqwait->request.sequence +=
42092- atomic_read(&cur_irq->irq_received);
42093+ atomic_read_unchecked(&cur_irq->irq_received);
42094 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42095 case VIA_IRQ_ABSOLUTE:
42096 break;
42097diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42098index d26a6da..5fa41ed 100644
42099--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42100+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42101@@ -447,7 +447,7 @@ struct vmw_private {
42102 * Fencing and IRQs.
42103 */
42104
42105- atomic_t marker_seq;
42106+ atomic_unchecked_t marker_seq;
42107 wait_queue_head_t fence_queue;
42108 wait_queue_head_t fifo_queue;
42109 spinlock_t waiter_lock;
42110diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42111index 39f2b03..d1b0a64 100644
42112--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42113+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42114@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42115 (unsigned int) min,
42116 (unsigned int) fifo->capabilities);
42117
42118- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42119+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42120 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42121 vmw_marker_queue_init(&fifo->marker_queue);
42122 return vmw_fifo_send_fence(dev_priv, &dummy);
42123@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42124 if (reserveable)
42125 iowrite32(bytes, fifo_mem +
42126 SVGA_FIFO_RESERVED);
42127- return fifo_mem + (next_cmd >> 2);
42128+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42129 } else {
42130 need_bounce = true;
42131 }
42132@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42133
42134 fm = vmw_fifo_reserve(dev_priv, bytes);
42135 if (unlikely(fm == NULL)) {
42136- *seqno = atomic_read(&dev_priv->marker_seq);
42137+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42138 ret = -ENOMEM;
42139 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42140 false, 3*HZ);
42141@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42142 }
42143
42144 do {
42145- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42146+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42147 } while (*seqno == 0);
42148
42149 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42150diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42151index 170b61b..fec7348 100644
42152--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42153+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42154@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42155 }
42156
42157 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42158- vmw_gmrid_man_init,
42159- vmw_gmrid_man_takedown,
42160- vmw_gmrid_man_get_node,
42161- vmw_gmrid_man_put_node,
42162- vmw_gmrid_man_debug
42163+ .init = vmw_gmrid_man_init,
42164+ .takedown = vmw_gmrid_man_takedown,
42165+ .get_node = vmw_gmrid_man_get_node,
42166+ .put_node = vmw_gmrid_man_put_node,
42167+ .debug = vmw_gmrid_man_debug
42168 };
42169diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42170index 69c8ce2..cacb0ab 100644
42171--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42172+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42173@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42174 int ret;
42175
42176 num_clips = arg->num_clips;
42177- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42178+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42179
42180 if (unlikely(num_clips == 0))
42181 return 0;
42182@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42183 int ret;
42184
42185 num_clips = arg->num_clips;
42186- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42187+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42188
42189 if (unlikely(num_clips == 0))
42190 return 0;
42191diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42192index 9fe9827..0aa2fc0 100644
42193--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42194+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42195@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42196 * emitted. Then the fence is stale and signaled.
42197 */
42198
42199- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42200+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42201 > VMW_FENCE_WRAP);
42202
42203 return ret;
42204@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42205
42206 if (fifo_idle)
42207 down_read(&fifo_state->rwsem);
42208- signal_seq = atomic_read(&dev_priv->marker_seq);
42209+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42210 ret = 0;
42211
42212 for (;;) {
42213diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42214index efd1ffd..0ae13ca 100644
42215--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42216+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42217@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42218 while (!vmw_lag_lt(queue, us)) {
42219 spin_lock(&queue->lock);
42220 if (list_empty(&queue->head))
42221- seqno = atomic_read(&dev_priv->marker_seq);
42222+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42223 else {
42224 marker = list_first_entry(&queue->head,
42225 struct vmw_marker, head);
42226diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42227index 37ac7b5..d52a5c9 100644
42228--- a/drivers/gpu/vga/vga_switcheroo.c
42229+++ b/drivers/gpu/vga/vga_switcheroo.c
42230@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42231
42232 /* this version is for the case where the power switch is separate
42233 to the device being powered down. */
42234-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42235+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42236 {
42237 /* copy over all the bus versions */
42238 if (dev->bus && dev->bus->pm) {
42239@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42240 return ret;
42241 }
42242
42243-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42244+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42245 {
42246 /* copy over all the bus versions */
42247 if (dev->bus && dev->bus->pm) {
42248diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42249index 722a925..594c312 100644
42250--- a/drivers/hid/hid-core.c
42251+++ b/drivers/hid/hid-core.c
42252@@ -2552,7 +2552,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42253
42254 int hid_add_device(struct hid_device *hdev)
42255 {
42256- static atomic_t id = ATOMIC_INIT(0);
42257+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42258 int ret;
42259
42260 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42261@@ -2595,7 +2595,7 @@ int hid_add_device(struct hid_device *hdev)
42262 /* XXX hack, any other cleaner solution after the driver core
42263 * is converted to allow more than 20 bytes as the device name? */
42264 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42265- hdev->vendor, hdev->product, atomic_inc_return(&id));
42266+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42267
42268 hid_debug_register(hdev, dev_name(&hdev->dev));
42269 ret = device_add(&hdev->dev);
42270diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
42271index 5614fee..8301fbf 100644
42272--- a/drivers/hid/hid-sensor-custom.c
42273+++ b/drivers/hid/hid-sensor-custom.c
42274@@ -34,7 +34,7 @@ struct hid_sensor_custom_field {
42275 int report_id;
42276 char group_name[HID_CUSTOM_NAME_LENGTH];
42277 struct hid_sensor_hub_attribute_info attribute;
42278- struct device_attribute sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42279+ device_attribute_no_const sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42280 char attr_name[HID_CUSTOM_TOTAL_ATTRS][HID_CUSTOM_NAME_LENGTH];
42281 struct attribute *attrs[HID_CUSTOM_TOTAL_ATTRS];
42282 struct attribute_group hid_custom_attribute_group;
42283@@ -590,7 +590,7 @@ static int hid_sensor_custom_add_attributes(struct hid_sensor_custom
42284 j = 0;
42285 while (j < HID_CUSTOM_TOTAL_ATTRS &&
42286 hid_custom_attrs[j].name) {
42287- struct device_attribute *device_attr;
42288+ device_attribute_no_const *device_attr;
42289
42290 device_attr = &sensor_inst->fields[i].sd_attrs[j];
42291
42292diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42293index c13fb5b..55a3802 100644
42294--- a/drivers/hid/hid-wiimote-debug.c
42295+++ b/drivers/hid/hid-wiimote-debug.c
42296@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42297 else if (size == 0)
42298 return -EIO;
42299
42300- if (copy_to_user(u, buf, size))
42301+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42302 return -EFAULT;
42303
42304 *off += size;
42305diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42306index 54da66d..aa3a3d7 100644
42307--- a/drivers/hv/channel.c
42308+++ b/drivers/hv/channel.c
42309@@ -373,7 +373,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42310 int ret = 0;
42311
42312 next_gpadl_handle =
42313- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42314+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42315
42316 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42317 if (ret)
42318diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42319index d3943bc..3de28a9 100644
42320--- a/drivers/hv/hv.c
42321+++ b/drivers/hv/hv.c
42322@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42323 u64 output_address = (output) ? virt_to_phys(output) : 0;
42324 u32 output_address_hi = output_address >> 32;
42325 u32 output_address_lo = output_address & 0xFFFFFFFF;
42326- void *hypercall_page = hv_context.hypercall_page;
42327+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42328
42329 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42330 "=a"(hv_status_lo) : "d" (control_hi),
42331@@ -164,7 +164,7 @@ int hv_init(void)
42332 /* See if the hypercall page is already set */
42333 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42334
42335- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42336+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42337
42338 if (!virtaddr)
42339 goto cleanup;
42340diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42341index cb5b7dc..6052f22 100644
42342--- a/drivers/hv/hv_balloon.c
42343+++ b/drivers/hv/hv_balloon.c
42344@@ -469,7 +469,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42345
42346 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42347 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42348-static atomic_t trans_id = ATOMIC_INIT(0);
42349+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42350
42351 static int dm_ring_size = (5 * PAGE_SIZE);
42352
42353@@ -941,7 +941,7 @@ static void hot_add_req(struct work_struct *dummy)
42354 pr_info("Memory hot add failed\n");
42355
42356 dm->state = DM_INITIALIZED;
42357- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42358+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42359 vmbus_sendpacket(dm->dev->channel, &resp,
42360 sizeof(struct dm_hot_add_response),
42361 (unsigned long)NULL,
42362@@ -1022,7 +1022,7 @@ static void post_status(struct hv_dynmem_device *dm)
42363 memset(&status, 0, sizeof(struct dm_status));
42364 status.hdr.type = DM_STATUS_REPORT;
42365 status.hdr.size = sizeof(struct dm_status);
42366- status.hdr.trans_id = atomic_inc_return(&trans_id);
42367+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42368
42369 /*
42370 * The host expects the guest to report free and committed memory.
42371@@ -1046,7 +1046,7 @@ static void post_status(struct hv_dynmem_device *dm)
42372 * send the status. This can happen if we were interrupted
42373 * after we picked our transaction ID.
42374 */
42375- if (status.hdr.trans_id != atomic_read(&trans_id))
42376+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42377 return;
42378
42379 /*
42380@@ -1191,7 +1191,7 @@ static void balloon_up(struct work_struct *dummy)
42381 */
42382
42383 do {
42384- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42385+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42386 ret = vmbus_sendpacket(dm_device.dev->channel,
42387 bl_resp,
42388 bl_resp->hdr.size,
42389@@ -1237,7 +1237,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42390
42391 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42392 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42393- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42394+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42395 resp.hdr.size = sizeof(struct dm_unballoon_response);
42396
42397 vmbus_sendpacket(dm_device.dev->channel, &resp,
42398@@ -1298,7 +1298,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42399 memset(&version_req, 0, sizeof(struct dm_version_request));
42400 version_req.hdr.type = DM_VERSION_REQUEST;
42401 version_req.hdr.size = sizeof(struct dm_version_request);
42402- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42403+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42404 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42405 version_req.is_last_attempt = 1;
42406
42407@@ -1471,7 +1471,7 @@ static int balloon_probe(struct hv_device *dev,
42408 memset(&version_req, 0, sizeof(struct dm_version_request));
42409 version_req.hdr.type = DM_VERSION_REQUEST;
42410 version_req.hdr.size = sizeof(struct dm_version_request);
42411- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42412+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42413 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42414 version_req.is_last_attempt = 0;
42415
42416@@ -1502,7 +1502,7 @@ static int balloon_probe(struct hv_device *dev,
42417 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42418 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42419 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42420- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42421+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42422
42423 cap_msg.caps.cap_bits.balloon = 1;
42424 cap_msg.caps.cap_bits.hot_add = 1;
42425diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42426index 887287a..238a626 100644
42427--- a/drivers/hv/hyperv_vmbus.h
42428+++ b/drivers/hv/hyperv_vmbus.h
42429@@ -645,7 +645,7 @@ enum vmbus_connect_state {
42430 struct vmbus_connection {
42431 enum vmbus_connect_state conn_state;
42432
42433- atomic_t next_gpadl_handle;
42434+ atomic_unchecked_t next_gpadl_handle;
42435
42436 /*
42437 * Represents channel interrupts. Each bit position represents a
42438diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42439index 579bdf9..0dac21d5 100644
42440--- a/drivers/hwmon/acpi_power_meter.c
42441+++ b/drivers/hwmon/acpi_power_meter.c
42442@@ -116,7 +116,7 @@ struct sensor_template {
42443 struct device_attribute *devattr,
42444 const char *buf, size_t count);
42445 int index;
42446-};
42447+} __do_const;
42448
42449 /* Averaging interval */
42450 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42451@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42452 struct sensor_template *attrs)
42453 {
42454 struct device *dev = &resource->acpi_dev->dev;
42455- struct sensor_device_attribute *sensors =
42456+ sensor_device_attribute_no_const *sensors =
42457 &resource->sensors[resource->num_sensors];
42458 int res = 0;
42459
42460@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42461 return 0;
42462 }
42463
42464-static struct dmi_system_id __initdata pm_dmi_table[] = {
42465+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42466 {
42467 enable_cap_knobs, "IBM Active Energy Manager",
42468 {
42469diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42470index 0af63da..05a183a 100644
42471--- a/drivers/hwmon/applesmc.c
42472+++ b/drivers/hwmon/applesmc.c
42473@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42474 {
42475 struct applesmc_node_group *grp;
42476 struct applesmc_dev_attr *node;
42477- struct attribute *attr;
42478+ attribute_no_const *attr;
42479 int ret, i;
42480
42481 for (grp = groups; grp->format; grp++) {
42482diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42483index cccef87..06ce8ec 100644
42484--- a/drivers/hwmon/asus_atk0110.c
42485+++ b/drivers/hwmon/asus_atk0110.c
42486@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42487 struct atk_sensor_data {
42488 struct list_head list;
42489 struct atk_data *data;
42490- struct device_attribute label_attr;
42491- struct device_attribute input_attr;
42492- struct device_attribute limit1_attr;
42493- struct device_attribute limit2_attr;
42494+ device_attribute_no_const label_attr;
42495+ device_attribute_no_const input_attr;
42496+ device_attribute_no_const limit1_attr;
42497+ device_attribute_no_const limit2_attr;
42498 char label_attr_name[ATTR_NAME_SIZE];
42499 char input_attr_name[ATTR_NAME_SIZE];
42500 char limit1_attr_name[ATTR_NAME_SIZE];
42501@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42502 static struct device_attribute atk_name_attr =
42503 __ATTR(name, 0444, atk_name_show, NULL);
42504
42505-static void atk_init_attribute(struct device_attribute *attr, char *name,
42506+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42507 sysfs_show_func show)
42508 {
42509 sysfs_attr_init(&attr->attr);
42510diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42511index ed303ba..e24bd26f 100644
42512--- a/drivers/hwmon/coretemp.c
42513+++ b/drivers/hwmon/coretemp.c
42514@@ -782,7 +782,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42515 return NOTIFY_OK;
42516 }
42517
42518-static struct notifier_block coretemp_cpu_notifier __refdata = {
42519+static struct notifier_block coretemp_cpu_notifier = {
42520 .notifier_call = coretemp_cpu_callback,
42521 };
42522
42523diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42524index 7a8a6fb..015c1fd 100644
42525--- a/drivers/hwmon/ibmaem.c
42526+++ b/drivers/hwmon/ibmaem.c
42527@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42528 struct aem_rw_sensor_template *rw)
42529 {
42530 struct device *dev = &data->pdev->dev;
42531- struct sensor_device_attribute *sensors = data->sensors;
42532+ sensor_device_attribute_no_const *sensors = data->sensors;
42533 int err;
42534
42535 /* Set up read-only sensors */
42536diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42537index 17ae2eb..21b71dd 100644
42538--- a/drivers/hwmon/iio_hwmon.c
42539+++ b/drivers/hwmon/iio_hwmon.c
42540@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42541 {
42542 struct device *dev = &pdev->dev;
42543 struct iio_hwmon_state *st;
42544- struct sensor_device_attribute *a;
42545+ sensor_device_attribute_no_const *a;
42546 int ret, i;
42547 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42548 enum iio_chan_type type;
42549diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42550index 37f0170..414ec2c 100644
42551--- a/drivers/hwmon/nct6683.c
42552+++ b/drivers/hwmon/nct6683.c
42553@@ -397,11 +397,11 @@ static struct attribute_group *
42554 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42555 int repeat)
42556 {
42557- struct sensor_device_attribute_2 *a2;
42558- struct sensor_device_attribute *a;
42559+ sensor_device_attribute_2_no_const *a2;
42560+ sensor_device_attribute_no_const *a;
42561 struct sensor_device_template **t;
42562 struct sensor_device_attr_u *su;
42563- struct attribute_group *group;
42564+ attribute_group_no_const *group;
42565 struct attribute **attrs;
42566 int i, j, count;
42567
42568diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42569index bd1c99d..2fa55ad 100644
42570--- a/drivers/hwmon/nct6775.c
42571+++ b/drivers/hwmon/nct6775.c
42572@@ -953,10 +953,10 @@ static struct attribute_group *
42573 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42574 int repeat)
42575 {
42576- struct attribute_group *group;
42577+ attribute_group_no_const *group;
42578 struct sensor_device_attr_u *su;
42579- struct sensor_device_attribute *a;
42580- struct sensor_device_attribute_2 *a2;
42581+ sensor_device_attribute_no_const *a;
42582+ sensor_device_attribute_2_no_const *a2;
42583 struct attribute **attrs;
42584 struct sensor_device_template **t;
42585 int i, count;
42586diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42587index f2e47c7..45d7941 100644
42588--- a/drivers/hwmon/pmbus/pmbus_core.c
42589+++ b/drivers/hwmon/pmbus/pmbus_core.c
42590@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42591 return 0;
42592 }
42593
42594-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42595+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42596 const char *name,
42597 umode_t mode,
42598 ssize_t (*show)(struct device *dev,
42599@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42600 dev_attr->store = store;
42601 }
42602
42603-static void pmbus_attr_init(struct sensor_device_attribute *a,
42604+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42605 const char *name,
42606 umode_t mode,
42607 ssize_t (*show)(struct device *dev,
42608@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42609 u16 reg, u8 mask)
42610 {
42611 struct pmbus_boolean *boolean;
42612- struct sensor_device_attribute *a;
42613+ sensor_device_attribute_no_const *a;
42614
42615 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42616 if (!boolean)
42617@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42618 bool update, bool readonly)
42619 {
42620 struct pmbus_sensor *sensor;
42621- struct device_attribute *a;
42622+ device_attribute_no_const *a;
42623
42624 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42625 if (!sensor)
42626@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42627 const char *lstring, int index)
42628 {
42629 struct pmbus_label *label;
42630- struct device_attribute *a;
42631+ device_attribute_no_const *a;
42632
42633 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42634 if (!label)
42635diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42636index d4f0935..7420593 100644
42637--- a/drivers/hwmon/sht15.c
42638+++ b/drivers/hwmon/sht15.c
42639@@ -169,7 +169,7 @@ struct sht15_data {
42640 int supply_uv;
42641 bool supply_uv_valid;
42642 struct work_struct update_supply_work;
42643- atomic_t interrupt_handled;
42644+ atomic_unchecked_t interrupt_handled;
42645 };
42646
42647 /**
42648@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42649 ret = gpio_direction_input(data->pdata->gpio_data);
42650 if (ret)
42651 return ret;
42652- atomic_set(&data->interrupt_handled, 0);
42653+ atomic_set_unchecked(&data->interrupt_handled, 0);
42654
42655 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42656 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42657 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42658 /* Only relevant if the interrupt hasn't occurred. */
42659- if (!atomic_read(&data->interrupt_handled))
42660+ if (!atomic_read_unchecked(&data->interrupt_handled))
42661 schedule_work(&data->read_work);
42662 }
42663 ret = wait_event_timeout(data->wait_queue,
42664@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42665
42666 /* First disable the interrupt */
42667 disable_irq_nosync(irq);
42668- atomic_inc(&data->interrupt_handled);
42669+ atomic_inc_unchecked(&data->interrupt_handled);
42670 /* Then schedule a reading work struct */
42671 if (data->state != SHT15_READING_NOTHING)
42672 schedule_work(&data->read_work);
42673@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42674 * If not, then start the interrupt again - care here as could
42675 * have gone low in meantime so verify it hasn't!
42676 */
42677- atomic_set(&data->interrupt_handled, 0);
42678+ atomic_set_unchecked(&data->interrupt_handled, 0);
42679 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42680 /* If still not occurred or another handler was scheduled */
42681 if (gpio_get_value(data->pdata->gpio_data)
42682- || atomic_read(&data->interrupt_handled))
42683+ || atomic_read_unchecked(&data->interrupt_handled))
42684 return;
42685 }
42686
42687diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42688index ac91c07..8e69663 100644
42689--- a/drivers/hwmon/via-cputemp.c
42690+++ b/drivers/hwmon/via-cputemp.c
42691@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42692 return NOTIFY_OK;
42693 }
42694
42695-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42696+static struct notifier_block via_cputemp_cpu_notifier = {
42697 .notifier_call = via_cputemp_cpu_callback,
42698 };
42699
42700diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42701index 65e3240..e6c511d 100644
42702--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42703+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42704@@ -39,7 +39,7 @@
42705 extern struct i2c_adapter amd756_smbus;
42706
42707 static struct i2c_adapter *s4882_adapter;
42708-static struct i2c_algorithm *s4882_algo;
42709+static i2c_algorithm_no_const *s4882_algo;
42710
42711 /* Wrapper access functions for multiplexed SMBus */
42712 static DEFINE_MUTEX(amd756_lock);
42713diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42714index b19a310..d6eece0 100644
42715--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42716+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42717@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42718 /* usb layer */
42719
42720 /* Send command to device, and get response. */
42721-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42722+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42723 {
42724 int ret = 0;
42725 int actual;
42726diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42727index 88eda09..cf40434 100644
42728--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42729+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42730@@ -37,7 +37,7 @@
42731 extern struct i2c_adapter *nforce2_smbus;
42732
42733 static struct i2c_adapter *s4985_adapter;
42734-static struct i2c_algorithm *s4985_algo;
42735+static i2c_algorithm_no_const *s4985_algo;
42736
42737 /* Wrapper access functions for multiplexed SMBus */
42738 static DEFINE_MUTEX(nforce2_lock);
42739diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42740index 71c7a39..71dd3e0 100644
42741--- a/drivers/i2c/i2c-dev.c
42742+++ b/drivers/i2c/i2c-dev.c
42743@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42744 break;
42745 }
42746
42747- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42748+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42749 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42750 if (IS_ERR(rdwr_pa[i].buf)) {
42751 res = PTR_ERR(rdwr_pa[i].buf);
42752diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42753index 0b510ba..4fbb5085 100644
42754--- a/drivers/ide/ide-cd.c
42755+++ b/drivers/ide/ide-cd.c
42756@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42757 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42758 if ((unsigned long)buf & alignment
42759 || blk_rq_bytes(rq) & q->dma_pad_mask
42760- || object_is_on_stack(buf))
42761+ || object_starts_on_stack(buf))
42762 drive->dma = 0;
42763 }
42764 }
42765diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42766index 4df97f6..c751151 100644
42767--- a/drivers/iio/industrialio-core.c
42768+++ b/drivers/iio/industrialio-core.c
42769@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42770 }
42771
42772 static
42773-int __iio_device_attr_init(struct device_attribute *dev_attr,
42774+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42775 const char *postfix,
42776 struct iio_chan_spec const *chan,
42777 ssize_t (*readfunc)(struct device *dev,
42778diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42779index 0271608..81998c5 100644
42780--- a/drivers/infiniband/core/cm.c
42781+++ b/drivers/infiniband/core/cm.c
42782@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42783
42784 struct cm_counter_group {
42785 struct kobject obj;
42786- atomic_long_t counter[CM_ATTR_COUNT];
42787+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42788 };
42789
42790 struct cm_counter_attribute {
42791@@ -1397,7 +1397,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42792 struct ib_mad_send_buf *msg = NULL;
42793 int ret;
42794
42795- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42796+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42797 counter[CM_REQ_COUNTER]);
42798
42799 /* Quick state check to discard duplicate REQs. */
42800@@ -1784,7 +1784,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42801 if (!cm_id_priv)
42802 return;
42803
42804- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42805+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42806 counter[CM_REP_COUNTER]);
42807 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42808 if (ret)
42809@@ -1951,7 +1951,7 @@ static int cm_rtu_handler(struct cm_work *work)
42810 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42811 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42812 spin_unlock_irq(&cm_id_priv->lock);
42813- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42814+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42815 counter[CM_RTU_COUNTER]);
42816 goto out;
42817 }
42818@@ -2134,7 +2134,7 @@ static int cm_dreq_handler(struct cm_work *work)
42819 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42820 dreq_msg->local_comm_id);
42821 if (!cm_id_priv) {
42822- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42823+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42824 counter[CM_DREQ_COUNTER]);
42825 cm_issue_drep(work->port, work->mad_recv_wc);
42826 return -EINVAL;
42827@@ -2159,7 +2159,7 @@ static int cm_dreq_handler(struct cm_work *work)
42828 case IB_CM_MRA_REP_RCVD:
42829 break;
42830 case IB_CM_TIMEWAIT:
42831- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42832+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42833 counter[CM_DREQ_COUNTER]);
42834 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42835 goto unlock;
42836@@ -2173,7 +2173,7 @@ static int cm_dreq_handler(struct cm_work *work)
42837 cm_free_msg(msg);
42838 goto deref;
42839 case IB_CM_DREQ_RCVD:
42840- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42841+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42842 counter[CM_DREQ_COUNTER]);
42843 goto unlock;
42844 default:
42845@@ -2540,7 +2540,7 @@ static int cm_mra_handler(struct cm_work *work)
42846 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42847 cm_id_priv->msg, timeout)) {
42848 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42849- atomic_long_inc(&work->port->
42850+ atomic_long_inc_unchecked(&work->port->
42851 counter_group[CM_RECV_DUPLICATES].
42852 counter[CM_MRA_COUNTER]);
42853 goto out;
42854@@ -2549,7 +2549,7 @@ static int cm_mra_handler(struct cm_work *work)
42855 break;
42856 case IB_CM_MRA_REQ_RCVD:
42857 case IB_CM_MRA_REP_RCVD:
42858- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42859+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42860 counter[CM_MRA_COUNTER]);
42861 /* fall through */
42862 default:
42863@@ -2711,7 +2711,7 @@ static int cm_lap_handler(struct cm_work *work)
42864 case IB_CM_LAP_IDLE:
42865 break;
42866 case IB_CM_MRA_LAP_SENT:
42867- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42868+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42869 counter[CM_LAP_COUNTER]);
42870 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42871 goto unlock;
42872@@ -2727,7 +2727,7 @@ static int cm_lap_handler(struct cm_work *work)
42873 cm_free_msg(msg);
42874 goto deref;
42875 case IB_CM_LAP_RCVD:
42876- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42877+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42878 counter[CM_LAP_COUNTER]);
42879 goto unlock;
42880 default:
42881@@ -3011,7 +3011,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42882 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42883 if (cur_cm_id_priv) {
42884 spin_unlock_irq(&cm.lock);
42885- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42886+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42887 counter[CM_SIDR_REQ_COUNTER]);
42888 goto out; /* Duplicate message. */
42889 }
42890@@ -3223,10 +3223,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42891 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42892 msg->retries = 1;
42893
42894- atomic_long_add(1 + msg->retries,
42895+ atomic_long_add_unchecked(1 + msg->retries,
42896 &port->counter_group[CM_XMIT].counter[attr_index]);
42897 if (msg->retries)
42898- atomic_long_add(msg->retries,
42899+ atomic_long_add_unchecked(msg->retries,
42900 &port->counter_group[CM_XMIT_RETRIES].
42901 counter[attr_index]);
42902
42903@@ -3436,7 +3436,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42904 }
42905
42906 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42907- atomic_long_inc(&port->counter_group[CM_RECV].
42908+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42909 counter[attr_id - CM_ATTR_ID_OFFSET]);
42910
42911 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42912@@ -3667,7 +3667,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42913 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42914
42915 return sprintf(buf, "%ld\n",
42916- atomic_long_read(&group->counter[cm_attr->index]));
42917+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42918 }
42919
42920 static const struct sysfs_ops cm_counter_ops = {
42921diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42922index 9f5ad7c..588cd84 100644
42923--- a/drivers/infiniband/core/fmr_pool.c
42924+++ b/drivers/infiniband/core/fmr_pool.c
42925@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42926
42927 struct task_struct *thread;
42928
42929- atomic_t req_ser;
42930- atomic_t flush_ser;
42931+ atomic_unchecked_t req_ser;
42932+ atomic_unchecked_t flush_ser;
42933
42934 wait_queue_head_t force_wait;
42935 };
42936@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42937 struct ib_fmr_pool *pool = pool_ptr;
42938
42939 do {
42940- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42941+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42942 ib_fmr_batch_release(pool);
42943
42944- atomic_inc(&pool->flush_ser);
42945+ atomic_inc_unchecked(&pool->flush_ser);
42946 wake_up_interruptible(&pool->force_wait);
42947
42948 if (pool->flush_function)
42949@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42950 }
42951
42952 set_current_state(TASK_INTERRUPTIBLE);
42953- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42954+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42955 !kthread_should_stop())
42956 schedule();
42957 __set_current_state(TASK_RUNNING);
42958@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42959 pool->dirty_watermark = params->dirty_watermark;
42960 pool->dirty_len = 0;
42961 spin_lock_init(&pool->pool_lock);
42962- atomic_set(&pool->req_ser, 0);
42963- atomic_set(&pool->flush_ser, 0);
42964+ atomic_set_unchecked(&pool->req_ser, 0);
42965+ atomic_set_unchecked(&pool->flush_ser, 0);
42966 init_waitqueue_head(&pool->force_wait);
42967
42968 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42969@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42970 }
42971 spin_unlock_irq(&pool->pool_lock);
42972
42973- serial = atomic_inc_return(&pool->req_ser);
42974+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42975 wake_up_process(pool->thread);
42976
42977 if (wait_event_interruptible(pool->force_wait,
42978- atomic_read(&pool->flush_ser) - serial >= 0))
42979+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42980 return -EINTR;
42981
42982 return 0;
42983@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42984 } else {
42985 list_add_tail(&fmr->list, &pool->dirty_list);
42986 if (++pool->dirty_len >= pool->dirty_watermark) {
42987- atomic_inc(&pool->req_ser);
42988+ atomic_inc_unchecked(&pool->req_ser);
42989 wake_up_process(pool->thread);
42990 }
42991 }
42992diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
42993index a9f0489..27a161b 100644
42994--- a/drivers/infiniband/core/uverbs_cmd.c
42995+++ b/drivers/infiniband/core/uverbs_cmd.c
42996@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
42997 if (copy_from_user(&cmd, buf, sizeof cmd))
42998 return -EFAULT;
42999
43000+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43001+ return -EFAULT;
43002+
43003 INIT_UDATA(&udata, buf + sizeof cmd,
43004 (unsigned long) cmd.response + sizeof resp,
43005 in_len - sizeof cmd, out_len - sizeof resp);
43006diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43007index cff815b..75576dd 100644
43008--- a/drivers/infiniband/hw/cxgb4/mem.c
43009+++ b/drivers/infiniband/hw/cxgb4/mem.c
43010@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43011 int err;
43012 struct fw_ri_tpte tpt;
43013 u32 stag_idx;
43014- static atomic_t key;
43015+ static atomic_unchecked_t key;
43016
43017 if (c4iw_fatal_error(rdev))
43018 return -EIO;
43019@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43020 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43021 rdev->stats.stag.max = rdev->stats.stag.cur;
43022 mutex_unlock(&rdev->stats.lock);
43023- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43024+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43025 }
43026 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43027 __func__, stag_state, type, pdid, stag_idx);
43028diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43029index 79b3dbc..96e5fcc 100644
43030--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43031+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43032@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43033 struct ib_atomic_eth *ateth;
43034 struct ipath_ack_entry *e;
43035 u64 vaddr;
43036- atomic64_t *maddr;
43037+ atomic64_unchecked_t *maddr;
43038 u64 sdata;
43039 u32 rkey;
43040 u8 next;
43041@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43042 IB_ACCESS_REMOTE_ATOMIC)))
43043 goto nack_acc_unlck;
43044 /* Perform atomic OP and save result. */
43045- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43046+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43047 sdata = be64_to_cpu(ateth->swap_data);
43048 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43049 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43050- (u64) atomic64_add_return(sdata, maddr) - sdata :
43051+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43052 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43053 be64_to_cpu(ateth->compare_data),
43054 sdata);
43055diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43056index 1f95bba..9530f87 100644
43057--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43058+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43059@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43060 unsigned long flags;
43061 struct ib_wc wc;
43062 u64 sdata;
43063- atomic64_t *maddr;
43064+ atomic64_unchecked_t *maddr;
43065 enum ib_wc_status send_status;
43066
43067 /*
43068@@ -382,11 +382,11 @@ again:
43069 IB_ACCESS_REMOTE_ATOMIC)))
43070 goto acc_err;
43071 /* Perform atomic OP and save result. */
43072- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43073+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43074 sdata = wqe->wr.wr.atomic.compare_add;
43075 *(u64 *) sqp->s_sge.sge.vaddr =
43076 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43077- (u64) atomic64_add_return(sdata, maddr) - sdata :
43078+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43079 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43080 sdata, wqe->wr.wr.atomic.swap);
43081 goto send_comp;
43082diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43083index 9cd2b00..7486df4 100644
43084--- a/drivers/infiniband/hw/mlx4/mad.c
43085+++ b/drivers/infiniband/hw/mlx4/mad.c
43086@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43087
43088 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43089 {
43090- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43091+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43092 cpu_to_be64(0xff00000000000000LL);
43093 }
43094
43095diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43096index ed327e6..ca1739e0 100644
43097--- a/drivers/infiniband/hw/mlx4/mcg.c
43098+++ b/drivers/infiniband/hw/mlx4/mcg.c
43099@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43100 {
43101 char name[20];
43102
43103- atomic_set(&ctx->tid, 0);
43104+ atomic_set_unchecked(&ctx->tid, 0);
43105 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43106 ctx->mcg_wq = create_singlethread_workqueue(name);
43107 if (!ctx->mcg_wq)
43108diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43109index fce39343..9d8fdff 100644
43110--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43111+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43112@@ -435,7 +435,7 @@ struct mlx4_ib_demux_ctx {
43113 struct list_head mcg_mgid0_list;
43114 struct workqueue_struct *mcg_wq;
43115 struct mlx4_ib_demux_pv_ctx **tun;
43116- atomic_t tid;
43117+ atomic_unchecked_t tid;
43118 int flushing; /* flushing the work queue */
43119 };
43120
43121diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43122index 9d3e5c1..6f166df 100644
43123--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43124+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43125@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43126 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43127 }
43128
43129-int mthca_QUERY_FW(struct mthca_dev *dev)
43130+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43131 {
43132 struct mthca_mailbox *mailbox;
43133 u32 *outbox;
43134@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43135 CMD_TIME_CLASS_B);
43136 }
43137
43138-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43139+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43140 int num_mtt)
43141 {
43142 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43143@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43144 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43145 }
43146
43147-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43148+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43149 int eq_num)
43150 {
43151 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43152@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43153 CMD_TIME_CLASS_B);
43154 }
43155
43156-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43157+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43158 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43159 void *in_mad, void *response_mad)
43160 {
43161diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43162index ded76c1..0cf0a08 100644
43163--- a/drivers/infiniband/hw/mthca/mthca_main.c
43164+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43165@@ -692,7 +692,7 @@ err_close:
43166 return err;
43167 }
43168
43169-static int mthca_setup_hca(struct mthca_dev *dev)
43170+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43171 {
43172 int err;
43173
43174diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43175index ed9a989..6aa5dc2 100644
43176--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43177+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43178@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43179 * through the bitmaps)
43180 */
43181
43182-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43183+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43184 {
43185 int o;
43186 int m;
43187@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43188 return key;
43189 }
43190
43191-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43192+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43193 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43194 {
43195 struct mthca_mailbox *mailbox;
43196@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43197 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43198 }
43199
43200-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43201+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43202 u64 *buffer_list, int buffer_size_shift,
43203 int list_len, u64 iova, u64 total_size,
43204 u32 access, struct mthca_mr *mr)
43205diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43206index 415f8e1..e34214e 100644
43207--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43208+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43209@@ -764,7 +764,7 @@ unlock:
43210 return 0;
43211 }
43212
43213-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43214+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43215 {
43216 struct mthca_dev *dev = to_mdev(ibcq->device);
43217 struct mthca_cq *cq = to_mcq(ibcq);
43218diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43219index 9f9d5c5..3c19aac 100644
43220--- a/drivers/infiniband/hw/nes/nes.c
43221+++ b/drivers/infiniband/hw/nes/nes.c
43222@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43223 LIST_HEAD(nes_adapter_list);
43224 static LIST_HEAD(nes_dev_list);
43225
43226-atomic_t qps_destroyed;
43227+atomic_unchecked_t qps_destroyed;
43228
43229 static unsigned int ee_flsh_adapter;
43230 static unsigned int sysfs_nonidx_addr;
43231@@ -279,7 +279,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43232 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43233 struct nes_adapter *nesadapter = nesdev->nesadapter;
43234
43235- atomic_inc(&qps_destroyed);
43236+ atomic_inc_unchecked(&qps_destroyed);
43237
43238 /* Free the control structures */
43239
43240diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43241index bd9d132..70d84f4 100644
43242--- a/drivers/infiniband/hw/nes/nes.h
43243+++ b/drivers/infiniband/hw/nes/nes.h
43244@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43245 extern unsigned int wqm_quanta;
43246 extern struct list_head nes_adapter_list;
43247
43248-extern atomic_t cm_connects;
43249-extern atomic_t cm_accepts;
43250-extern atomic_t cm_disconnects;
43251-extern atomic_t cm_closes;
43252-extern atomic_t cm_connecteds;
43253-extern atomic_t cm_connect_reqs;
43254-extern atomic_t cm_rejects;
43255-extern atomic_t mod_qp_timouts;
43256-extern atomic_t qps_created;
43257-extern atomic_t qps_destroyed;
43258-extern atomic_t sw_qps_destroyed;
43259+extern atomic_unchecked_t cm_connects;
43260+extern atomic_unchecked_t cm_accepts;
43261+extern atomic_unchecked_t cm_disconnects;
43262+extern atomic_unchecked_t cm_closes;
43263+extern atomic_unchecked_t cm_connecteds;
43264+extern atomic_unchecked_t cm_connect_reqs;
43265+extern atomic_unchecked_t cm_rejects;
43266+extern atomic_unchecked_t mod_qp_timouts;
43267+extern atomic_unchecked_t qps_created;
43268+extern atomic_unchecked_t qps_destroyed;
43269+extern atomic_unchecked_t sw_qps_destroyed;
43270 extern u32 mh_detected;
43271 extern u32 mh_pauses_sent;
43272 extern u32 cm_packets_sent;
43273@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43274 extern u32 cm_packets_received;
43275 extern u32 cm_packets_dropped;
43276 extern u32 cm_packets_retrans;
43277-extern atomic_t cm_listens_created;
43278-extern atomic_t cm_listens_destroyed;
43279+extern atomic_unchecked_t cm_listens_created;
43280+extern atomic_unchecked_t cm_listens_destroyed;
43281 extern u32 cm_backlog_drops;
43282-extern atomic_t cm_loopbacks;
43283-extern atomic_t cm_nodes_created;
43284-extern atomic_t cm_nodes_destroyed;
43285-extern atomic_t cm_accel_dropped_pkts;
43286-extern atomic_t cm_resets_recvd;
43287-extern atomic_t pau_qps_created;
43288-extern atomic_t pau_qps_destroyed;
43289+extern atomic_unchecked_t cm_loopbacks;
43290+extern atomic_unchecked_t cm_nodes_created;
43291+extern atomic_unchecked_t cm_nodes_destroyed;
43292+extern atomic_unchecked_t cm_accel_dropped_pkts;
43293+extern atomic_unchecked_t cm_resets_recvd;
43294+extern atomic_unchecked_t pau_qps_created;
43295+extern atomic_unchecked_t pau_qps_destroyed;
43296
43297 extern u32 int_mod_timer_init;
43298 extern u32 int_mod_cq_depth_256;
43299diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43300index 72b4341..2600332 100644
43301--- a/drivers/infiniband/hw/nes/nes_cm.c
43302+++ b/drivers/infiniband/hw/nes/nes_cm.c
43303@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43304 u32 cm_packets_retrans;
43305 u32 cm_packets_created;
43306 u32 cm_packets_received;
43307-atomic_t cm_listens_created;
43308-atomic_t cm_listens_destroyed;
43309+atomic_unchecked_t cm_listens_created;
43310+atomic_unchecked_t cm_listens_destroyed;
43311 u32 cm_backlog_drops;
43312-atomic_t cm_loopbacks;
43313-atomic_t cm_nodes_created;
43314-atomic_t cm_nodes_destroyed;
43315-atomic_t cm_accel_dropped_pkts;
43316-atomic_t cm_resets_recvd;
43317+atomic_unchecked_t cm_loopbacks;
43318+atomic_unchecked_t cm_nodes_created;
43319+atomic_unchecked_t cm_nodes_destroyed;
43320+atomic_unchecked_t cm_accel_dropped_pkts;
43321+atomic_unchecked_t cm_resets_recvd;
43322
43323 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43324 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43325@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43326 /* instance of function pointers for client API */
43327 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43328 static struct nes_cm_ops nes_cm_api = {
43329- mini_cm_accelerated,
43330- mini_cm_listen,
43331- mini_cm_del_listen,
43332- mini_cm_connect,
43333- mini_cm_close,
43334- mini_cm_accept,
43335- mini_cm_reject,
43336- mini_cm_recv_pkt,
43337- mini_cm_dealloc_core,
43338- mini_cm_get,
43339- mini_cm_set
43340+ .accelerated = mini_cm_accelerated,
43341+ .listen = mini_cm_listen,
43342+ .stop_listener = mini_cm_del_listen,
43343+ .connect = mini_cm_connect,
43344+ .close = mini_cm_close,
43345+ .accept = mini_cm_accept,
43346+ .reject = mini_cm_reject,
43347+ .recv_pkt = mini_cm_recv_pkt,
43348+ .destroy_cm_core = mini_cm_dealloc_core,
43349+ .get = mini_cm_get,
43350+ .set = mini_cm_set
43351 };
43352
43353 static struct nes_cm_core *g_cm_core;
43354
43355-atomic_t cm_connects;
43356-atomic_t cm_accepts;
43357-atomic_t cm_disconnects;
43358-atomic_t cm_closes;
43359-atomic_t cm_connecteds;
43360-atomic_t cm_connect_reqs;
43361-atomic_t cm_rejects;
43362+atomic_unchecked_t cm_connects;
43363+atomic_unchecked_t cm_accepts;
43364+atomic_unchecked_t cm_disconnects;
43365+atomic_unchecked_t cm_closes;
43366+atomic_unchecked_t cm_connecteds;
43367+atomic_unchecked_t cm_connect_reqs;
43368+atomic_unchecked_t cm_rejects;
43369
43370 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43371 {
43372@@ -1461,7 +1461,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43373 kfree(listener);
43374 listener = NULL;
43375 ret = 0;
43376- atomic_inc(&cm_listens_destroyed);
43377+ atomic_inc_unchecked(&cm_listens_destroyed);
43378 } else {
43379 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43380 }
43381@@ -1667,7 +1667,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43382 cm_node->rem_mac);
43383
43384 add_hte_node(cm_core, cm_node);
43385- atomic_inc(&cm_nodes_created);
43386+ atomic_inc_unchecked(&cm_nodes_created);
43387
43388 return cm_node;
43389 }
43390@@ -1728,7 +1728,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43391 }
43392
43393 atomic_dec(&cm_core->node_cnt);
43394- atomic_inc(&cm_nodes_destroyed);
43395+ atomic_inc_unchecked(&cm_nodes_destroyed);
43396 nesqp = cm_node->nesqp;
43397 if (nesqp) {
43398 nesqp->cm_node = NULL;
43399@@ -1792,7 +1792,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43400
43401 static void drop_packet(struct sk_buff *skb)
43402 {
43403- atomic_inc(&cm_accel_dropped_pkts);
43404+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43405 dev_kfree_skb_any(skb);
43406 }
43407
43408@@ -1855,7 +1855,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43409 {
43410
43411 int reset = 0; /* whether to send reset in case of err.. */
43412- atomic_inc(&cm_resets_recvd);
43413+ atomic_inc_unchecked(&cm_resets_recvd);
43414 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43415 " refcnt=%d\n", cm_node, cm_node->state,
43416 atomic_read(&cm_node->ref_count));
43417@@ -2523,7 +2523,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43418 rem_ref_cm_node(cm_node->cm_core, cm_node);
43419 return NULL;
43420 }
43421- atomic_inc(&cm_loopbacks);
43422+ atomic_inc_unchecked(&cm_loopbacks);
43423 loopbackremotenode->loopbackpartner = cm_node;
43424 loopbackremotenode->tcp_cntxt.rcv_wscale =
43425 NES_CM_DEFAULT_RCV_WND_SCALE;
43426@@ -2804,7 +2804,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43427 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43428 else {
43429 rem_ref_cm_node(cm_core, cm_node);
43430- atomic_inc(&cm_accel_dropped_pkts);
43431+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43432 dev_kfree_skb_any(skb);
43433 }
43434 break;
43435@@ -3112,7 +3112,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43436
43437 if ((cm_id) && (cm_id->event_handler)) {
43438 if (issue_disconn) {
43439- atomic_inc(&cm_disconnects);
43440+ atomic_inc_unchecked(&cm_disconnects);
43441 cm_event.event = IW_CM_EVENT_DISCONNECT;
43442 cm_event.status = disconn_status;
43443 cm_event.local_addr = cm_id->local_addr;
43444@@ -3134,7 +3134,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43445 }
43446
43447 if (issue_close) {
43448- atomic_inc(&cm_closes);
43449+ atomic_inc_unchecked(&cm_closes);
43450 nes_disconnect(nesqp, 1);
43451
43452 cm_id->provider_data = nesqp;
43453@@ -3272,7 +3272,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43454
43455 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43456 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43457- atomic_inc(&cm_accepts);
43458+ atomic_inc_unchecked(&cm_accepts);
43459
43460 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43461 netdev_refcnt_read(nesvnic->netdev));
43462@@ -3470,7 +3470,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43463 struct nes_cm_core *cm_core;
43464 u8 *start_buff;
43465
43466- atomic_inc(&cm_rejects);
43467+ atomic_inc_unchecked(&cm_rejects);
43468 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43469 loopback = cm_node->loopbackpartner;
43470 cm_core = cm_node->cm_core;
43471@@ -3535,7 +3535,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43472 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43473 ntohs(laddr->sin_port));
43474
43475- atomic_inc(&cm_connects);
43476+ atomic_inc_unchecked(&cm_connects);
43477 nesqp->active_conn = 1;
43478
43479 /* cache the cm_id in the qp */
43480@@ -3680,7 +3680,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43481 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43482 return err;
43483 }
43484- atomic_inc(&cm_listens_created);
43485+ atomic_inc_unchecked(&cm_listens_created);
43486 }
43487
43488 cm_id->add_ref(cm_id);
43489@@ -3787,7 +3787,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43490
43491 if (nesqp->destroyed)
43492 return;
43493- atomic_inc(&cm_connecteds);
43494+ atomic_inc_unchecked(&cm_connecteds);
43495 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43496 " local port 0x%04X. jiffies = %lu.\n",
43497 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43498@@ -3972,7 +3972,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43499
43500 cm_id->add_ref(cm_id);
43501 ret = cm_id->event_handler(cm_id, &cm_event);
43502- atomic_inc(&cm_closes);
43503+ atomic_inc_unchecked(&cm_closes);
43504 cm_event.event = IW_CM_EVENT_CLOSE;
43505 cm_event.status = 0;
43506 cm_event.provider_data = cm_id->provider_data;
43507@@ -4012,7 +4012,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43508 return;
43509 cm_id = cm_node->cm_id;
43510
43511- atomic_inc(&cm_connect_reqs);
43512+ atomic_inc_unchecked(&cm_connect_reqs);
43513 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43514 cm_node, cm_id, jiffies);
43515
43516@@ -4061,7 +4061,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43517 return;
43518 cm_id = cm_node->cm_id;
43519
43520- atomic_inc(&cm_connect_reqs);
43521+ atomic_inc_unchecked(&cm_connect_reqs);
43522 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43523 cm_node, cm_id, jiffies);
43524
43525diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43526index 4166452..fc952c3 100644
43527--- a/drivers/infiniband/hw/nes/nes_mgt.c
43528+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43529@@ -40,8 +40,8 @@
43530 #include "nes.h"
43531 #include "nes_mgt.h"
43532
43533-atomic_t pau_qps_created;
43534-atomic_t pau_qps_destroyed;
43535+atomic_unchecked_t pau_qps_created;
43536+atomic_unchecked_t pau_qps_destroyed;
43537
43538 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43539 {
43540@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43541 {
43542 struct sk_buff *skb;
43543 unsigned long flags;
43544- atomic_inc(&pau_qps_destroyed);
43545+ atomic_inc_unchecked(&pau_qps_destroyed);
43546
43547 /* Free packets that have not yet been forwarded */
43548 /* Lock is acquired by skb_dequeue when removing the skb */
43549@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43550 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43551 skb_queue_head_init(&nesqp->pau_list);
43552 spin_lock_init(&nesqp->pau_lock);
43553- atomic_inc(&pau_qps_created);
43554+ atomic_inc_unchecked(&pau_qps_created);
43555 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43556 }
43557
43558diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43559index 70acda9..a96de9d 100644
43560--- a/drivers/infiniband/hw/nes/nes_nic.c
43561+++ b/drivers/infiniband/hw/nes/nes_nic.c
43562@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43563 target_stat_values[++index] = mh_detected;
43564 target_stat_values[++index] = mh_pauses_sent;
43565 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43566- target_stat_values[++index] = atomic_read(&cm_connects);
43567- target_stat_values[++index] = atomic_read(&cm_accepts);
43568- target_stat_values[++index] = atomic_read(&cm_disconnects);
43569- target_stat_values[++index] = atomic_read(&cm_connecteds);
43570- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43571- target_stat_values[++index] = atomic_read(&cm_rejects);
43572- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43573- target_stat_values[++index] = atomic_read(&qps_created);
43574- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43575- target_stat_values[++index] = atomic_read(&qps_destroyed);
43576- target_stat_values[++index] = atomic_read(&cm_closes);
43577+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43578+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43579+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43580+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43581+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43582+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43583+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43584+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43585+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43586+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43587+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43588 target_stat_values[++index] = cm_packets_sent;
43589 target_stat_values[++index] = cm_packets_bounced;
43590 target_stat_values[++index] = cm_packets_created;
43591 target_stat_values[++index] = cm_packets_received;
43592 target_stat_values[++index] = cm_packets_dropped;
43593 target_stat_values[++index] = cm_packets_retrans;
43594- target_stat_values[++index] = atomic_read(&cm_listens_created);
43595- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43596+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43597+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43598 target_stat_values[++index] = cm_backlog_drops;
43599- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43600- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43601- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43602- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43603- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43604+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43605+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43606+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43607+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43608+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43609 target_stat_values[++index] = nesadapter->free_4kpbl;
43610 target_stat_values[++index] = nesadapter->free_256pbl;
43611 target_stat_values[++index] = int_mod_timer_init;
43612 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43613 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43614 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43615- target_stat_values[++index] = atomic_read(&pau_qps_created);
43616- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43617+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43618+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43619 }
43620
43621 /**
43622diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43623index c0d0296..3185f57 100644
43624--- a/drivers/infiniband/hw/nes/nes_verbs.c
43625+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43626@@ -46,9 +46,9 @@
43627
43628 #include <rdma/ib_umem.h>
43629
43630-atomic_t mod_qp_timouts;
43631-atomic_t qps_created;
43632-atomic_t sw_qps_destroyed;
43633+atomic_unchecked_t mod_qp_timouts;
43634+atomic_unchecked_t qps_created;
43635+atomic_unchecked_t sw_qps_destroyed;
43636
43637 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43638
43639@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43640 if (init_attr->create_flags)
43641 return ERR_PTR(-EINVAL);
43642
43643- atomic_inc(&qps_created);
43644+ atomic_inc_unchecked(&qps_created);
43645 switch (init_attr->qp_type) {
43646 case IB_QPT_RC:
43647 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43648@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43649 struct iw_cm_event cm_event;
43650 int ret = 0;
43651
43652- atomic_inc(&sw_qps_destroyed);
43653+ atomic_inc_unchecked(&sw_qps_destroyed);
43654 nesqp->destroyed = 1;
43655
43656 /* Blow away the connection if it exists. */
43657diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43658index 7df16f7..7e1b21e 100644
43659--- a/drivers/infiniband/hw/qib/qib.h
43660+++ b/drivers/infiniband/hw/qib/qib.h
43661@@ -52,6 +52,7 @@
43662 #include <linux/kref.h>
43663 #include <linux/sched.h>
43664 #include <linux/kthread.h>
43665+#include <linux/slab.h>
43666
43667 #include "qib_common.h"
43668 #include "qib_verbs.h"
43669diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43670index cdc7df4..a2fdfdb 100644
43671--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43672+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43673@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43674 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43675 }
43676
43677-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43678+static struct rtnl_link_ops ipoib_link_ops = {
43679 .kind = "ipoib",
43680 .maxtype = IFLA_IPOIB_MAX,
43681 .policy = ipoib_policy,
43682diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43683index e853a21..56fc5a8 100644
43684--- a/drivers/input/gameport/gameport.c
43685+++ b/drivers/input/gameport/gameport.c
43686@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43687 */
43688 static void gameport_init_port(struct gameport *gameport)
43689 {
43690- static atomic_t gameport_no = ATOMIC_INIT(-1);
43691+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
43692
43693 __module_get(THIS_MODULE);
43694
43695 mutex_init(&gameport->drv_mutex);
43696 device_initialize(&gameport->dev);
43697 dev_set_name(&gameport->dev, "gameport%lu",
43698- (unsigned long)atomic_inc_return(&gameport_no));
43699+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
43700 gameport->dev.bus = &gameport_bus;
43701 gameport->dev.release = gameport_release_port;
43702 if (gameport->parent)
43703diff --git a/drivers/input/input.c b/drivers/input/input.c
43704index cc357f1..ee42fbc 100644
43705--- a/drivers/input/input.c
43706+++ b/drivers/input/input.c
43707@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
43708 */
43709 struct input_dev *input_allocate_device(void)
43710 {
43711- static atomic_t input_no = ATOMIC_INIT(-1);
43712+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
43713 struct input_dev *dev;
43714
43715 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43716@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
43717 INIT_LIST_HEAD(&dev->node);
43718
43719 dev_set_name(&dev->dev, "input%lu",
43720- (unsigned long)atomic_inc_return(&input_no));
43721+ (unsigned long)atomic_inc_return_unchecked(&input_no));
43722
43723 __module_get(THIS_MODULE);
43724 }
43725diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43726index 4a95b22..874c182 100644
43727--- a/drivers/input/joystick/sidewinder.c
43728+++ b/drivers/input/joystick/sidewinder.c
43729@@ -30,6 +30,7 @@
43730 #include <linux/kernel.h>
43731 #include <linux/module.h>
43732 #include <linux/slab.h>
43733+#include <linux/sched.h>
43734 #include <linux/input.h>
43735 #include <linux/gameport.h>
43736 #include <linux/jiffies.h>
43737diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43738index 61c7611..e1bfa38 100644
43739--- a/drivers/input/joystick/xpad.c
43740+++ b/drivers/input/joystick/xpad.c
43741@@ -905,7 +905,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43742
43743 static int xpad_led_probe(struct usb_xpad *xpad)
43744 {
43745- static atomic_t led_seq = ATOMIC_INIT(-1);
43746+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
43747 unsigned long led_no;
43748 struct xpad_led *led;
43749 struct led_classdev *led_cdev;
43750@@ -918,7 +918,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43751 if (!led)
43752 return -ENOMEM;
43753
43754- led_no = atomic_inc_return(&led_seq);
43755+ led_no = atomic_inc_return_unchecked(&led_seq);
43756
43757 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
43758 led->xpad = xpad;
43759diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43760index ac1fa5f..5f7502c 100644
43761--- a/drivers/input/misc/ims-pcu.c
43762+++ b/drivers/input/misc/ims-pcu.c
43763@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43764
43765 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43766 {
43767- static atomic_t device_no = ATOMIC_INIT(-1);
43768+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
43769
43770 const struct ims_pcu_device_info *info;
43771 int error;
43772@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43773 }
43774
43775 /* Device appears to be operable, complete initialization */
43776- pcu->device_no = atomic_inc_return(&device_no);
43777+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
43778
43779 /*
43780 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43781diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43782index ad5a5a1..5eac214 100644
43783--- a/drivers/input/mouse/psmouse.h
43784+++ b/drivers/input/mouse/psmouse.h
43785@@ -125,7 +125,7 @@ struct psmouse_attribute {
43786 ssize_t (*set)(struct psmouse *psmouse, void *data,
43787 const char *buf, size_t count);
43788 bool protect;
43789-};
43790+} __do_const;
43791 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43792
43793 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43794diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43795index b604564..3f14ae4 100644
43796--- a/drivers/input/mousedev.c
43797+++ b/drivers/input/mousedev.c
43798@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43799
43800 spin_unlock_irq(&client->packet_lock);
43801
43802- if (copy_to_user(buffer, data, count))
43803+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43804 return -EFAULT;
43805
43806 return count;
43807diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43808index a05a517..323a2fd 100644
43809--- a/drivers/input/serio/serio.c
43810+++ b/drivers/input/serio/serio.c
43811@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43812 */
43813 static void serio_init_port(struct serio *serio)
43814 {
43815- static atomic_t serio_no = ATOMIC_INIT(-1);
43816+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
43817
43818 __module_get(THIS_MODULE);
43819
43820@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43821 mutex_init(&serio->drv_mutex);
43822 device_initialize(&serio->dev);
43823 dev_set_name(&serio->dev, "serio%lu",
43824- (unsigned long)atomic_inc_return(&serio_no));
43825+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
43826 serio->dev.bus = &serio_bus;
43827 serio->dev.release = serio_release_port;
43828 serio->dev.groups = serio_device_attr_groups;
43829diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43830index 71ef5d6..93380a9 100644
43831--- a/drivers/input/serio/serio_raw.c
43832+++ b/drivers/input/serio/serio_raw.c
43833@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43834
43835 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43836 {
43837- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
43838+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
43839 struct serio_raw *serio_raw;
43840 int err;
43841
43842@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43843 }
43844
43845 snprintf(serio_raw->name, sizeof(serio_raw->name),
43846- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
43847+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
43848 kref_init(&serio_raw->kref);
43849 INIT_LIST_HEAD(&serio_raw->client_list);
43850 init_waitqueue_head(&serio_raw->wait);
43851diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
43852index 92e2243..8fd9092 100644
43853--- a/drivers/input/touchscreen/htcpen.c
43854+++ b/drivers/input/touchscreen/htcpen.c
43855@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
43856 }
43857 };
43858
43859-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
43860+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
43861 {
43862 .ident = "Shift",
43863 .matches = {
43864diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43865index ca9f4ed..b860ff1 100644
43866--- a/drivers/iommu/amd_iommu.c
43867+++ b/drivers/iommu/amd_iommu.c
43868@@ -829,11 +829,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43869
43870 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43871 {
43872+ phys_addr_t physaddr;
43873 WARN_ON(address & 0x7ULL);
43874
43875 memset(cmd, 0, sizeof(*cmd));
43876- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43877- cmd->data[1] = upper_32_bits(__pa(address));
43878+
43879+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43880+ if (object_starts_on_stack((void *)address)) {
43881+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43882+ physaddr = __pa((u64)adjbuf);
43883+ } else
43884+#endif
43885+ physaddr = __pa(address);
43886+
43887+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43888+ cmd->data[1] = upper_32_bits(physaddr);
43889 cmd->data[2] = 1;
43890 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43891 }
43892diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43893index 65075ef..53823f9 100644
43894--- a/drivers/iommu/arm-smmu.c
43895+++ b/drivers/iommu/arm-smmu.c
43896@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
43897
43898 struct arm_smmu_domain {
43899 struct arm_smmu_device *smmu;
43900- struct io_pgtable_ops *pgtbl_ops;
43901+ struct io_pgtable *pgtbl;
43902 spinlock_t pgtbl_lock;
43903 struct arm_smmu_cfg cfg;
43904 enum arm_smmu_domain_stage stage;
43905@@ -817,7 +817,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43906 {
43907 int irq, start, ret = 0;
43908 unsigned long ias, oas;
43909- struct io_pgtable_ops *pgtbl_ops;
43910+ struct io_pgtable *pgtbl;
43911 struct io_pgtable_cfg pgtbl_cfg;
43912 enum io_pgtable_fmt fmt;
43913 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
43914@@ -902,14 +902,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43915 };
43916
43917 smmu_domain->smmu = smmu;
43918- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
43919- if (!pgtbl_ops) {
43920+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
43921+ if (!pgtbl) {
43922 ret = -ENOMEM;
43923 goto out_clear_smmu;
43924 }
43925
43926 /* Update our support page sizes to reflect the page table format */
43927- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
43928+ pax_open_kernel();
43929+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
43930+ pax_close_kernel();
43931
43932 /* Initialise the context bank with our page table cfg */
43933 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
43934@@ -930,7 +932,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43935 mutex_unlock(&smmu_domain->init_mutex);
43936
43937 /* Publish page table ops for map/unmap */
43938- smmu_domain->pgtbl_ops = pgtbl_ops;
43939+ smmu_domain->pgtbl = pgtbl;
43940 return 0;
43941
43942 out_clear_smmu:
43943@@ -963,8 +965,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
43944 free_irq(irq, domain);
43945 }
43946
43947- if (smmu_domain->pgtbl_ops)
43948- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
43949+ free_io_pgtable(smmu_domain->pgtbl);
43950
43951 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
43952 }
43953@@ -1190,13 +1191,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
43954 int ret;
43955 unsigned long flags;
43956 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
43957- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
43958+ struct io_pgtable *iop = smmu_domain->pgtbl;
43959
43960- if (!ops)
43961+ if (!iop)
43962 return -ENODEV;
43963
43964 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
43965- ret = ops->map(ops, iova, paddr, size, prot);
43966+ ret = iop->ops->map(iop, iova, paddr, size, prot);
43967 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
43968 return ret;
43969 }
43970@@ -1207,13 +1208,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
43971 size_t ret;
43972 unsigned long flags;
43973 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
43974- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
43975+ struct io_pgtable *iop = smmu_domain->pgtbl;
43976
43977- if (!ops)
43978+ if (!iop)
43979 return 0;
43980
43981 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
43982- ret = ops->unmap(ops, iova, size);
43983+ ret = iop->ops->unmap(iop, iova, size);
43984 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
43985 return ret;
43986 }
43987@@ -1224,7 +1225,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
43988 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
43989 struct arm_smmu_device *smmu = smmu_domain->smmu;
43990 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
43991- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
43992+ struct io_pgtable *iop = smmu_domain->pgtbl;
43993 struct device *dev = smmu->dev;
43994 void __iomem *cb_base;
43995 u32 tmp;
43996@@ -1247,7 +1248,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
43997 dev_err(dev,
43998 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
43999 &iova);
44000- return ops->iova_to_phys(ops, iova);
44001+ return iop->ops->iova_to_phys(iop, iova);
44002 }
44003
44004 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44005@@ -1268,9 +1269,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44006 phys_addr_t ret;
44007 unsigned long flags;
44008 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44009- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44010+ struct io_pgtable *iop = smmu_domain->pgtbl;
44011
44012- if (!ops)
44013+ if (!iop)
44014 return 0;
44015
44016 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44017@@ -1278,7 +1279,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44018 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44019 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44020 } else {
44021- ret = ops->iova_to_phys(ops, iova);
44022+ ret = iop->ops->iova_to_phys(iop, iova);
44023 }
44024
44025 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44026@@ -1668,7 +1669,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44027 size |= SZ_64K | SZ_512M;
44028 }
44029
44030- arm_smmu_ops.pgsize_bitmap &= size;
44031+ pax_open_kernel();
44032+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44033+ pax_close_kernel();
44034 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44035
44036 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44037diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44038index 4e46021..f0a24fef 100644
44039--- a/drivers/iommu/io-pgtable-arm.c
44040+++ b/drivers/iommu/io-pgtable-arm.c
44041@@ -36,12 +36,6 @@
44042 #define io_pgtable_to_data(x) \
44043 container_of((x), struct arm_lpae_io_pgtable, iop)
44044
44045-#define io_pgtable_ops_to_pgtable(x) \
44046- container_of((x), struct io_pgtable, ops)
44047-
44048-#define io_pgtable_ops_to_data(x) \
44049- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44050-
44051 /*
44052 * For consistency with the architecture, we always consider
44053 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44054@@ -304,10 +298,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44055 return pte;
44056 }
44057
44058-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44059+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44060 phys_addr_t paddr, size_t size, int iommu_prot)
44061 {
44062- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44063+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44064 arm_lpae_iopte *ptep = data->pgd;
44065 int lvl = ARM_LPAE_START_LVL(data);
44066 arm_lpae_iopte prot;
44067@@ -447,12 +441,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44068 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44069 }
44070
44071-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44072+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44073 size_t size)
44074 {
44075 size_t unmapped;
44076- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44077- struct io_pgtable *iop = &data->iop;
44078+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44079 arm_lpae_iopte *ptep = data->pgd;
44080 int lvl = ARM_LPAE_START_LVL(data);
44081
44082@@ -463,10 +456,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44083 return unmapped;
44084 }
44085
44086-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44087+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44088 unsigned long iova)
44089 {
44090- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44091+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44092 arm_lpae_iopte pte, *ptep = data->pgd;
44093 int lvl = ARM_LPAE_START_LVL(data);
44094
44095@@ -533,6 +526,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44096 }
44097 }
44098
44099+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44100+ .map = arm_lpae_map,
44101+ .unmap = arm_lpae_unmap,
44102+ .iova_to_phys = arm_lpae_iova_to_phys,
44103+};
44104+
44105 static struct arm_lpae_io_pgtable *
44106 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44107 {
44108@@ -564,11 +563,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44109 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44110 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44111
44112- data->iop.ops = (struct io_pgtable_ops) {
44113- .map = arm_lpae_map,
44114- .unmap = arm_lpae_unmap,
44115- .iova_to_phys = arm_lpae_iova_to_phys,
44116- };
44117+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44118
44119 return data;
44120 }
44121@@ -830,9 +825,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44122 .flush_pgtable = dummy_flush_pgtable,
44123 };
44124
44125-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44126+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44127 {
44128- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44129+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44130 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44131
44132 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44133@@ -842,9 +837,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44134 data->bits_per_level, data->pgd);
44135 }
44136
44137-#define __FAIL(ops, i) ({ \
44138+#define __FAIL(iop, i) ({ \
44139 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44140- arm_lpae_dump_ops(ops); \
44141+ arm_lpae_dump_ops(iop); \
44142 selftest_running = false; \
44143 -EFAULT; \
44144 })
44145@@ -859,30 +854,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44146 int i, j;
44147 unsigned long iova;
44148 size_t size;
44149- struct io_pgtable_ops *ops;
44150+ struct io_pgtable *iop;
44151+ const struct io_pgtable_ops *ops;
44152
44153 selftest_running = true;
44154
44155 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44156 cfg_cookie = cfg;
44157- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44158- if (!ops) {
44159+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44160+ if (!iop) {
44161 pr_err("selftest: failed to allocate io pgtable ops\n");
44162 return -ENOMEM;
44163 }
44164+ ops = iop->ops;
44165
44166 /*
44167 * Initial sanity checks.
44168 * Empty page tables shouldn't provide any translations.
44169 */
44170- if (ops->iova_to_phys(ops, 42))
44171- return __FAIL(ops, i);
44172+ if (ops->iova_to_phys(iop, 42))
44173+ return __FAIL(iop, i);
44174
44175- if (ops->iova_to_phys(ops, SZ_1G + 42))
44176- return __FAIL(ops, i);
44177+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44178+ return __FAIL(iop, i);
44179
44180- if (ops->iova_to_phys(ops, SZ_2G + 42))
44181- return __FAIL(ops, i);
44182+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44183+ return __FAIL(iop, i);
44184
44185 /*
44186 * Distinct mappings of different granule sizes.
44187@@ -892,19 +889,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44188 while (j != BITS_PER_LONG) {
44189 size = 1UL << j;
44190
44191- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44192+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44193 IOMMU_WRITE |
44194 IOMMU_NOEXEC |
44195 IOMMU_CACHE))
44196- return __FAIL(ops, i);
44197+ return __FAIL(iop, i);
44198
44199 /* Overlapping mappings */
44200- if (!ops->map(ops, iova, iova + size, size,
44201+ if (!ops->map(iop, iova, iova + size, size,
44202 IOMMU_READ | IOMMU_NOEXEC))
44203- return __FAIL(ops, i);
44204+ return __FAIL(iop, i);
44205
44206- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44207- return __FAIL(ops, i);
44208+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44209+ return __FAIL(iop, i);
44210
44211 iova += SZ_1G;
44212 j++;
44213@@ -913,15 +910,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44214
44215 /* Partial unmap */
44216 size = 1UL << __ffs(cfg->pgsize_bitmap);
44217- if (ops->unmap(ops, SZ_1G + size, size) != size)
44218- return __FAIL(ops, i);
44219+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44220+ return __FAIL(iop, i);
44221
44222 /* Remap of partial unmap */
44223- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44224- return __FAIL(ops, i);
44225+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44226+ return __FAIL(iop, i);
44227
44228- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44229- return __FAIL(ops, i);
44230+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44231+ return __FAIL(iop, i);
44232
44233 /* Full unmap */
44234 iova = 0;
44235@@ -929,25 +926,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44236 while (j != BITS_PER_LONG) {
44237 size = 1UL << j;
44238
44239- if (ops->unmap(ops, iova, size) != size)
44240- return __FAIL(ops, i);
44241+ if (ops->unmap(iop, iova, size) != size)
44242+ return __FAIL(iop, i);
44243
44244- if (ops->iova_to_phys(ops, iova + 42))
44245- return __FAIL(ops, i);
44246+ if (ops->iova_to_phys(iop, iova + 42))
44247+ return __FAIL(iop, i);
44248
44249 /* Remap full block */
44250- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44251- return __FAIL(ops, i);
44252+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44253+ return __FAIL(iop, i);
44254
44255- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44256- return __FAIL(ops, i);
44257+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44258+ return __FAIL(iop, i);
44259
44260 iova += SZ_1G;
44261 j++;
44262 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44263 }
44264
44265- free_io_pgtable_ops(ops);
44266+ free_io_pgtable(iop);
44267 }
44268
44269 selftest_running = false;
44270diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44271index 6436fe2..088c965 100644
44272--- a/drivers/iommu/io-pgtable.c
44273+++ b/drivers/iommu/io-pgtable.c
44274@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44275 #endif
44276 };
44277
44278-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44279+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44280 struct io_pgtable_cfg *cfg,
44281 void *cookie)
44282 {
44283@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44284 iop->cookie = cookie;
44285 iop->cfg = *cfg;
44286
44287- return &iop->ops;
44288+ return iop;
44289 }
44290
44291 /*
44292 * It is the IOMMU driver's responsibility to ensure that the page table
44293 * is no longer accessible to the walker by this point.
44294 */
44295-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44296+void free_io_pgtable(struct io_pgtable *iop)
44297 {
44298- struct io_pgtable *iop;
44299-
44300- if (!ops)
44301+ if (!iop)
44302 return;
44303
44304- iop = container_of(ops, struct io_pgtable, ops);
44305 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44306 io_pgtable_init_table[iop->fmt]->free(iop);
44307 }
44308diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44309index 10e32f6..0b276c8 100644
44310--- a/drivers/iommu/io-pgtable.h
44311+++ b/drivers/iommu/io-pgtable.h
44312@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44313 * These functions map directly onto the iommu_ops member functions with
44314 * the same names.
44315 */
44316+struct io_pgtable;
44317 struct io_pgtable_ops {
44318- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44319+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44320 phys_addr_t paddr, size_t size, int prot);
44321- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44322+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44323 size_t size);
44324- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44325+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44326 unsigned long iova);
44327 };
44328
44329 /**
44330- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44331+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44332 *
44333 * @fmt: The page table format.
44334 * @cfg: The page table configuration. This will be modified to represent
44335@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44336 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44337 * the callback routines in cfg->tlb.
44338 */
44339-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44340- struct io_pgtable_cfg *cfg,
44341- void *cookie);
44342+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44343+ struct io_pgtable_cfg *cfg,
44344+ void *cookie);
44345
44346 /**
44347 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44348@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44349 *
44350 * @ops: The ops returned from alloc_io_pgtable_ops.
44351 */
44352-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44353+void free_io_pgtable(struct io_pgtable *iop);
44354
44355
44356 /*
44357@@ -125,7 +126,7 @@ struct io_pgtable {
44358 enum io_pgtable_fmt fmt;
44359 void *cookie;
44360 struct io_pgtable_cfg cfg;
44361- struct io_pgtable_ops ops;
44362+ const struct io_pgtable_ops *ops;
44363 };
44364
44365 /**
44366diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44367index d4f527e..8e4a4fd 100644
44368--- a/drivers/iommu/iommu.c
44369+++ b/drivers/iommu/iommu.c
44370@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44371 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44372 {
44373 int err;
44374- struct notifier_block *nb;
44375+ notifier_block_no_const *nb;
44376 struct iommu_callback_data cb = {
44377 .ops = ops,
44378 };
44379diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44380index 1a67c53..23181d8 100644
44381--- a/drivers/iommu/ipmmu-vmsa.c
44382+++ b/drivers/iommu/ipmmu-vmsa.c
44383@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44384 struct iommu_domain io_domain;
44385
44386 struct io_pgtable_cfg cfg;
44387- struct io_pgtable_ops *iop;
44388+ struct io_pgtable *iop;
44389
44390 unsigned int context_id;
44391 spinlock_t lock; /* Protects mappings */
44392@@ -328,8 +328,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44393 domain->cfg.oas = 40;
44394 domain->cfg.tlb = &ipmmu_gather_ops;
44395
44396- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44397- domain);
44398+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44399 if (!domain->iop)
44400 return -EINVAL;
44401
44402@@ -487,7 +486,7 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
44403 * been detached.
44404 */
44405 ipmmu_domain_destroy_context(domain);
44406- free_io_pgtable_ops(domain->iop);
44407+ free_io_pgtable(domain->iop);
44408 kfree(domain);
44409 }
44410
44411@@ -556,7 +555,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44412 if (!domain)
44413 return -ENODEV;
44414
44415- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44416+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44417 }
44418
44419 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44420@@ -564,7 +563,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44421 {
44422 struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
44423
44424- return domain->iop->unmap(domain->iop, iova, size);
44425+ return domain->iop->ops->unmap(domain->iop, iova, size);
44426 }
44427
44428 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44429@@ -574,7 +573,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44430
44431 /* TODO: Is locking needed ? */
44432
44433- return domain->iop->iova_to_phys(domain->iop, iova);
44434+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44435 }
44436
44437 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44438diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44439index 390079e..1da9d6c 100644
44440--- a/drivers/iommu/irq_remapping.c
44441+++ b/drivers/iommu/irq_remapping.c
44442@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44443 void panic_if_irq_remap(const char *msg)
44444 {
44445 if (irq_remapping_enabled)
44446- panic(msg);
44447+ panic("%s", msg);
44448 }
44449
44450 static void ir_ack_apic_edge(struct irq_data *data)
44451@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44452
44453 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44454 {
44455- chip->irq_print_chip = ir_print_prefix;
44456- chip->irq_ack = ir_ack_apic_edge;
44457- chip->irq_eoi = ir_ack_apic_level;
44458- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44459+ pax_open_kernel();
44460+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44461+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44462+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44463+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44464+ pax_close_kernel();
44465 }
44466
44467 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44468diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44469index 01999d7..4f14bb7 100644
44470--- a/drivers/irqchip/irq-gic.c
44471+++ b/drivers/irqchip/irq-gic.c
44472@@ -313,7 +313,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44473 chained_irq_exit(chip, desc);
44474 }
44475
44476-static struct irq_chip gic_chip = {
44477+static irq_chip_no_const gic_chip __read_only = {
44478 .name = "GIC",
44479 .irq_mask = gic_mask_irq,
44480 .irq_unmask = gic_unmask_irq,
44481diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44482index 9a0767b..5e5f86f 100644
44483--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44484+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44485@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44486 struct intc_irqpin_iomem *i;
44487 struct resource *io[INTC_IRQPIN_REG_NR];
44488 struct resource *irq;
44489- struct irq_chip *irq_chip;
44490+ irq_chip_no_const *irq_chip;
44491 void (*enable_fn)(struct irq_data *d);
44492 void (*disable_fn)(struct irq_data *d);
44493 const char *name = dev_name(dev);
44494diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44495index cdf80b7..e5c3ade 100644
44496--- a/drivers/irqchip/irq-renesas-irqc.c
44497+++ b/drivers/irqchip/irq-renesas-irqc.c
44498@@ -179,7 +179,7 @@ static int irqc_probe(struct platform_device *pdev)
44499 struct irqc_priv *p;
44500 struct resource *io;
44501 struct resource *irq;
44502- struct irq_chip *irq_chip;
44503+ irq_chip_no_const *irq_chip;
44504 const char *name = dev_name(&pdev->dev);
44505 int ret;
44506 int k;
44507diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44508index 6a2df32..dc962f1 100644
44509--- a/drivers/isdn/capi/capi.c
44510+++ b/drivers/isdn/capi/capi.c
44511@@ -81,8 +81,8 @@ struct capiminor {
44512
44513 struct capi20_appl *ap;
44514 u32 ncci;
44515- atomic_t datahandle;
44516- atomic_t msgid;
44517+ atomic_unchecked_t datahandle;
44518+ atomic_unchecked_t msgid;
44519
44520 struct tty_port port;
44521 int ttyinstop;
44522@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44523 capimsg_setu16(s, 2, mp->ap->applid);
44524 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44525 capimsg_setu8 (s, 5, CAPI_RESP);
44526- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44527+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44528 capimsg_setu32(s, 8, mp->ncci);
44529 capimsg_setu16(s, 12, datahandle);
44530 }
44531@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44532 mp->outbytes -= len;
44533 spin_unlock_bh(&mp->outlock);
44534
44535- datahandle = atomic_inc_return(&mp->datahandle);
44536+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44537 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44538 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44539 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44540 capimsg_setu16(skb->data, 2, mp->ap->applid);
44541 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44542 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44543- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44544+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44545 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44546 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44547 capimsg_setu16(skb->data, 16, len); /* Data length */
44548diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44549index aecec6d..11e13c5 100644
44550--- a/drivers/isdn/gigaset/bas-gigaset.c
44551+++ b/drivers/isdn/gigaset/bas-gigaset.c
44552@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44553
44554
44555 static const struct gigaset_ops gigops = {
44556- gigaset_write_cmd,
44557- gigaset_write_room,
44558- gigaset_chars_in_buffer,
44559- gigaset_brkchars,
44560- gigaset_init_bchannel,
44561- gigaset_close_bchannel,
44562- gigaset_initbcshw,
44563- gigaset_freebcshw,
44564- gigaset_reinitbcshw,
44565- gigaset_initcshw,
44566- gigaset_freecshw,
44567- gigaset_set_modem_ctrl,
44568- gigaset_baud_rate,
44569- gigaset_set_line_ctrl,
44570- gigaset_isoc_send_skb,
44571- gigaset_isoc_input,
44572+ .write_cmd = gigaset_write_cmd,
44573+ .write_room = gigaset_write_room,
44574+ .chars_in_buffer = gigaset_chars_in_buffer,
44575+ .brkchars = gigaset_brkchars,
44576+ .init_bchannel = gigaset_init_bchannel,
44577+ .close_bchannel = gigaset_close_bchannel,
44578+ .initbcshw = gigaset_initbcshw,
44579+ .freebcshw = gigaset_freebcshw,
44580+ .reinitbcshw = gigaset_reinitbcshw,
44581+ .initcshw = gigaset_initcshw,
44582+ .freecshw = gigaset_freecshw,
44583+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44584+ .baud_rate = gigaset_baud_rate,
44585+ .set_line_ctrl = gigaset_set_line_ctrl,
44586+ .send_skb = gigaset_isoc_send_skb,
44587+ .handle_input = gigaset_isoc_input,
44588 };
44589
44590 /* bas_gigaset_init
44591diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44592index 600c79b..3752bab 100644
44593--- a/drivers/isdn/gigaset/interface.c
44594+++ b/drivers/isdn/gigaset/interface.c
44595@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44596 }
44597 tty->driver_data = cs;
44598
44599- ++cs->port.count;
44600+ atomic_inc(&cs->port.count);
44601
44602- if (cs->port.count == 1) {
44603+ if (atomic_read(&cs->port.count) == 1) {
44604 tty_port_tty_set(&cs->port, tty);
44605 cs->port.low_latency = 1;
44606 }
44607@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44608
44609 if (!cs->connected)
44610 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44611- else if (!cs->port.count)
44612+ else if (!atomic_read(&cs->port.count))
44613 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44614- else if (!--cs->port.count)
44615+ else if (!atomic_dec_return(&cs->port.count))
44616 tty_port_tty_set(&cs->port, NULL);
44617
44618 mutex_unlock(&cs->mutex);
44619diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44620index 8c91fd5..14f13ce 100644
44621--- a/drivers/isdn/gigaset/ser-gigaset.c
44622+++ b/drivers/isdn/gigaset/ser-gigaset.c
44623@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44624 }
44625
44626 static const struct gigaset_ops ops = {
44627- gigaset_write_cmd,
44628- gigaset_write_room,
44629- gigaset_chars_in_buffer,
44630- gigaset_brkchars,
44631- gigaset_init_bchannel,
44632- gigaset_close_bchannel,
44633- gigaset_initbcshw,
44634- gigaset_freebcshw,
44635- gigaset_reinitbcshw,
44636- gigaset_initcshw,
44637- gigaset_freecshw,
44638- gigaset_set_modem_ctrl,
44639- gigaset_baud_rate,
44640- gigaset_set_line_ctrl,
44641- gigaset_m10x_send_skb, /* asyncdata.c */
44642- gigaset_m10x_input, /* asyncdata.c */
44643+ .write_cmd = gigaset_write_cmd,
44644+ .write_room = gigaset_write_room,
44645+ .chars_in_buffer = gigaset_chars_in_buffer,
44646+ .brkchars = gigaset_brkchars,
44647+ .init_bchannel = gigaset_init_bchannel,
44648+ .close_bchannel = gigaset_close_bchannel,
44649+ .initbcshw = gigaset_initbcshw,
44650+ .freebcshw = gigaset_freebcshw,
44651+ .reinitbcshw = gigaset_reinitbcshw,
44652+ .initcshw = gigaset_initcshw,
44653+ .freecshw = gigaset_freecshw,
44654+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44655+ .baud_rate = gigaset_baud_rate,
44656+ .set_line_ctrl = gigaset_set_line_ctrl,
44657+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
44658+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
44659 };
44660
44661
44662diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
44663index 5f306e2..5342f88 100644
44664--- a/drivers/isdn/gigaset/usb-gigaset.c
44665+++ b/drivers/isdn/gigaset/usb-gigaset.c
44666@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
44667 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
44668 memcpy(cs->hw.usb->bchars, buf, 6);
44669 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
44670- 0, 0, &buf, 6, 2000);
44671+ 0, 0, buf, 6, 2000);
44672 }
44673
44674 static void gigaset_freebcshw(struct bc_state *bcs)
44675@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
44676 }
44677
44678 static const struct gigaset_ops ops = {
44679- gigaset_write_cmd,
44680- gigaset_write_room,
44681- gigaset_chars_in_buffer,
44682- gigaset_brkchars,
44683- gigaset_init_bchannel,
44684- gigaset_close_bchannel,
44685- gigaset_initbcshw,
44686- gigaset_freebcshw,
44687- gigaset_reinitbcshw,
44688- gigaset_initcshw,
44689- gigaset_freecshw,
44690- gigaset_set_modem_ctrl,
44691- gigaset_baud_rate,
44692- gigaset_set_line_ctrl,
44693- gigaset_m10x_send_skb,
44694- gigaset_m10x_input,
44695+ .write_cmd = gigaset_write_cmd,
44696+ .write_room = gigaset_write_room,
44697+ .chars_in_buffer = gigaset_chars_in_buffer,
44698+ .brkchars = gigaset_brkchars,
44699+ .init_bchannel = gigaset_init_bchannel,
44700+ .close_bchannel = gigaset_close_bchannel,
44701+ .initbcshw = gigaset_initbcshw,
44702+ .freebcshw = gigaset_freebcshw,
44703+ .reinitbcshw = gigaset_reinitbcshw,
44704+ .initcshw = gigaset_initcshw,
44705+ .freecshw = gigaset_freecshw,
44706+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44707+ .baud_rate = gigaset_baud_rate,
44708+ .set_line_ctrl = gigaset_set_line_ctrl,
44709+ .send_skb = gigaset_m10x_send_skb,
44710+ .handle_input = gigaset_m10x_input,
44711 };
44712
44713 /*
44714diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
44715index 4d9b195..455075c 100644
44716--- a/drivers/isdn/hardware/avm/b1.c
44717+++ b/drivers/isdn/hardware/avm/b1.c
44718@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
44719 }
44720 if (left) {
44721 if (t4file->user) {
44722- if (copy_from_user(buf, dp, left))
44723+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44724 return -EFAULT;
44725 } else {
44726 memcpy(buf, dp, left);
44727@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44728 }
44729 if (left) {
44730 if (config->user) {
44731- if (copy_from_user(buf, dp, left))
44732+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44733 return -EFAULT;
44734 } else {
44735 memcpy(buf, dp, left);
44736diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44737index 9b856e1..fa03c92 100644
44738--- a/drivers/isdn/i4l/isdn_common.c
44739+++ b/drivers/isdn/i4l/isdn_common.c
44740@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44741 } else
44742 return -EINVAL;
44743 case IIOCDBGVAR:
44744+ if (!capable(CAP_SYS_RAWIO))
44745+ return -EPERM;
44746 if (arg) {
44747 if (copy_to_user(argp, &dev, sizeof(ulong)))
44748 return -EFAULT;
44749diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44750index 91d5730..336523e 100644
44751--- a/drivers/isdn/i4l/isdn_concap.c
44752+++ b/drivers/isdn/i4l/isdn_concap.c
44753@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44754 }
44755
44756 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44757- &isdn_concap_dl_data_req,
44758- &isdn_concap_dl_connect_req,
44759- &isdn_concap_dl_disconn_req
44760+ .data_req = &isdn_concap_dl_data_req,
44761+ .connect_req = &isdn_concap_dl_connect_req,
44762+ .disconn_req = &isdn_concap_dl_disconn_req
44763 };
44764
44765 /* The following should better go into a dedicated source file such that
44766diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44767index bc91261..2ef7e36 100644
44768--- a/drivers/isdn/i4l/isdn_tty.c
44769+++ b/drivers/isdn/i4l/isdn_tty.c
44770@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44771
44772 #ifdef ISDN_DEBUG_MODEM_OPEN
44773 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44774- port->count);
44775+ atomic_read(&port->count));
44776 #endif
44777- port->count++;
44778+ atomic_inc(&port->count);
44779 port->tty = tty;
44780 /*
44781 * Start up serial port
44782@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44783 #endif
44784 return;
44785 }
44786- if ((tty->count == 1) && (port->count != 1)) {
44787+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44788 /*
44789 * Uh, oh. tty->count is 1, which means that the tty
44790 * structure will be freed. Info->count should always
44791@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44792 * serial port won't be shutdown.
44793 */
44794 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44795- "info->count is %d\n", port->count);
44796- port->count = 1;
44797+ "info->count is %d\n", atomic_read(&port->count));
44798+ atomic_set(&port->count, 1);
44799 }
44800- if (--port->count < 0) {
44801+ if (atomic_dec_return(&port->count) < 0) {
44802 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44803- info->line, port->count);
44804- port->count = 0;
44805+ info->line, atomic_read(&port->count));
44806+ atomic_set(&port->count, 0);
44807 }
44808- if (port->count) {
44809+ if (atomic_read(&port->count)) {
44810 #ifdef ISDN_DEBUG_MODEM_OPEN
44811 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44812 #endif
44813@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44814 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44815 return;
44816 isdn_tty_shutdown(info);
44817- port->count = 0;
44818+ atomic_set(&port->count, 0);
44819 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44820 port->tty = NULL;
44821 wake_up_interruptible(&port->open_wait);
44822@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44823 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44824 modem_info *info = &dev->mdm.info[i];
44825
44826- if (info->port.count == 0)
44827+ if (atomic_read(&info->port.count) == 0)
44828 continue;
44829 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44830 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44831diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44832index e2d4e58..40cd045 100644
44833--- a/drivers/isdn/i4l/isdn_x25iface.c
44834+++ b/drivers/isdn/i4l/isdn_x25iface.c
44835@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44836
44837
44838 static struct concap_proto_ops ix25_pops = {
44839- &isdn_x25iface_proto_new,
44840- &isdn_x25iface_proto_del,
44841- &isdn_x25iface_proto_restart,
44842- &isdn_x25iface_proto_close,
44843- &isdn_x25iface_xmit,
44844- &isdn_x25iface_receive,
44845- &isdn_x25iface_connect_ind,
44846- &isdn_x25iface_disconn_ind
44847+ .proto_new = &isdn_x25iface_proto_new,
44848+ .proto_del = &isdn_x25iface_proto_del,
44849+ .restart = &isdn_x25iface_proto_restart,
44850+ .close = &isdn_x25iface_proto_close,
44851+ .encap_and_xmit = &isdn_x25iface_xmit,
44852+ .data_ind = &isdn_x25iface_receive,
44853+ .connect_ind = &isdn_x25iface_connect_ind,
44854+ .disconn_ind = &isdn_x25iface_disconn_ind
44855 };
44856
44857 /* error message helper function */
44858diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44859index 358a574..b4987ea 100644
44860--- a/drivers/isdn/icn/icn.c
44861+++ b/drivers/isdn/icn/icn.c
44862@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44863 if (count > len)
44864 count = len;
44865 if (user) {
44866- if (copy_from_user(msg, buf, count))
44867+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44868 return -EFAULT;
44869 } else
44870 memcpy(msg, buf, count);
44871diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44872index 52c4382..09e0c7c 100644
44873--- a/drivers/isdn/mISDN/dsp_cmx.c
44874+++ b/drivers/isdn/mISDN/dsp_cmx.c
44875@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44876 static u16 dsp_count; /* last sample count */
44877 static int dsp_count_valid; /* if we have last sample count */
44878
44879-void
44880+void __intentional_overflow(-1)
44881 dsp_cmx_send(void *arg)
44882 {
44883 struct dsp_conf *conf;
44884diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44885index 312ffd3..9263d05 100644
44886--- a/drivers/lguest/core.c
44887+++ b/drivers/lguest/core.c
44888@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44889 * The end address needs +1 because __get_vm_area allocates an
44890 * extra guard page, so we need space for that.
44891 */
44892+
44893+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44894+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44895+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44896+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44897+#else
44898 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44899 VM_ALLOC, switcher_addr, switcher_addr
44900 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44901+#endif
44902+
44903 if (!switcher_vma) {
44904 err = -ENOMEM;
44905 printk("lguest: could not map switcher pages high\n");
44906@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44907 * Now the Switcher is mapped at the right address, we can't fail!
44908 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44909 */
44910- memcpy(switcher_vma->addr, start_switcher_text,
44911+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44912 end_switcher_text - start_switcher_text);
44913
44914 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44915diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44916index e3abebc9..6a35328 100644
44917--- a/drivers/lguest/page_tables.c
44918+++ b/drivers/lguest/page_tables.c
44919@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44920 /*:*/
44921
44922 #ifdef CONFIG_X86_PAE
44923-static void release_pmd(pmd_t *spmd)
44924+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44925 {
44926 /* If the entry's not present, there's nothing to release. */
44927 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44928diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44929index 30f2aef..391c748 100644
44930--- a/drivers/lguest/x86/core.c
44931+++ b/drivers/lguest/x86/core.c
44932@@ -60,7 +60,7 @@ static struct {
44933 /* Offset from where switcher.S was compiled to where we've copied it */
44934 static unsigned long switcher_offset(void)
44935 {
44936- return switcher_addr - (unsigned long)start_switcher_text;
44937+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44938 }
44939
44940 /* This cpu's struct lguest_pages (after the Switcher text page) */
44941@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44942 * These copies are pretty cheap, so we do them unconditionally: */
44943 /* Save the current Host top-level page directory.
44944 */
44945+
44946+#ifdef CONFIG_PAX_PER_CPU_PGD
44947+ pages->state.host_cr3 = read_cr3();
44948+#else
44949 pages->state.host_cr3 = __pa(current->mm->pgd);
44950+#endif
44951+
44952 /*
44953 * Set up the Guest's page tables to see this CPU's pages (and no
44954 * other CPU's pages).
44955@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
44956 * compiled-in switcher code and the high-mapped copy we just made.
44957 */
44958 for (i = 0; i < IDT_ENTRIES; i++)
44959- default_idt_entries[i] += switcher_offset();
44960+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44961
44962 /*
44963 * Set up the Switcher's per-cpu areas.
44964@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
44965 * it will be undisturbed when we switch. To change %cs and jump we
44966 * need this structure to feed to Intel's "lcall" instruction.
44967 */
44968- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44969+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44970 lguest_entry.segment = LGUEST_CS;
44971
44972 /*
44973diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44974index 40634b0..4f5855e 100644
44975--- a/drivers/lguest/x86/switcher_32.S
44976+++ b/drivers/lguest/x86/switcher_32.S
44977@@ -87,6 +87,7 @@
44978 #include <asm/page.h>
44979 #include <asm/segment.h>
44980 #include <asm/lguest.h>
44981+#include <asm/processor-flags.h>
44982
44983 // We mark the start of the code to copy
44984 // It's placed in .text tho it's never run here
44985@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44986 // Changes type when we load it: damn Intel!
44987 // For after we switch over our page tables
44988 // That entry will be read-only: we'd crash.
44989+
44990+#ifdef CONFIG_PAX_KERNEXEC
44991+ mov %cr0, %edx
44992+ xor $X86_CR0_WP, %edx
44993+ mov %edx, %cr0
44994+#endif
44995+
44996 movl $(GDT_ENTRY_TSS*8), %edx
44997 ltr %dx
44998
44999@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45000 // Let's clear it again for our return.
45001 // The GDT descriptor of the Host
45002 // Points to the table after two "size" bytes
45003- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45004+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45005 // Clear "used" from type field (byte 5, bit 2)
45006- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45007+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45008+
45009+#ifdef CONFIG_PAX_KERNEXEC
45010+ mov %cr0, %eax
45011+ xor $X86_CR0_WP, %eax
45012+ mov %eax, %cr0
45013+#endif
45014
45015 // Once our page table's switched, the Guest is live!
45016 // The Host fades as we run this final step.
45017@@ -295,13 +309,12 @@ deliver_to_host:
45018 // I consulted gcc, and it gave
45019 // These instructions, which I gladly credit:
45020 leal (%edx,%ebx,8), %eax
45021- movzwl (%eax),%edx
45022- movl 4(%eax), %eax
45023- xorw %ax, %ax
45024- orl %eax, %edx
45025+ movl 4(%eax), %edx
45026+ movw (%eax), %dx
45027 // Now the address of the handler's in %edx
45028 // We call it now: its "iret" drops us home.
45029- jmp *%edx
45030+ ljmp $__KERNEL_CS, $1f
45031+1: jmp *%edx
45032
45033 // Every interrupt can come to us here
45034 // But we must truly tell each apart.
45035diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45036index a08e3ee..df8ade2 100644
45037--- a/drivers/md/bcache/closure.h
45038+++ b/drivers/md/bcache/closure.h
45039@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45040 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45041 struct workqueue_struct *wq)
45042 {
45043- BUG_ON(object_is_on_stack(cl));
45044+ BUG_ON(object_starts_on_stack(cl));
45045 closure_set_ip(cl);
45046 cl->fn = fn;
45047 cl->wq = wq;
45048diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45049index c90118e..226d9e5 100644
45050--- a/drivers/md/bitmap.c
45051+++ b/drivers/md/bitmap.c
45052@@ -1936,7 +1936,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45053 chunk_kb ? "KB" : "B");
45054 if (bitmap->storage.file) {
45055 seq_printf(seq, ", file: ");
45056- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45057+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45058 }
45059
45060 seq_printf(seq, "\n");
45061diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45062index 720ceeb..030f1d4 100644
45063--- a/drivers/md/dm-ioctl.c
45064+++ b/drivers/md/dm-ioctl.c
45065@@ -1773,7 +1773,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45066 cmd == DM_LIST_VERSIONS_CMD)
45067 return 0;
45068
45069- if ((cmd == DM_DEV_CREATE_CMD)) {
45070+ if (cmd == DM_DEV_CREATE_CMD) {
45071 if (!*param->name) {
45072 DMWARN("name not supplied when creating device");
45073 return -EINVAL;
45074diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45075index 089d627..ef7352e 100644
45076--- a/drivers/md/dm-raid1.c
45077+++ b/drivers/md/dm-raid1.c
45078@@ -40,7 +40,7 @@ enum dm_raid1_error {
45079
45080 struct mirror {
45081 struct mirror_set *ms;
45082- atomic_t error_count;
45083+ atomic_unchecked_t error_count;
45084 unsigned long error_type;
45085 struct dm_dev *dev;
45086 sector_t offset;
45087@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45088 struct mirror *m;
45089
45090 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45091- if (!atomic_read(&m->error_count))
45092+ if (!atomic_read_unchecked(&m->error_count))
45093 return m;
45094
45095 return NULL;
45096@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45097 * simple way to tell if a device has encountered
45098 * errors.
45099 */
45100- atomic_inc(&m->error_count);
45101+ atomic_inc_unchecked(&m->error_count);
45102
45103 if (test_and_set_bit(error_type, &m->error_type))
45104 return;
45105@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45106 struct mirror *m = get_default_mirror(ms);
45107
45108 do {
45109- if (likely(!atomic_read(&m->error_count)))
45110+ if (likely(!atomic_read_unchecked(&m->error_count)))
45111 return m;
45112
45113 if (m-- == ms->mirror)
45114@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45115 {
45116 struct mirror *default_mirror = get_default_mirror(m->ms);
45117
45118- return !atomic_read(&default_mirror->error_count);
45119+ return !atomic_read_unchecked(&default_mirror->error_count);
45120 }
45121
45122 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45123@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45124 */
45125 if (likely(region_in_sync(ms, region, 1)))
45126 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45127- else if (m && atomic_read(&m->error_count))
45128+ else if (m && atomic_read_unchecked(&m->error_count))
45129 m = NULL;
45130
45131 if (likely(m))
45132@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45133 }
45134
45135 ms->mirror[mirror].ms = ms;
45136- atomic_set(&(ms->mirror[mirror].error_count), 0);
45137+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45138 ms->mirror[mirror].error_type = 0;
45139 ms->mirror[mirror].offset = offset;
45140
45141@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45142 */
45143 static char device_status_char(struct mirror *m)
45144 {
45145- if (!atomic_read(&(m->error_count)))
45146+ if (!atomic_read_unchecked(&(m->error_count)))
45147 return 'A';
45148
45149 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45150diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45151index 419bdd4..e5eb76d 100644
45152--- a/drivers/md/dm-stats.c
45153+++ b/drivers/md/dm-stats.c
45154@@ -382,7 +382,7 @@ do_sync_free:
45155 synchronize_rcu_expedited();
45156 dm_stat_free(&s->rcu_head);
45157 } else {
45158- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45159+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45160 call_rcu(&s->rcu_head, dm_stat_free);
45161 }
45162 return 0;
45163@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45164 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45165 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45166 ));
45167- ACCESS_ONCE(last->last_sector) = end_sector;
45168- ACCESS_ONCE(last->last_rw) = bi_rw;
45169+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45170+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45171 }
45172
45173 rcu_read_lock();
45174diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45175index f8b37d4..5c5cafd 100644
45176--- a/drivers/md/dm-stripe.c
45177+++ b/drivers/md/dm-stripe.c
45178@@ -21,7 +21,7 @@ struct stripe {
45179 struct dm_dev *dev;
45180 sector_t physical_start;
45181
45182- atomic_t error_count;
45183+ atomic_unchecked_t error_count;
45184 };
45185
45186 struct stripe_c {
45187@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45188 kfree(sc);
45189 return r;
45190 }
45191- atomic_set(&(sc->stripe[i].error_count), 0);
45192+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45193 }
45194
45195 ti->private = sc;
45196@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45197 DMEMIT("%d ", sc->stripes);
45198 for (i = 0; i < sc->stripes; i++) {
45199 DMEMIT("%s ", sc->stripe[i].dev->name);
45200- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45201+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45202 'D' : 'A';
45203 }
45204 buffer[i] = '\0';
45205@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45206 */
45207 for (i = 0; i < sc->stripes; i++)
45208 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45209- atomic_inc(&(sc->stripe[i].error_count));
45210- if (atomic_read(&(sc->stripe[i].error_count)) <
45211+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45212+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45213 DM_IO_ERROR_THRESHOLD)
45214 schedule_work(&sc->trigger_event);
45215 }
45216diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45217index 16ba55a..31af906 100644
45218--- a/drivers/md/dm-table.c
45219+++ b/drivers/md/dm-table.c
45220@@ -305,7 +305,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45221 if (!dev_size)
45222 return 0;
45223
45224- if ((start >= dev_size) || (start + len > dev_size)) {
45225+ if ((start >= dev_size) || (len > dev_size - start)) {
45226 DMWARN("%s: %s too small for target: "
45227 "start=%llu, len=%llu, dev_size=%llu",
45228 dm_device_name(ti->table->md), bdevname(bdev, b),
45229diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45230index cde1d67..4c88a5ce 100644
45231--- a/drivers/md/dm-thin-metadata.c
45232+++ b/drivers/md/dm-thin-metadata.c
45233@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45234 {
45235 pmd->info.tm = pmd->tm;
45236 pmd->info.levels = 2;
45237- pmd->info.value_type.context = pmd->data_sm;
45238+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45239 pmd->info.value_type.size = sizeof(__le64);
45240 pmd->info.value_type.inc = data_block_inc;
45241 pmd->info.value_type.dec = data_block_dec;
45242@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45243
45244 pmd->bl_info.tm = pmd->tm;
45245 pmd->bl_info.levels = 1;
45246- pmd->bl_info.value_type.context = pmd->data_sm;
45247+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45248 pmd->bl_info.value_type.size = sizeof(__le64);
45249 pmd->bl_info.value_type.inc = data_block_inc;
45250 pmd->bl_info.value_type.dec = data_block_dec;
45251diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45252index 697f34f..8301900 100644
45253--- a/drivers/md/dm.c
45254+++ b/drivers/md/dm.c
45255@@ -191,9 +191,9 @@ struct mapped_device {
45256 /*
45257 * Event handling.
45258 */
45259- atomic_t event_nr;
45260+ atomic_unchecked_t event_nr;
45261 wait_queue_head_t eventq;
45262- atomic_t uevent_seq;
45263+ atomic_unchecked_t uevent_seq;
45264 struct list_head uevent_list;
45265 spinlock_t uevent_lock; /* Protect access to uevent_list */
45266
45267@@ -2287,8 +2287,8 @@ static struct mapped_device *alloc_dev(int minor)
45268 spin_lock_init(&md->deferred_lock);
45269 atomic_set(&md->holders, 1);
45270 atomic_set(&md->open_count, 0);
45271- atomic_set(&md->event_nr, 0);
45272- atomic_set(&md->uevent_seq, 0);
45273+ atomic_set_unchecked(&md->event_nr, 0);
45274+ atomic_set_unchecked(&md->uevent_seq, 0);
45275 INIT_LIST_HEAD(&md->uevent_list);
45276 INIT_LIST_HEAD(&md->table_devices);
45277 spin_lock_init(&md->uevent_lock);
45278@@ -2455,7 +2455,7 @@ static void event_callback(void *context)
45279
45280 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45281
45282- atomic_inc(&md->event_nr);
45283+ atomic_inc_unchecked(&md->event_nr);
45284 wake_up(&md->eventq);
45285 }
45286
45287@@ -3454,18 +3454,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45288
45289 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45290 {
45291- return atomic_add_return(1, &md->uevent_seq);
45292+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45293 }
45294
45295 uint32_t dm_get_event_nr(struct mapped_device *md)
45296 {
45297- return atomic_read(&md->event_nr);
45298+ return atomic_read_unchecked(&md->event_nr);
45299 }
45300
45301 int dm_wait_event(struct mapped_device *md, int event_nr)
45302 {
45303 return wait_event_interruptible(md->eventq,
45304- (event_nr != atomic_read(&md->event_nr)));
45305+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45306 }
45307
45308 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45309diff --git a/drivers/md/md.c b/drivers/md/md.c
45310index e462151..8ac9655 100644
45311--- a/drivers/md/md.c
45312+++ b/drivers/md/md.c
45313@@ -197,10 +197,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45314 * start build, activate spare
45315 */
45316 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45317-static atomic_t md_event_count;
45318+static atomic_unchecked_t md_event_count;
45319 void md_new_event(struct mddev *mddev)
45320 {
45321- atomic_inc(&md_event_count);
45322+ atomic_inc_unchecked(&md_event_count);
45323 wake_up(&md_event_waiters);
45324 }
45325 EXPORT_SYMBOL_GPL(md_new_event);
45326@@ -210,7 +210,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45327 */
45328 static void md_new_event_inintr(struct mddev *mddev)
45329 {
45330- atomic_inc(&md_event_count);
45331+ atomic_inc_unchecked(&md_event_count);
45332 wake_up(&md_event_waiters);
45333 }
45334
45335@@ -1449,7 +1449,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45336 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45337 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45338 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45339- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45340+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45341
45342 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45343 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45344@@ -1700,7 +1700,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45345 else
45346 sb->resync_offset = cpu_to_le64(0);
45347
45348- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45349+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45350
45351 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45352 sb->size = cpu_to_le64(mddev->dev_sectors);
45353@@ -2624,7 +2624,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45354 static ssize_t
45355 errors_show(struct md_rdev *rdev, char *page)
45356 {
45357- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45358+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45359 }
45360
45361 static ssize_t
45362@@ -2633,7 +2633,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45363 char *e;
45364 unsigned long n = simple_strtoul(buf, &e, 10);
45365 if (*buf && (*e == 0 || *e == '\n')) {
45366- atomic_set(&rdev->corrected_errors, n);
45367+ atomic_set_unchecked(&rdev->corrected_errors, n);
45368 return len;
45369 }
45370 return -EINVAL;
45371@@ -3069,8 +3069,8 @@ int md_rdev_init(struct md_rdev *rdev)
45372 rdev->sb_loaded = 0;
45373 rdev->bb_page = NULL;
45374 atomic_set(&rdev->nr_pending, 0);
45375- atomic_set(&rdev->read_errors, 0);
45376- atomic_set(&rdev->corrected_errors, 0);
45377+ atomic_set_unchecked(&rdev->read_errors, 0);
45378+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45379
45380 INIT_LIST_HEAD(&rdev->same_set);
45381 init_waitqueue_head(&rdev->blocked_wait);
45382@@ -5746,16 +5746,16 @@ static int get_bitmap_file(struct mddev *mddev, void __user * arg)
45383
45384 err = 0;
45385 spin_lock(&mddev->lock);
45386- /* bitmap disabled, zero the first byte and copy out */
45387- if (!mddev->bitmap_info.file)
45388- file->pathname[0] = '\0';
45389- else if ((ptr = d_path(&mddev->bitmap_info.file->f_path,
45390- file->pathname, sizeof(file->pathname))),
45391- IS_ERR(ptr))
45392- err = PTR_ERR(ptr);
45393- else
45394- memmove(file->pathname, ptr,
45395- sizeof(file->pathname)-(ptr-file->pathname));
45396+ /* bitmap enabled */
45397+ if (mddev->bitmap_info.file) {
45398+ ptr = d_path(&mddev->bitmap_info.file->f_path,
45399+ file->pathname, sizeof(file->pathname));
45400+ if (IS_ERR(ptr))
45401+ err = PTR_ERR(ptr);
45402+ else
45403+ memmove(file->pathname, ptr,
45404+ sizeof(file->pathname)-(ptr-file->pathname));
45405+ }
45406 spin_unlock(&mddev->lock);
45407
45408 if (err == 0 &&
45409@@ -7237,7 +7237,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45410
45411 spin_unlock(&pers_lock);
45412 seq_printf(seq, "\n");
45413- seq->poll_event = atomic_read(&md_event_count);
45414+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45415 return 0;
45416 }
45417 if (v == (void*)2) {
45418@@ -7340,7 +7340,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45419 return error;
45420
45421 seq = file->private_data;
45422- seq->poll_event = atomic_read(&md_event_count);
45423+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45424 return error;
45425 }
45426
45427@@ -7357,7 +7357,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45428 /* always allow read */
45429 mask = POLLIN | POLLRDNORM;
45430
45431- if (seq->poll_event != atomic_read(&md_event_count))
45432+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45433 mask |= POLLERR | POLLPRI;
45434 return mask;
45435 }
45436@@ -7453,7 +7453,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45437 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45438 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45439 (int)part_stat_read(&disk->part0, sectors[1]) -
45440- atomic_read(&disk->sync_io);
45441+ atomic_read_unchecked(&disk->sync_io);
45442 /* sync IO will cause sync_io to increase before the disk_stats
45443 * as sync_io is counted when a request starts, and
45444 * disk_stats is counted when it completes.
45445diff --git a/drivers/md/md.h b/drivers/md/md.h
45446index 4046a6c..e2f2997 100644
45447--- a/drivers/md/md.h
45448+++ b/drivers/md/md.h
45449@@ -95,13 +95,13 @@ struct md_rdev {
45450 * only maintained for arrays that
45451 * support hot removal
45452 */
45453- atomic_t read_errors; /* number of consecutive read errors that
45454+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45455 * we have tried to ignore.
45456 */
45457 struct timespec last_read_error; /* monotonic time since our
45458 * last read error
45459 */
45460- atomic_t corrected_errors; /* number of corrected read errors,
45461+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45462 * for reporting to userspace and storing
45463 * in superblock.
45464 */
45465@@ -486,7 +486,7 @@ extern void mddev_unlock(struct mddev *mddev);
45466
45467 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45468 {
45469- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45470+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45471 }
45472
45473 struct md_personality
45474diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45475index 5309129..7fb096e 100644
45476--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45477+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45478@@ -691,7 +691,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45479 * Flick into a mode where all blocks get allocated in the new area.
45480 */
45481 smm->begin = old_len;
45482- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45483+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45484
45485 /*
45486 * Extend.
45487@@ -728,7 +728,7 @@ out:
45488 /*
45489 * Switch back to normal behaviour.
45490 */
45491- memcpy(sm, &ops, sizeof(*sm));
45492+ memcpy((void *)sm, &ops, sizeof(*sm));
45493 return r;
45494 }
45495
45496diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45497index 3e6d115..ffecdeb 100644
45498--- a/drivers/md/persistent-data/dm-space-map.h
45499+++ b/drivers/md/persistent-data/dm-space-map.h
45500@@ -71,6 +71,7 @@ struct dm_space_map {
45501 dm_sm_threshold_fn fn,
45502 void *context);
45503 };
45504+typedef struct dm_space_map __no_const dm_space_map_no_const;
45505
45506 /*----------------------------------------------------------------*/
45507
45508diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45509index 5ce3cd5c..f147017 100644
45510--- a/drivers/md/raid1.c
45511+++ b/drivers/md/raid1.c
45512@@ -1936,7 +1936,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45513 if (r1_sync_page_io(rdev, sect, s,
45514 bio->bi_io_vec[idx].bv_page,
45515 READ) != 0)
45516- atomic_add(s, &rdev->corrected_errors);
45517+ atomic_add_unchecked(s, &rdev->corrected_errors);
45518 }
45519 sectors -= s;
45520 sect += s;
45521@@ -2169,7 +2169,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45522 !test_bit(Faulty, &rdev->flags)) {
45523 if (r1_sync_page_io(rdev, sect, s,
45524 conf->tmppage, READ)) {
45525- atomic_add(s, &rdev->corrected_errors);
45526+ atomic_add_unchecked(s, &rdev->corrected_errors);
45527 printk(KERN_INFO
45528 "md/raid1:%s: read error corrected "
45529 "(%d sectors at %llu on %s)\n",
45530diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45531index f55c3f3..4cca8c8 100644
45532--- a/drivers/md/raid10.c
45533+++ b/drivers/md/raid10.c
45534@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45535 /* The write handler will notice the lack of
45536 * R10BIO_Uptodate and record any errors etc
45537 */
45538- atomic_add(r10_bio->sectors,
45539+ atomic_add_unchecked(r10_bio->sectors,
45540 &conf->mirrors[d].rdev->corrected_errors);
45541
45542 /* for reconstruct, we always reschedule after a read.
45543@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45544 {
45545 struct timespec cur_time_mon;
45546 unsigned long hours_since_last;
45547- unsigned int read_errors = atomic_read(&rdev->read_errors);
45548+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45549
45550 ktime_get_ts(&cur_time_mon);
45551
45552@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45553 * overflowing the shift of read_errors by hours_since_last.
45554 */
45555 if (hours_since_last >= 8 * sizeof(read_errors))
45556- atomic_set(&rdev->read_errors, 0);
45557+ atomic_set_unchecked(&rdev->read_errors, 0);
45558 else
45559- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45560+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45561 }
45562
45563 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45564@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45565 return;
45566
45567 check_decay_read_errors(mddev, rdev);
45568- atomic_inc(&rdev->read_errors);
45569- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45570+ atomic_inc_unchecked(&rdev->read_errors);
45571+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45572 char b[BDEVNAME_SIZE];
45573 bdevname(rdev->bdev, b);
45574
45575@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45576 "md/raid10:%s: %s: Raid device exceeded "
45577 "read_error threshold [cur %d:max %d]\n",
45578 mdname(mddev), b,
45579- atomic_read(&rdev->read_errors), max_read_errors);
45580+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45581 printk(KERN_NOTICE
45582 "md/raid10:%s: %s: Failing raid device\n",
45583 mdname(mddev), b);
45584@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45585 sect +
45586 choose_data_offset(r10_bio, rdev)),
45587 bdevname(rdev->bdev, b));
45588- atomic_add(s, &rdev->corrected_errors);
45589+ atomic_add_unchecked(s, &rdev->corrected_errors);
45590 }
45591
45592 rdev_dec_pending(rdev, mddev);
45593diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45594index b6793d2..92be2bc 100644
45595--- a/drivers/md/raid5.c
45596+++ b/drivers/md/raid5.c
45597@@ -1108,23 +1108,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45598 struct bio_vec bvl;
45599 struct bvec_iter iter;
45600 struct page *bio_page;
45601- int page_offset;
45602+ s64 page_offset;
45603 struct async_submit_ctl submit;
45604 enum async_tx_flags flags = 0;
45605
45606 if (bio->bi_iter.bi_sector >= sector)
45607- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45608+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45609 else
45610- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45611+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45612
45613 if (frombio)
45614 flags |= ASYNC_TX_FENCE;
45615 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45616
45617 bio_for_each_segment(bvl, bio, iter) {
45618- int len = bvl.bv_len;
45619- int clen;
45620- int b_offset = 0;
45621+ s64 len = bvl.bv_len;
45622+ s64 clen;
45623+ s64 b_offset = 0;
45624
45625 if (page_offset < 0) {
45626 b_offset = -page_offset;
45627@@ -2017,6 +2017,10 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)
45628 return 1;
45629 }
45630
45631+#ifdef CONFIG_GRKERNSEC_HIDESYM
45632+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45633+#endif
45634+
45635 static int grow_stripes(struct r5conf *conf, int num)
45636 {
45637 struct kmem_cache *sc;
45638@@ -2027,7 +2031,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45639 "raid%d-%s", conf->level, mdname(conf->mddev));
45640 else
45641 sprintf(conf->cache_name[0],
45642+#ifdef CONFIG_GRKERNSEC_HIDESYM
45643+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45644+#else
45645 "raid%d-%p", conf->level, conf->mddev);
45646+#endif
45647 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45648
45649 conf->active_name = 0;
45650@@ -2315,21 +2323,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45651 mdname(conf->mddev), STRIPE_SECTORS,
45652 (unsigned long long)s,
45653 bdevname(rdev->bdev, b));
45654- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45655+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45656 clear_bit(R5_ReadError, &sh->dev[i].flags);
45657 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45658 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45659 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45660
45661- if (atomic_read(&rdev->read_errors))
45662- atomic_set(&rdev->read_errors, 0);
45663+ if (atomic_read_unchecked(&rdev->read_errors))
45664+ atomic_set_unchecked(&rdev->read_errors, 0);
45665 } else {
45666 const char *bdn = bdevname(rdev->bdev, b);
45667 int retry = 0;
45668 int set_bad = 0;
45669
45670 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
45671- atomic_inc(&rdev->read_errors);
45672+ atomic_inc_unchecked(&rdev->read_errors);
45673 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
45674 printk_ratelimited(
45675 KERN_WARNING
45676@@ -2357,7 +2365,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
45677 mdname(conf->mddev),
45678 (unsigned long long)s,
45679 bdn);
45680- } else if (atomic_read(&rdev->read_errors)
45681+ } else if (atomic_read_unchecked(&rdev->read_errors)
45682 > conf->max_nr_stripes)
45683 printk(KERN_WARNING
45684 "md/raid:%s: Too many read errors, failing device %s.\n",
45685diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
45686index 13bb57f..0ca21b2 100644
45687--- a/drivers/media/dvb-core/dvbdev.c
45688+++ b/drivers/media/dvb-core/dvbdev.c
45689@@ -272,7 +272,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
45690 const struct dvb_device *template, void *priv, int type)
45691 {
45692 struct dvb_device *dvbdev;
45693- struct file_operations *dvbdevfops;
45694+ file_operations_no_const *dvbdevfops;
45695 struct device *clsdev;
45696 int minor;
45697 int id;
45698diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
45699index 6ad22b6..6e90e2a 100644
45700--- a/drivers/media/dvb-frontends/af9033.h
45701+++ b/drivers/media/dvb-frontends/af9033.h
45702@@ -96,6 +96,6 @@ struct af9033_ops {
45703 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
45704 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
45705 int onoff);
45706-};
45707+} __no_const;
45708
45709 #endif /* AF9033_H */
45710diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
45711index 6ae9899..07d8543 100644
45712--- a/drivers/media/dvb-frontends/dib3000.h
45713+++ b/drivers/media/dvb-frontends/dib3000.h
45714@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
45715 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
45716 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
45717 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
45718-};
45719+} __no_const;
45720
45721 #if IS_REACHABLE(CONFIG_DVB_DIB3000MB)
45722 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
45723diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
45724index baa2789..c8de7fe 100644
45725--- a/drivers/media/dvb-frontends/dib7000p.h
45726+++ b/drivers/media/dvb-frontends/dib7000p.h
45727@@ -64,7 +64,7 @@ struct dib7000p_ops {
45728 int (*get_adc_power)(struct dvb_frontend *fe);
45729 int (*slave_reset)(struct dvb_frontend *fe);
45730 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
45731-};
45732+} __no_const;
45733
45734 #if IS_REACHABLE(CONFIG_DVB_DIB7000P)
45735 void *dib7000p_attach(struct dib7000p_ops *ops);
45736diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
45737index 780c37b..50e2620 100644
45738--- a/drivers/media/dvb-frontends/dib8000.h
45739+++ b/drivers/media/dvb-frontends/dib8000.h
45740@@ -61,7 +61,7 @@ struct dib8000_ops {
45741 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
45742 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
45743 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
45744-};
45745+} __no_const;
45746
45747 #if IS_REACHABLE(CONFIG_DVB_DIB8000)
45748 void *dib8000_attach(struct dib8000_ops *ops);
45749diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
45750index c9decd8..7849cec 100644
45751--- a/drivers/media/pci/cx88/cx88-video.c
45752+++ b/drivers/media/pci/cx88/cx88-video.c
45753@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45754
45755 /* ------------------------------------------------------------------ */
45756
45757-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45758-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45759-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45760+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45761+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45762+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45763
45764 module_param_array(video_nr, int, NULL, 0444);
45765 module_param_array(vbi_nr, int, NULL, 0444);
45766diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45767index c2e60b4..5eeccc0 100644
45768--- a/drivers/media/pci/ivtv/ivtv-driver.c
45769+++ b/drivers/media/pci/ivtv/ivtv-driver.c
45770@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45771 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45772
45773 /* ivtv instance counter */
45774-static atomic_t ivtv_instance = ATOMIC_INIT(0);
45775+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45776
45777 /* Parameter declarations */
45778 static int cardtype[IVTV_MAX_CARDS];
45779diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45780index 570d119..ed25830 100644
45781--- a/drivers/media/pci/solo6x10/solo6x10-core.c
45782+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45783@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45784
45785 static int solo_sysfs_init(struct solo_dev *solo_dev)
45786 {
45787- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45788+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45789 struct device *dev = &solo_dev->dev;
45790 const char *driver;
45791 int i;
45792diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45793index 7ddc767..1c24361 100644
45794--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45795+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45796@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45797
45798 int solo_g723_init(struct solo_dev *solo_dev)
45799 {
45800- static struct snd_device_ops ops = { NULL };
45801+ static struct snd_device_ops ops = { };
45802 struct snd_card *card;
45803 struct snd_kcontrol_new kctl;
45804 char name[32];
45805diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45806index 8c84846..27b4f83 100644
45807--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45808+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45809@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45810
45811 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45812 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45813- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45814+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45815 if (p2m_id < 0)
45816 p2m_id = -p2m_id;
45817 }
45818diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45819index 1ca54b0..7d7cb9a 100644
45820--- a/drivers/media/pci/solo6x10/solo6x10.h
45821+++ b/drivers/media/pci/solo6x10/solo6x10.h
45822@@ -218,7 +218,7 @@ struct solo_dev {
45823
45824 /* P2M DMA Engine */
45825 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45826- atomic_t p2m_count;
45827+ atomic_unchecked_t p2m_count;
45828 int p2m_jiffies;
45829 unsigned int p2m_timeouts;
45830
45831diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45832index c135165..dc69499 100644
45833--- a/drivers/media/pci/tw68/tw68-core.c
45834+++ b/drivers/media/pci/tw68/tw68-core.c
45835@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45836 module_param_array(card, int, NULL, 0444);
45837 MODULE_PARM_DESC(card, "card type");
45838
45839-static atomic_t tw68_instance = ATOMIC_INIT(0);
45840+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45841
45842 /* ------------------------------------------------------------------ */
45843
45844diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45845index 17b189a..b78aa6b 100644
45846--- a/drivers/media/platform/omap/omap_vout.c
45847+++ b/drivers/media/platform/omap/omap_vout.c
45848@@ -63,7 +63,6 @@ enum omap_vout_channels {
45849 OMAP_VIDEO2,
45850 };
45851
45852-static struct videobuf_queue_ops video_vbq_ops;
45853 /* Variables configurable through module params*/
45854 static u32 video1_numbuffers = 3;
45855 static u32 video2_numbuffers = 3;
45856@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45857 {
45858 struct videobuf_queue *q;
45859 struct omap_vout_device *vout = NULL;
45860+ static struct videobuf_queue_ops video_vbq_ops = {
45861+ .buf_setup = omap_vout_buffer_setup,
45862+ .buf_prepare = omap_vout_buffer_prepare,
45863+ .buf_release = omap_vout_buffer_release,
45864+ .buf_queue = omap_vout_buffer_queue,
45865+ };
45866
45867 vout = video_drvdata(file);
45868 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45869@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45870 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45871
45872 q = &vout->vbq;
45873- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45874- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45875- video_vbq_ops.buf_release = omap_vout_buffer_release;
45876- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45877 spin_lock_init(&vout->vbq_lock);
45878
45879 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45880diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45881index fb2acc5..a2fcbdc4 100644
45882--- a/drivers/media/platform/s5p-tv/mixer.h
45883+++ b/drivers/media/platform/s5p-tv/mixer.h
45884@@ -156,7 +156,7 @@ struct mxr_layer {
45885 /** layer index (unique identifier) */
45886 int idx;
45887 /** callbacks for layer methods */
45888- struct mxr_layer_ops ops;
45889+ struct mxr_layer_ops *ops;
45890 /** format array */
45891 const struct mxr_format **fmt_array;
45892 /** size of format array */
45893diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45894index 74344c7..a39e70e 100644
45895--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45896+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45897@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45898 {
45899 struct mxr_layer *layer;
45900 int ret;
45901- struct mxr_layer_ops ops = {
45902+ static struct mxr_layer_ops ops = {
45903 .release = mxr_graph_layer_release,
45904 .buffer_set = mxr_graph_buffer_set,
45905 .stream_set = mxr_graph_stream_set,
45906diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45907index b713403..53cb5ad 100644
45908--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45909+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45910@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45911 layer->update_buf = next;
45912 }
45913
45914- layer->ops.buffer_set(layer, layer->update_buf);
45915+ layer->ops->buffer_set(layer, layer->update_buf);
45916
45917 if (done && done != layer->shadow_buf)
45918 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45919diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45920index 751f3b6..d829203 100644
45921--- a/drivers/media/platform/s5p-tv/mixer_video.c
45922+++ b/drivers/media/platform/s5p-tv/mixer_video.c
45923@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45924 layer->geo.src.height = layer->geo.src.full_height;
45925
45926 mxr_geometry_dump(mdev, &layer->geo);
45927- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45928+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45929 mxr_geometry_dump(mdev, &layer->geo);
45930 }
45931
45932@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45933 layer->geo.dst.full_width = mbus_fmt.width;
45934 layer->geo.dst.full_height = mbus_fmt.height;
45935 layer->geo.dst.field = mbus_fmt.field;
45936- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45937+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45938
45939 mxr_geometry_dump(mdev, &layer->geo);
45940 }
45941@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45942 /* set source size to highest accepted value */
45943 geo->src.full_width = max(geo->dst.full_width, pix->width);
45944 geo->src.full_height = max(geo->dst.full_height, pix->height);
45945- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45946+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45947 mxr_geometry_dump(mdev, &layer->geo);
45948 /* set cropping to total visible screen */
45949 geo->src.width = pix->width;
45950@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45951 geo->src.x_offset = 0;
45952 geo->src.y_offset = 0;
45953 /* assure consistency of geometry */
45954- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45955+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45956 mxr_geometry_dump(mdev, &layer->geo);
45957 /* set full size to lowest possible value */
45958 geo->src.full_width = 0;
45959 geo->src.full_height = 0;
45960- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45961+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45962 mxr_geometry_dump(mdev, &layer->geo);
45963
45964 /* returning results */
45965@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45966 target->width = s->r.width;
45967 target->height = s->r.height;
45968
45969- layer->ops.fix_geometry(layer, stage, s->flags);
45970+ layer->ops->fix_geometry(layer, stage, s->flags);
45971
45972 /* retrieve update selection rectangle */
45973 res.left = target->x_offset;
45974@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45975 mxr_output_get(mdev);
45976
45977 mxr_layer_update_output(layer);
45978- layer->ops.format_set(layer);
45979+ layer->ops->format_set(layer);
45980 /* enabling layer in hardware */
45981 spin_lock_irqsave(&layer->enq_slock, flags);
45982 layer->state = MXR_LAYER_STREAMING;
45983 spin_unlock_irqrestore(&layer->enq_slock, flags);
45984
45985- layer->ops.stream_set(layer, MXR_ENABLE);
45986+ layer->ops->stream_set(layer, MXR_ENABLE);
45987 mxr_streamer_get(mdev);
45988
45989 return 0;
45990@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
45991 spin_unlock_irqrestore(&layer->enq_slock, flags);
45992
45993 /* disabling layer in hardware */
45994- layer->ops.stream_set(layer, MXR_DISABLE);
45995+ layer->ops->stream_set(layer, MXR_DISABLE);
45996 /* remove one streamer */
45997 mxr_streamer_put(mdev);
45998 /* allow changes in output configuration */
45999@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46000
46001 void mxr_layer_release(struct mxr_layer *layer)
46002 {
46003- if (layer->ops.release)
46004- layer->ops.release(layer);
46005+ if (layer->ops->release)
46006+ layer->ops->release(layer);
46007 }
46008
46009 void mxr_base_layer_release(struct mxr_layer *layer)
46010@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46011
46012 layer->mdev = mdev;
46013 layer->idx = idx;
46014- layer->ops = *ops;
46015+ layer->ops = ops;
46016
46017 spin_lock_init(&layer->enq_slock);
46018 INIT_LIST_HEAD(&layer->enq_list);
46019diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46020index c9388c4..ce71ece 100644
46021--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46022+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46023@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46024 {
46025 struct mxr_layer *layer;
46026 int ret;
46027- struct mxr_layer_ops ops = {
46028+ static struct mxr_layer_ops ops = {
46029 .release = mxr_vp_layer_release,
46030 .buffer_set = mxr_vp_buffer_set,
46031 .stream_set = mxr_vp_stream_set,
46032diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46033index 82affae..42833ec 100644
46034--- a/drivers/media/radio/radio-cadet.c
46035+++ b/drivers/media/radio/radio-cadet.c
46036@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46037 unsigned char readbuf[RDS_BUFFER];
46038 int i = 0;
46039
46040+ if (count > RDS_BUFFER)
46041+ return -EFAULT;
46042 mutex_lock(&dev->lock);
46043 if (dev->rdsstat == 0)
46044 cadet_start_rds(dev);
46045@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46046 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46047 mutex_unlock(&dev->lock);
46048
46049- if (i && copy_to_user(data, readbuf, i))
46050- return -EFAULT;
46051+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46052+ i = -EFAULT;
46053+
46054 return i;
46055 }
46056
46057diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46058index 5236035..c622c74 100644
46059--- a/drivers/media/radio/radio-maxiradio.c
46060+++ b/drivers/media/radio/radio-maxiradio.c
46061@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46062 /* TEA5757 pin mappings */
46063 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46064
46065-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46066+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46067
46068 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46069 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46070diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46071index 050b3bb..79f62b9 100644
46072--- a/drivers/media/radio/radio-shark.c
46073+++ b/drivers/media/radio/radio-shark.c
46074@@ -79,7 +79,7 @@ struct shark_device {
46075 u32 last_val;
46076 };
46077
46078-static atomic_t shark_instance = ATOMIC_INIT(0);
46079+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46080
46081 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46082 {
46083diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46084index 8654e0d..0608a64 100644
46085--- a/drivers/media/radio/radio-shark2.c
46086+++ b/drivers/media/radio/radio-shark2.c
46087@@ -74,7 +74,7 @@ struct shark_device {
46088 u8 *transfer_buffer;
46089 };
46090
46091-static atomic_t shark_instance = ATOMIC_INIT(0);
46092+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46093
46094 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46095 {
46096diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46097index dccf586..d5db411 100644
46098--- a/drivers/media/radio/radio-si476x.c
46099+++ b/drivers/media/radio/radio-si476x.c
46100@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46101 struct si476x_radio *radio;
46102 struct v4l2_ctrl *ctrl;
46103
46104- static atomic_t instance = ATOMIC_INIT(0);
46105+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46106
46107 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46108 if (!radio)
46109diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46110index 704397f..4d05977 100644
46111--- a/drivers/media/radio/wl128x/fmdrv_common.c
46112+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46113@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46114 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46115
46116 /* Radio Nr */
46117-static u32 radio_nr = -1;
46118+static int radio_nr = -1;
46119 module_param(radio_nr, int, 0444);
46120 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46121
46122diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46123index 9fd1527..8927230 100644
46124--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46125+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46126@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46127
46128 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46129 {
46130- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46131- char result[64];
46132- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46133- sizeof(result), 0);
46134+ char *buf;
46135+ char *result;
46136+ int retval;
46137+
46138+ buf = kmalloc(2, GFP_KERNEL);
46139+ if (buf == NULL)
46140+ return -ENOMEM;
46141+ result = kmalloc(64, GFP_KERNEL);
46142+ if (result == NULL) {
46143+ kfree(buf);
46144+ return -ENOMEM;
46145+ }
46146+
46147+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46148+ buf[1] = enable ? 1 : 0;
46149+
46150+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46151+
46152+ kfree(buf);
46153+ kfree(result);
46154+ return retval;
46155 }
46156
46157 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46158 {
46159- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46160- char state[3];
46161- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46162+ char *buf;
46163+ char *state;
46164+ int retval;
46165+
46166+ buf = kmalloc(2, GFP_KERNEL);
46167+ if (buf == NULL)
46168+ return -ENOMEM;
46169+ state = kmalloc(3, GFP_KERNEL);
46170+ if (state == NULL) {
46171+ kfree(buf);
46172+ return -ENOMEM;
46173+ }
46174+
46175+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46176+ buf[1] = enable ? 1 : 0;
46177+
46178+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46179+
46180+ kfree(buf);
46181+ kfree(state);
46182+ return retval;
46183 }
46184
46185 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46186 {
46187- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46188- char state[3];
46189+ char *query;
46190+ char *state;
46191 int ret;
46192+ query = kmalloc(1, GFP_KERNEL);
46193+ if (query == NULL)
46194+ return -ENOMEM;
46195+ state = kmalloc(3, GFP_KERNEL);
46196+ if (state == NULL) {
46197+ kfree(query);
46198+ return -ENOMEM;
46199+ }
46200+
46201+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46202
46203 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46204
46205- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46206- sizeof(state), 0);
46207+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46208 if (ret < 0) {
46209 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46210 "state info\n");
46211@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46212
46213 /* Copy this pointer as we are gonna need it in the release phase */
46214 cinergyt2_usb_device = adap->dev;
46215-
46216+ kfree(query);
46217+ kfree(state);
46218 return 0;
46219 }
46220
46221@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46222 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46223 {
46224 struct cinergyt2_state *st = d->priv;
46225- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46226+ u8 *key, *cmd;
46227 int i;
46228
46229+ cmd = kmalloc(1, GFP_KERNEL);
46230+ if (cmd == NULL)
46231+ return -EINVAL;
46232+ key = kzalloc(5, GFP_KERNEL);
46233+ if (key == NULL) {
46234+ kfree(cmd);
46235+ return -EINVAL;
46236+ }
46237+
46238+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46239+
46240 *state = REMOTE_NO_KEY_PRESSED;
46241
46242- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46243+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46244 if (key[4] == 0xff) {
46245 /* key repeat */
46246 st->rc_counter++;
46247@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46248 *event = d->last_event;
46249 deb_rc("repeat key, event %x\n",
46250 *event);
46251- return 0;
46252+ goto out;
46253 }
46254 }
46255 deb_rc("repeated key (non repeatable)\n");
46256 }
46257- return 0;
46258+ goto out;
46259 }
46260
46261 /* hack to pass checksum on the custom field */
46262@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46263
46264 deb_rc("key: %*ph\n", 5, key);
46265 }
46266+out:
46267+ kfree(cmd);
46268+ kfree(key);
46269 return 0;
46270 }
46271
46272diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46273index c890fe4..f9b2ae6 100644
46274--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46275+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46276@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46277 fe_status_t *status)
46278 {
46279 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46280- struct dvbt_get_status_msg result;
46281- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46282+ struct dvbt_get_status_msg *result;
46283+ u8 *cmd;
46284 int ret;
46285
46286- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46287- sizeof(result), 0);
46288+ cmd = kmalloc(1, GFP_KERNEL);
46289+ if (cmd == NULL)
46290+ return -ENOMEM;
46291+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46292+ if (result == NULL) {
46293+ kfree(cmd);
46294+ return -ENOMEM;
46295+ }
46296+
46297+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46298+
46299+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46300+ sizeof(*result), 0);
46301 if (ret < 0)
46302- return ret;
46303+ goto out;
46304
46305 *status = 0;
46306
46307- if (0xffff - le16_to_cpu(result.gain) > 30)
46308+ if (0xffff - le16_to_cpu(result->gain) > 30)
46309 *status |= FE_HAS_SIGNAL;
46310- if (result.lock_bits & (1 << 6))
46311+ if (result->lock_bits & (1 << 6))
46312 *status |= FE_HAS_LOCK;
46313- if (result.lock_bits & (1 << 5))
46314+ if (result->lock_bits & (1 << 5))
46315 *status |= FE_HAS_SYNC;
46316- if (result.lock_bits & (1 << 4))
46317+ if (result->lock_bits & (1 << 4))
46318 *status |= FE_HAS_CARRIER;
46319- if (result.lock_bits & (1 << 1))
46320+ if (result->lock_bits & (1 << 1))
46321 *status |= FE_HAS_VITERBI;
46322
46323 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46324 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46325 *status &= ~FE_HAS_LOCK;
46326
46327- return 0;
46328+out:
46329+ kfree(cmd);
46330+ kfree(result);
46331+ return ret;
46332 }
46333
46334 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46335 {
46336 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46337- struct dvbt_get_status_msg status;
46338- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46339+ struct dvbt_get_status_msg *status;
46340+ char *cmd;
46341 int ret;
46342
46343- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46344- sizeof(status), 0);
46345+ cmd = kmalloc(1, GFP_KERNEL);
46346+ if (cmd == NULL)
46347+ return -ENOMEM;
46348+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46349+ if (status == NULL) {
46350+ kfree(cmd);
46351+ return -ENOMEM;
46352+ }
46353+
46354+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46355+
46356+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46357+ sizeof(*status), 0);
46358 if (ret < 0)
46359- return ret;
46360+ goto out;
46361
46362- *ber = le32_to_cpu(status.viterbi_error_rate);
46363+ *ber = le32_to_cpu(status->viterbi_error_rate);
46364+out:
46365+ kfree(cmd);
46366+ kfree(status);
46367 return 0;
46368 }
46369
46370 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46371 {
46372 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46373- struct dvbt_get_status_msg status;
46374- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46375+ struct dvbt_get_status_msg *status;
46376+ u8 *cmd;
46377 int ret;
46378
46379- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46380- sizeof(status), 0);
46381+ cmd = kmalloc(1, GFP_KERNEL);
46382+ if (cmd == NULL)
46383+ return -ENOMEM;
46384+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46385+ if (status == NULL) {
46386+ kfree(cmd);
46387+ return -ENOMEM;
46388+ }
46389+
46390+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46391+
46392+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46393+ sizeof(*status), 0);
46394 if (ret < 0) {
46395 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46396 ret);
46397- return ret;
46398+ goto out;
46399 }
46400- *unc = le32_to_cpu(status.uncorrected_block_count);
46401- return 0;
46402+ *unc = le32_to_cpu(status->uncorrected_block_count);
46403+
46404+out:
46405+ kfree(cmd);
46406+ kfree(status);
46407+ return ret;
46408 }
46409
46410 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46411 u16 *strength)
46412 {
46413 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46414- struct dvbt_get_status_msg status;
46415- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46416+ struct dvbt_get_status_msg *status;
46417+ char *cmd;
46418 int ret;
46419
46420- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46421- sizeof(status), 0);
46422+ cmd = kmalloc(1, GFP_KERNEL);
46423+ if (cmd == NULL)
46424+ return -ENOMEM;
46425+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46426+ if (status == NULL) {
46427+ kfree(cmd);
46428+ return -ENOMEM;
46429+ }
46430+
46431+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46432+
46433+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46434+ sizeof(*status), 0);
46435 if (ret < 0) {
46436 err("cinergyt2_fe_read_signal_strength() Failed!"
46437 " (Error=%d)\n", ret);
46438- return ret;
46439+ goto out;
46440 }
46441- *strength = (0xffff - le16_to_cpu(status.gain));
46442+ *strength = (0xffff - le16_to_cpu(status->gain));
46443+
46444+out:
46445+ kfree(cmd);
46446+ kfree(status);
46447 return 0;
46448 }
46449
46450 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46451 {
46452 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46453- struct dvbt_get_status_msg status;
46454- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46455+ struct dvbt_get_status_msg *status;
46456+ char *cmd;
46457 int ret;
46458
46459- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46460- sizeof(status), 0);
46461+ cmd = kmalloc(1, GFP_KERNEL);
46462+ if (cmd == NULL)
46463+ return -ENOMEM;
46464+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46465+ if (status == NULL) {
46466+ kfree(cmd);
46467+ return -ENOMEM;
46468+ }
46469+
46470+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46471+
46472+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46473+ sizeof(*status), 0);
46474 if (ret < 0) {
46475 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46476- return ret;
46477+ goto out;
46478 }
46479- *snr = (status.snr << 8) | status.snr;
46480- return 0;
46481+ *snr = (status->snr << 8) | status->snr;
46482+
46483+out:
46484+ kfree(cmd);
46485+ kfree(status);
46486+ return ret;
46487 }
46488
46489 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46490@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46491 {
46492 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46493 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46494- struct dvbt_set_parameters_msg param;
46495- char result[2];
46496+ struct dvbt_set_parameters_msg *param;
46497+ char *result;
46498 int err;
46499
46500- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46501- param.tps = cpu_to_le16(compute_tps(fep));
46502- param.freq = cpu_to_le32(fep->frequency / 1000);
46503- param.flags = 0;
46504+ result = kmalloc(2, GFP_KERNEL);
46505+ if (result == NULL)
46506+ return -ENOMEM;
46507+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46508+ if (param == NULL) {
46509+ kfree(result);
46510+ return -ENOMEM;
46511+ }
46512+
46513+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46514+ param->tps = cpu_to_le16(compute_tps(fep));
46515+ param->freq = cpu_to_le32(fep->frequency / 1000);
46516+ param->flags = 0;
46517
46518 switch (fep->bandwidth_hz) {
46519 default:
46520 case 8000000:
46521- param.bandwidth = 8;
46522+ param->bandwidth = 8;
46523 break;
46524 case 7000000:
46525- param.bandwidth = 7;
46526+ param->bandwidth = 7;
46527 break;
46528 case 6000000:
46529- param.bandwidth = 6;
46530+ param->bandwidth = 6;
46531 break;
46532 }
46533
46534 err = dvb_usb_generic_rw(state->d,
46535- (char *)&param, sizeof(param),
46536- result, sizeof(result), 0);
46537+ (char *)param, sizeof(*param),
46538+ result, 2, 0);
46539 if (err < 0)
46540 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46541
46542- return (err < 0) ? err : 0;
46543+ kfree(result);
46544+ kfree(param);
46545+ return err;
46546 }
46547
46548 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46549diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46550index 733a7ff..f8b52e3 100644
46551--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46552+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46553@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46554
46555 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46556 {
46557- struct hexline hx;
46558- u8 reset;
46559+ struct hexline *hx;
46560+ u8 *reset;
46561 int ret,pos=0;
46562
46563+ reset = kmalloc(1, GFP_KERNEL);
46564+ if (reset == NULL)
46565+ return -ENOMEM;
46566+
46567+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46568+ if (hx == NULL) {
46569+ kfree(reset);
46570+ return -ENOMEM;
46571+ }
46572+
46573 /* stop the CPU */
46574- reset = 1;
46575- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46576+ reset[0] = 1;
46577+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46578 err("could not stop the USB controller CPU.");
46579
46580- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46581- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46582- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46583+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46584+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46585+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46586
46587- if (ret != hx.len) {
46588+ if (ret != hx->len) {
46589 err("error while transferring firmware "
46590 "(transferred size: %d, block size: %d)",
46591- ret,hx.len);
46592+ ret,hx->len);
46593 ret = -EINVAL;
46594 break;
46595 }
46596 }
46597 if (ret < 0) {
46598 err("firmware download failed at %d with %d",pos,ret);
46599+ kfree(reset);
46600+ kfree(hx);
46601 return ret;
46602 }
46603
46604 if (ret == 0) {
46605 /* restart the CPU */
46606- reset = 0;
46607- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46608+ reset[0] = 0;
46609+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46610 err("could not restart the USB controller CPU.");
46611 ret = -EINVAL;
46612 }
46613 } else
46614 ret = -EIO;
46615
46616+ kfree(reset);
46617+ kfree(hx);
46618+
46619 return ret;
46620 }
46621 EXPORT_SYMBOL(usb_cypress_load_firmware);
46622diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46623index 5801ae7..83f71fa 100644
46624--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46625+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46626@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46627 static int technisat_usb2_i2c_access(struct usb_device *udev,
46628 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46629 {
46630- u8 b[64];
46631- int ret, actual_length;
46632+ u8 *b = kmalloc(64, GFP_KERNEL);
46633+ int ret, actual_length, error = 0;
46634+
46635+ if (b == NULL)
46636+ return -ENOMEM;
46637
46638 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46639 debug_dump(tx, txlen, deb_i2c);
46640@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46641
46642 if (ret < 0) {
46643 err("i2c-error: out failed %02x = %d", device_addr, ret);
46644- return -ENODEV;
46645+ error = -ENODEV;
46646+ goto out;
46647 }
46648
46649 ret = usb_bulk_msg(udev,
46650@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46651 b, 64, &actual_length, 1000);
46652 if (ret < 0) {
46653 err("i2c-error: in failed %02x = %d", device_addr, ret);
46654- return -ENODEV;
46655+ error = -ENODEV;
46656+ goto out;
46657 }
46658
46659 if (b[0] != I2C_STATUS_OK) {
46660@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46661 /* handle tuner-i2c-nak */
46662 if (!(b[0] == I2C_STATUS_NAK &&
46663 device_addr == 0x60
46664- /* && device_is_technisat_usb2 */))
46665- return -ENODEV;
46666+ /* && device_is_technisat_usb2 */)) {
46667+ error = -ENODEV;
46668+ goto out;
46669+ }
46670 }
46671
46672 deb_i2c("status: %d, ", b[0]);
46673@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46674
46675 deb_i2c("\n");
46676
46677- return 0;
46678+out:
46679+ kfree(b);
46680+ return error;
46681 }
46682
46683 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
46684@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46685 {
46686 int ret;
46687
46688- u8 led[8] = {
46689- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46690- 0
46691- };
46692+ u8 *led = kzalloc(8, GFP_KERNEL);
46693+
46694+ if (led == NULL)
46695+ return -ENOMEM;
46696
46697 if (disable_led_control && state != TECH_LED_OFF)
46698 return 0;
46699
46700+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
46701+
46702 switch (state) {
46703 case TECH_LED_ON:
46704 led[1] = 0x82;
46705@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46706 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46707 USB_TYPE_VENDOR | USB_DIR_OUT,
46708 0, 0,
46709- led, sizeof(led), 500);
46710+ led, 8, 500);
46711
46712 mutex_unlock(&d->i2c_mutex);
46713+
46714+ kfree(led);
46715+
46716 return ret;
46717 }
46718
46719 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
46720 {
46721 int ret;
46722- u8 b = 0;
46723+ u8 *b = kzalloc(1, GFP_KERNEL);
46724+
46725+ if (b == NULL)
46726+ return -ENOMEM;
46727
46728 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
46729 return -EAGAIN;
46730@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
46731 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
46732 USB_TYPE_VENDOR | USB_DIR_OUT,
46733 (red << 8) | green, 0,
46734- &b, 1, 500);
46735+ b, 1, 500);
46736
46737 mutex_unlock(&d->i2c_mutex);
46738
46739+ kfree(b);
46740+
46741 return ret;
46742 }
46743
46744@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46745 struct dvb_usb_device_description **desc, int *cold)
46746 {
46747 int ret;
46748- u8 version[3];
46749+ u8 *version = kmalloc(3, GFP_KERNEL);
46750
46751 /* first select the interface */
46752 if (usb_set_interface(udev, 0, 1) != 0)
46753@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46754
46755 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46756
46757+ if (version == NULL)
46758+ return 0;
46759+
46760 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46761 GET_VERSION_INFO_VENDOR_REQUEST,
46762 USB_TYPE_VENDOR | USB_DIR_IN,
46763 0, 0,
46764- version, sizeof(version), 500);
46765+ version, 3, 500);
46766
46767 if (ret < 0)
46768 *cold = 1;
46769@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46770 *cold = 0;
46771 }
46772
46773+ kfree(version);
46774+
46775 return 0;
46776 }
46777
46778@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46779
46780 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46781 {
46782- u8 buf[62], *b;
46783+ u8 *buf, *b;
46784 int ret;
46785 struct ir_raw_event ev;
46786
46787+ buf = kmalloc(62, GFP_KERNEL);
46788+
46789+ if (buf == NULL)
46790+ return -ENOMEM;
46791+
46792 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46793 buf[1] = 0x08;
46794 buf[2] = 0x8f;
46795@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46796 GET_IR_DATA_VENDOR_REQUEST,
46797 USB_TYPE_VENDOR | USB_DIR_IN,
46798 0x8080, 0,
46799- buf, sizeof(buf), 500);
46800+ buf, 62, 500);
46801
46802 unlock:
46803 mutex_unlock(&d->i2c_mutex);
46804
46805- if (ret < 0)
46806+ if (ret < 0) {
46807+ kfree(buf);
46808 return ret;
46809+ }
46810
46811- if (ret == 1)
46812+ if (ret == 1) {
46813+ kfree(buf);
46814 return 0; /* no key pressed */
46815+ }
46816
46817 /* decoding */
46818 b = buf+1;
46819@@ -656,6 +689,8 @@ unlock:
46820
46821 ir_raw_event_handle(d->rc_dev);
46822
46823+ kfree(buf);
46824+
46825 return 1;
46826 }
46827
46828diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46829index af63543..0436f20 100644
46830--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46831+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46832@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46833 * by passing a very big num_planes value */
46834 uplane = compat_alloc_user_space(num_planes *
46835 sizeof(struct v4l2_plane));
46836- kp->m.planes = (__force struct v4l2_plane *)uplane;
46837+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46838
46839 while (--num_planes >= 0) {
46840 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46841@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46842 if (num_planes == 0)
46843 return 0;
46844
46845- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46846+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46847 if (get_user(p, &up->m.planes))
46848 return -EFAULT;
46849 uplane32 = compat_ptr(p);
46850@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46851 get_user(kp->flags, &up->flags) ||
46852 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46853 return -EFAULT;
46854- kp->base = (__force void *)compat_ptr(tmp);
46855+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46856 return 0;
46857 }
46858
46859@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46860 n * sizeof(struct v4l2_ext_control32)))
46861 return -EFAULT;
46862 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46863- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46864+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46865 while (--n >= 0) {
46866 u32 id;
46867
46868@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46869 {
46870 struct v4l2_ext_control32 __user *ucontrols;
46871 struct v4l2_ext_control __user *kcontrols =
46872- (__force struct v4l2_ext_control __user *)kp->controls;
46873+ (struct v4l2_ext_control __force_user *)kp->controls;
46874 int n = kp->count;
46875 compat_caddr_t p;
46876
46877@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46878 get_user(tmp, &up->edid) ||
46879 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46880 return -EFAULT;
46881- kp->edid = (__force u8 *)compat_ptr(tmp);
46882+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46883 return 0;
46884 }
46885
46886diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46887index 5b0a30b..1974b38 100644
46888--- a/drivers/media/v4l2-core/v4l2-device.c
46889+++ b/drivers/media/v4l2-core/v4l2-device.c
46890@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46891 EXPORT_SYMBOL_GPL(v4l2_device_put);
46892
46893 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46894- atomic_t *instance)
46895+ atomic_unchecked_t *instance)
46896 {
46897- int num = atomic_inc_return(instance) - 1;
46898+ int num = atomic_inc_return_unchecked(instance) - 1;
46899 int len = strlen(basename);
46900
46901 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46902diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46903index aa407cb..ee847d4 100644
46904--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46905+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46906@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
46907 struct file *file, void *fh, void *p);
46908 } u;
46909 void (*debug)(const void *arg, bool write_only);
46910-};
46911+} __do_const;
46912+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46913
46914 /* This control needs a priority check */
46915 #define INFO_FL_PRIO (1 << 0)
46916@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
46917 struct video_device *vfd = video_devdata(file);
46918 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46919 bool write_only = false;
46920- struct v4l2_ioctl_info default_info;
46921+ v4l2_ioctl_info_no_const default_info;
46922 const struct v4l2_ioctl_info *info;
46923 void *fh = file->private_data;
46924 struct v4l2_fh *vfh = NULL;
46925@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46926 ret = -EINVAL;
46927 break;
46928 }
46929- *user_ptr = (void __user *)buf->m.planes;
46930+ *user_ptr = (void __force_user *)buf->m.planes;
46931 *kernel_ptr = (void **)&buf->m.planes;
46932 *array_size = sizeof(struct v4l2_plane) * buf->length;
46933 ret = 1;
46934@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46935 ret = -EINVAL;
46936 break;
46937 }
46938- *user_ptr = (void __user *)edid->edid;
46939+ *user_ptr = (void __force_user *)edid->edid;
46940 *kernel_ptr = (void **)&edid->edid;
46941 *array_size = edid->blocks * 128;
46942 ret = 1;
46943@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46944 ret = -EINVAL;
46945 break;
46946 }
46947- *user_ptr = (void __user *)ctrls->controls;
46948+ *user_ptr = (void __force_user *)ctrls->controls;
46949 *kernel_ptr = (void **)&ctrls->controls;
46950 *array_size = sizeof(struct v4l2_ext_control)
46951 * ctrls->count;
46952@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46953 }
46954
46955 if (has_array_args) {
46956- *kernel_ptr = (void __force *)user_ptr;
46957+ *kernel_ptr = (void __force_kernel *)user_ptr;
46958 if (copy_to_user(user_ptr, mbuf, array_size))
46959 err = -EFAULT;
46960 goto out_array_args;
46961diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
46962index c94ea0d..b8a9f88 100644
46963--- a/drivers/memory/omap-gpmc.c
46964+++ b/drivers/memory/omap-gpmc.c
46965@@ -232,7 +232,6 @@ struct omap3_gpmc_regs {
46966 };
46967
46968 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
46969-static struct irq_chip gpmc_irq_chip;
46970 static int gpmc_irq_start;
46971
46972 static struct resource gpmc_mem_root;
46973@@ -1146,6 +1145,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
46974
46975 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
46976
46977+static struct irq_chip gpmc_irq_chip = {
46978+ .name = "gpmc",
46979+ .irq_startup = gpmc_irq_noop_ret,
46980+ .irq_enable = gpmc_irq_enable,
46981+ .irq_disable = gpmc_irq_disable,
46982+ .irq_shutdown = gpmc_irq_noop,
46983+ .irq_ack = gpmc_irq_noop,
46984+ .irq_mask = gpmc_irq_noop,
46985+ .irq_unmask = gpmc_irq_noop,
46986+};
46987+
46988 static int gpmc_setup_irq(void)
46989 {
46990 int i;
46991@@ -1160,15 +1170,6 @@ static int gpmc_setup_irq(void)
46992 return gpmc_irq_start;
46993 }
46994
46995- gpmc_irq_chip.name = "gpmc";
46996- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
46997- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
46998- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
46999- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47000- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47001- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47002- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47003-
47004 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47005 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47006
47007diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47008index 187f836..679544b 100644
47009--- a/drivers/message/fusion/mptbase.c
47010+++ b/drivers/message/fusion/mptbase.c
47011@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47012 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47013 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47014
47015+#ifdef CONFIG_GRKERNSEC_HIDESYM
47016+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47017+#else
47018 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47019 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47020+#endif
47021+
47022 /*
47023 * Rounding UP to nearest 4-kB boundary here...
47024 */
47025@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47026 ioc->facts.GlobalCredits);
47027
47028 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47029+#ifdef CONFIG_GRKERNSEC_HIDESYM
47030+ NULL, NULL);
47031+#else
47032 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47033+#endif
47034 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47035 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47036 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47037diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47038index 5bdaae1..eced16f 100644
47039--- a/drivers/message/fusion/mptsas.c
47040+++ b/drivers/message/fusion/mptsas.c
47041@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47042 return 0;
47043 }
47044
47045+static inline void
47046+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47047+{
47048+ if (phy_info->port_details) {
47049+ phy_info->port_details->rphy = rphy;
47050+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47051+ ioc->name, rphy));
47052+ }
47053+
47054+ if (rphy) {
47055+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47056+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47057+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47058+ ioc->name, rphy, rphy->dev.release));
47059+ }
47060+}
47061+
47062 /* no mutex */
47063 static void
47064 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47065@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47066 return NULL;
47067 }
47068
47069-static inline void
47070-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47071-{
47072- if (phy_info->port_details) {
47073- phy_info->port_details->rphy = rphy;
47074- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47075- ioc->name, rphy));
47076- }
47077-
47078- if (rphy) {
47079- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47080- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47081- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47082- ioc->name, rphy, rphy->dev.release));
47083- }
47084-}
47085-
47086 static inline struct sas_port *
47087 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47088 {
47089diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47090index cdd6f3d..1907a98 100644
47091--- a/drivers/mfd/ab8500-debugfs.c
47092+++ b/drivers/mfd/ab8500-debugfs.c
47093@@ -100,7 +100,7 @@ static int irq_last;
47094 static u32 *irq_count;
47095 static int num_irqs;
47096
47097-static struct device_attribute **dev_attr;
47098+static device_attribute_no_const **dev_attr;
47099 static char **event_name;
47100
47101 static u8 avg_sample = SAMPLE_16;
47102diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47103index 8057849..0550fdf 100644
47104--- a/drivers/mfd/kempld-core.c
47105+++ b/drivers/mfd/kempld-core.c
47106@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47107 .remove = kempld_remove,
47108 };
47109
47110-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47111+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47112 {
47113 .ident = "BHL6",
47114 .matches = {
47115diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47116index c880c89..45a7c68 100644
47117--- a/drivers/mfd/max8925-i2c.c
47118+++ b/drivers/mfd/max8925-i2c.c
47119@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47120 const struct i2c_device_id *id)
47121 {
47122 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47123- static struct max8925_chip *chip;
47124+ struct max8925_chip *chip;
47125 struct device_node *node = client->dev.of_node;
47126
47127 if (node && !pdata) {
47128diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47129index 7612d89..70549c2 100644
47130--- a/drivers/mfd/tps65910.c
47131+++ b/drivers/mfd/tps65910.c
47132@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47133 struct tps65910_platform_data *pdata)
47134 {
47135 int ret = 0;
47136- static struct regmap_irq_chip *tps6591x_irqs_chip;
47137+ struct regmap_irq_chip *tps6591x_irqs_chip;
47138
47139 if (!irq) {
47140 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47141diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47142index 1b772ef..01e77d33 100644
47143--- a/drivers/mfd/twl4030-irq.c
47144+++ b/drivers/mfd/twl4030-irq.c
47145@@ -34,6 +34,7 @@
47146 #include <linux/of.h>
47147 #include <linux/irqdomain.h>
47148 #include <linux/i2c/twl.h>
47149+#include <asm/pgtable.h>
47150
47151 #include "twl-core.h"
47152
47153@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47154 * Install an irq handler for each of the SIH modules;
47155 * clone dummy irq_chip since PIH can't *do* anything
47156 */
47157- twl4030_irq_chip = dummy_irq_chip;
47158- twl4030_irq_chip.name = "twl4030";
47159+ pax_open_kernel();
47160+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47161+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47162
47163- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47164+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47165+ pax_close_kernel();
47166
47167 for (i = irq_base; i < irq_end; i++) {
47168 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47169diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47170index 464419b..64bae8d 100644
47171--- a/drivers/misc/c2port/core.c
47172+++ b/drivers/misc/c2port/core.c
47173@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47174 goto error_idr_alloc;
47175 c2dev->id = ret;
47176
47177- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47178+ pax_open_kernel();
47179+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47180+ pax_close_kernel();
47181
47182 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47183 "c2port%d", c2dev->id);
47184diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47185index 8385177..2f54635 100644
47186--- a/drivers/misc/eeprom/sunxi_sid.c
47187+++ b/drivers/misc/eeprom/sunxi_sid.c
47188@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47189
47190 platform_set_drvdata(pdev, sid_data);
47191
47192- sid_bin_attr.size = sid_data->keysize;
47193+ pax_open_kernel();
47194+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47195+ pax_close_kernel();
47196 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47197 return -ENODEV;
47198
47199diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47200index 36f5d52..32311c3 100644
47201--- a/drivers/misc/kgdbts.c
47202+++ b/drivers/misc/kgdbts.c
47203@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47204 char before[BREAK_INSTR_SIZE];
47205 char after[BREAK_INSTR_SIZE];
47206
47207- probe_kernel_read(before, (char *)kgdbts_break_test,
47208+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47209 BREAK_INSTR_SIZE);
47210 init_simple_test();
47211 ts.tst = plant_and_detach_test;
47212@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47213 /* Activate test with initial breakpoint */
47214 if (!is_early)
47215 kgdb_breakpoint();
47216- probe_kernel_read(after, (char *)kgdbts_break_test,
47217+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47218 BREAK_INSTR_SIZE);
47219 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47220 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47221diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47222index 4739689..8a52950 100644
47223--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47224+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47225@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47226 * the lid is closed. This leads to interrupts as soon as a little move
47227 * is done.
47228 */
47229- atomic_inc(&lis3->count);
47230+ atomic_inc_unchecked(&lis3->count);
47231
47232 wake_up_interruptible(&lis3->misc_wait);
47233 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47234@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47235 if (lis3->pm_dev)
47236 pm_runtime_get_sync(lis3->pm_dev);
47237
47238- atomic_set(&lis3->count, 0);
47239+ atomic_set_unchecked(&lis3->count, 0);
47240 return 0;
47241 }
47242
47243@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47244 add_wait_queue(&lis3->misc_wait, &wait);
47245 while (true) {
47246 set_current_state(TASK_INTERRUPTIBLE);
47247- data = atomic_xchg(&lis3->count, 0);
47248+ data = atomic_xchg_unchecked(&lis3->count, 0);
47249 if (data)
47250 break;
47251
47252@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47253 struct lis3lv02d, miscdev);
47254
47255 poll_wait(file, &lis3->misc_wait, wait);
47256- if (atomic_read(&lis3->count))
47257+ if (atomic_read_unchecked(&lis3->count))
47258 return POLLIN | POLLRDNORM;
47259 return 0;
47260 }
47261diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47262index c439c82..1f20f57 100644
47263--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47264+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47265@@ -297,7 +297,7 @@ struct lis3lv02d {
47266 struct input_polled_dev *idev; /* input device */
47267 struct platform_device *pdev; /* platform device */
47268 struct regulator_bulk_data regulators[2];
47269- atomic_t count; /* interrupt count after last read */
47270+ atomic_unchecked_t count; /* interrupt count after last read */
47271 union axis_conversion ac; /* hw -> logical axis */
47272 int mapped_btns[3];
47273
47274diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47275index 2f30bad..c4c13d0 100644
47276--- a/drivers/misc/sgi-gru/gruhandles.c
47277+++ b/drivers/misc/sgi-gru/gruhandles.c
47278@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47279 unsigned long nsec;
47280
47281 nsec = CLKS2NSEC(clks);
47282- atomic_long_inc(&mcs_op_statistics[op].count);
47283- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47284+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47285+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47286 if (mcs_op_statistics[op].max < nsec)
47287 mcs_op_statistics[op].max = nsec;
47288 }
47289diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47290index 4f76359..cdfcb2e 100644
47291--- a/drivers/misc/sgi-gru/gruprocfs.c
47292+++ b/drivers/misc/sgi-gru/gruprocfs.c
47293@@ -32,9 +32,9 @@
47294
47295 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47296
47297-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47298+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47299 {
47300- unsigned long val = atomic_long_read(v);
47301+ unsigned long val = atomic_long_read_unchecked(v);
47302
47303 seq_printf(s, "%16lu %s\n", val, id);
47304 }
47305@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47306
47307 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47308 for (op = 0; op < mcsop_last; op++) {
47309- count = atomic_long_read(&mcs_op_statistics[op].count);
47310- total = atomic_long_read(&mcs_op_statistics[op].total);
47311+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47312+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47313 max = mcs_op_statistics[op].max;
47314 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47315 count ? total / count : 0, max);
47316diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47317index 5c3ce24..4915ccb 100644
47318--- a/drivers/misc/sgi-gru/grutables.h
47319+++ b/drivers/misc/sgi-gru/grutables.h
47320@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47321 * GRU statistics.
47322 */
47323 struct gru_stats_s {
47324- atomic_long_t vdata_alloc;
47325- atomic_long_t vdata_free;
47326- atomic_long_t gts_alloc;
47327- atomic_long_t gts_free;
47328- atomic_long_t gms_alloc;
47329- atomic_long_t gms_free;
47330- atomic_long_t gts_double_allocate;
47331- atomic_long_t assign_context;
47332- atomic_long_t assign_context_failed;
47333- atomic_long_t free_context;
47334- atomic_long_t load_user_context;
47335- atomic_long_t load_kernel_context;
47336- atomic_long_t lock_kernel_context;
47337- atomic_long_t unlock_kernel_context;
47338- atomic_long_t steal_user_context;
47339- atomic_long_t steal_kernel_context;
47340- atomic_long_t steal_context_failed;
47341- atomic_long_t nopfn;
47342- atomic_long_t asid_new;
47343- atomic_long_t asid_next;
47344- atomic_long_t asid_wrap;
47345- atomic_long_t asid_reuse;
47346- atomic_long_t intr;
47347- atomic_long_t intr_cbr;
47348- atomic_long_t intr_tfh;
47349- atomic_long_t intr_spurious;
47350- atomic_long_t intr_mm_lock_failed;
47351- atomic_long_t call_os;
47352- atomic_long_t call_os_wait_queue;
47353- atomic_long_t user_flush_tlb;
47354- atomic_long_t user_unload_context;
47355- atomic_long_t user_exception;
47356- atomic_long_t set_context_option;
47357- atomic_long_t check_context_retarget_intr;
47358- atomic_long_t check_context_unload;
47359- atomic_long_t tlb_dropin;
47360- atomic_long_t tlb_preload_page;
47361- atomic_long_t tlb_dropin_fail_no_asid;
47362- atomic_long_t tlb_dropin_fail_upm;
47363- atomic_long_t tlb_dropin_fail_invalid;
47364- atomic_long_t tlb_dropin_fail_range_active;
47365- atomic_long_t tlb_dropin_fail_idle;
47366- atomic_long_t tlb_dropin_fail_fmm;
47367- atomic_long_t tlb_dropin_fail_no_exception;
47368- atomic_long_t tfh_stale_on_fault;
47369- atomic_long_t mmu_invalidate_range;
47370- atomic_long_t mmu_invalidate_page;
47371- atomic_long_t flush_tlb;
47372- atomic_long_t flush_tlb_gru;
47373- atomic_long_t flush_tlb_gru_tgh;
47374- atomic_long_t flush_tlb_gru_zero_asid;
47375+ atomic_long_unchecked_t vdata_alloc;
47376+ atomic_long_unchecked_t vdata_free;
47377+ atomic_long_unchecked_t gts_alloc;
47378+ atomic_long_unchecked_t gts_free;
47379+ atomic_long_unchecked_t gms_alloc;
47380+ atomic_long_unchecked_t gms_free;
47381+ atomic_long_unchecked_t gts_double_allocate;
47382+ atomic_long_unchecked_t assign_context;
47383+ atomic_long_unchecked_t assign_context_failed;
47384+ atomic_long_unchecked_t free_context;
47385+ atomic_long_unchecked_t load_user_context;
47386+ atomic_long_unchecked_t load_kernel_context;
47387+ atomic_long_unchecked_t lock_kernel_context;
47388+ atomic_long_unchecked_t unlock_kernel_context;
47389+ atomic_long_unchecked_t steal_user_context;
47390+ atomic_long_unchecked_t steal_kernel_context;
47391+ atomic_long_unchecked_t steal_context_failed;
47392+ atomic_long_unchecked_t nopfn;
47393+ atomic_long_unchecked_t asid_new;
47394+ atomic_long_unchecked_t asid_next;
47395+ atomic_long_unchecked_t asid_wrap;
47396+ atomic_long_unchecked_t asid_reuse;
47397+ atomic_long_unchecked_t intr;
47398+ atomic_long_unchecked_t intr_cbr;
47399+ atomic_long_unchecked_t intr_tfh;
47400+ atomic_long_unchecked_t intr_spurious;
47401+ atomic_long_unchecked_t intr_mm_lock_failed;
47402+ atomic_long_unchecked_t call_os;
47403+ atomic_long_unchecked_t call_os_wait_queue;
47404+ atomic_long_unchecked_t user_flush_tlb;
47405+ atomic_long_unchecked_t user_unload_context;
47406+ atomic_long_unchecked_t user_exception;
47407+ atomic_long_unchecked_t set_context_option;
47408+ atomic_long_unchecked_t check_context_retarget_intr;
47409+ atomic_long_unchecked_t check_context_unload;
47410+ atomic_long_unchecked_t tlb_dropin;
47411+ atomic_long_unchecked_t tlb_preload_page;
47412+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47413+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47414+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47415+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47416+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47417+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47418+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47419+ atomic_long_unchecked_t tfh_stale_on_fault;
47420+ atomic_long_unchecked_t mmu_invalidate_range;
47421+ atomic_long_unchecked_t mmu_invalidate_page;
47422+ atomic_long_unchecked_t flush_tlb;
47423+ atomic_long_unchecked_t flush_tlb_gru;
47424+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47425+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47426
47427- atomic_long_t copy_gpa;
47428- atomic_long_t read_gpa;
47429+ atomic_long_unchecked_t copy_gpa;
47430+ atomic_long_unchecked_t read_gpa;
47431
47432- atomic_long_t mesq_receive;
47433- atomic_long_t mesq_receive_none;
47434- atomic_long_t mesq_send;
47435- atomic_long_t mesq_send_failed;
47436- atomic_long_t mesq_noop;
47437- atomic_long_t mesq_send_unexpected_error;
47438- atomic_long_t mesq_send_lb_overflow;
47439- atomic_long_t mesq_send_qlimit_reached;
47440- atomic_long_t mesq_send_amo_nacked;
47441- atomic_long_t mesq_send_put_nacked;
47442- atomic_long_t mesq_page_overflow;
47443- atomic_long_t mesq_qf_locked;
47444- atomic_long_t mesq_qf_noop_not_full;
47445- atomic_long_t mesq_qf_switch_head_failed;
47446- atomic_long_t mesq_qf_unexpected_error;
47447- atomic_long_t mesq_noop_unexpected_error;
47448- atomic_long_t mesq_noop_lb_overflow;
47449- atomic_long_t mesq_noop_qlimit_reached;
47450- atomic_long_t mesq_noop_amo_nacked;
47451- atomic_long_t mesq_noop_put_nacked;
47452- atomic_long_t mesq_noop_page_overflow;
47453+ atomic_long_unchecked_t mesq_receive;
47454+ atomic_long_unchecked_t mesq_receive_none;
47455+ atomic_long_unchecked_t mesq_send;
47456+ atomic_long_unchecked_t mesq_send_failed;
47457+ atomic_long_unchecked_t mesq_noop;
47458+ atomic_long_unchecked_t mesq_send_unexpected_error;
47459+ atomic_long_unchecked_t mesq_send_lb_overflow;
47460+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47461+ atomic_long_unchecked_t mesq_send_amo_nacked;
47462+ atomic_long_unchecked_t mesq_send_put_nacked;
47463+ atomic_long_unchecked_t mesq_page_overflow;
47464+ atomic_long_unchecked_t mesq_qf_locked;
47465+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47466+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47467+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47468+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47469+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47470+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47471+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47472+ atomic_long_unchecked_t mesq_noop_put_nacked;
47473+ atomic_long_unchecked_t mesq_noop_page_overflow;
47474
47475 };
47476
47477@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47478 tghop_invalidate, mcsop_last};
47479
47480 struct mcs_op_statistic {
47481- atomic_long_t count;
47482- atomic_long_t total;
47483+ atomic_long_unchecked_t count;
47484+ atomic_long_unchecked_t total;
47485 unsigned long max;
47486 };
47487
47488@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47489
47490 #define STAT(id) do { \
47491 if (gru_options & OPT_STATS) \
47492- atomic_long_inc(&gru_stats.id); \
47493+ atomic_long_inc_unchecked(&gru_stats.id); \
47494 } while (0)
47495
47496 #ifdef CONFIG_SGI_GRU_DEBUG
47497diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47498index c862cd4..0d176fe 100644
47499--- a/drivers/misc/sgi-xp/xp.h
47500+++ b/drivers/misc/sgi-xp/xp.h
47501@@ -288,7 +288,7 @@ struct xpc_interface {
47502 xpc_notify_func, void *);
47503 void (*received) (short, int, void *);
47504 enum xp_retval (*partid_to_nasids) (short, void *);
47505-};
47506+} __no_const;
47507
47508 extern struct xpc_interface xpc_interface;
47509
47510diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47511index 01be66d..e3a0c7e 100644
47512--- a/drivers/misc/sgi-xp/xp_main.c
47513+++ b/drivers/misc/sgi-xp/xp_main.c
47514@@ -78,13 +78,13 @@ xpc_notloaded(void)
47515 }
47516
47517 struct xpc_interface xpc_interface = {
47518- (void (*)(int))xpc_notloaded,
47519- (void (*)(int))xpc_notloaded,
47520- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47521- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47522+ .connect = (void (*)(int))xpc_notloaded,
47523+ .disconnect = (void (*)(int))xpc_notloaded,
47524+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47525+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47526 void *))xpc_notloaded,
47527- (void (*)(short, int, void *))xpc_notloaded,
47528- (enum xp_retval(*)(short, void *))xpc_notloaded
47529+ .received = (void (*)(short, int, void *))xpc_notloaded,
47530+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47531 };
47532 EXPORT_SYMBOL_GPL(xpc_interface);
47533
47534diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47535index b94d5f7..7f494c5 100644
47536--- a/drivers/misc/sgi-xp/xpc.h
47537+++ b/drivers/misc/sgi-xp/xpc.h
47538@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47539 void (*received_payload) (struct xpc_channel *, void *);
47540 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47541 };
47542+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47543
47544 /* struct xpc_partition act_state values (for XPC HB) */
47545
47546@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47547 /* found in xpc_main.c */
47548 extern struct device *xpc_part;
47549 extern struct device *xpc_chan;
47550-extern struct xpc_arch_operations xpc_arch_ops;
47551+extern xpc_arch_operations_no_const xpc_arch_ops;
47552 extern int xpc_disengage_timelimit;
47553 extern int xpc_disengage_timedout;
47554 extern int xpc_activate_IRQ_rcvd;
47555diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47556index 7f32712..8539ab2 100644
47557--- a/drivers/misc/sgi-xp/xpc_main.c
47558+++ b/drivers/misc/sgi-xp/xpc_main.c
47559@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47560 .notifier_call = xpc_system_die,
47561 };
47562
47563-struct xpc_arch_operations xpc_arch_ops;
47564+xpc_arch_operations_no_const xpc_arch_ops;
47565
47566 /*
47567 * Timer function to enforce the timelimit on the partition disengage.
47568diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47569index 31d2627..d1b80a5 100644
47570--- a/drivers/mmc/card/block.c
47571+++ b/drivers/mmc/card/block.c
47572@@ -579,7 +579,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47573 if (idata->ic.postsleep_min_us)
47574 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47575
47576- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47577+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47578 err = -EFAULT;
47579 goto cmd_rel_host;
47580 }
47581diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47582index f45ab91..9f50d8f 100644
47583--- a/drivers/mmc/host/dw_mmc.h
47584+++ b/drivers/mmc/host/dw_mmc.h
47585@@ -287,5 +287,5 @@ struct dw_mci_drv_data {
47586 int (*execute_tuning)(struct dw_mci_slot *slot);
47587 int (*prepare_hs400_tuning)(struct dw_mci *host,
47588 struct mmc_ios *ios);
47589-};
47590+} __do_const;
47591 #endif /* _DW_MMC_H_ */
47592diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47593index fb26674..3172c2b 100644
47594--- a/drivers/mmc/host/mmci.c
47595+++ b/drivers/mmc/host/mmci.c
47596@@ -1633,7 +1633,9 @@ static int mmci_probe(struct amba_device *dev,
47597 mmc->caps |= MMC_CAP_CMD23;
47598
47599 if (variant->busy_detect) {
47600- mmci_ops.card_busy = mmci_card_busy;
47601+ pax_open_kernel();
47602+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47603+ pax_close_kernel();
47604 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47605 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47606 mmc->max_busy_timeout = 0;
47607diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47608index d0abdffb..bb1f8d7 100644
47609--- a/drivers/mmc/host/omap_hsmmc.c
47610+++ b/drivers/mmc/host/omap_hsmmc.c
47611@@ -2004,7 +2004,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47612
47613 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47614 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47615- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47616+ pax_open_kernel();
47617+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47618+ pax_close_kernel();
47619 }
47620
47621 pm_runtime_enable(host->dev);
47622diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47623index 82f512d..5a228bb 100644
47624--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47625+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47626@@ -993,9 +993,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47627 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47628 }
47629
47630- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47631- sdhci_esdhc_ops.platform_execute_tuning =
47632+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47633+ pax_open_kernel();
47634+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47635 esdhc_executing_tuning;
47636+ pax_close_kernel();
47637+ }
47638
47639 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47640 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47641diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47642index c6d2dd7..81b1ca3 100644
47643--- a/drivers/mmc/host/sdhci-s3c.c
47644+++ b/drivers/mmc/host/sdhci-s3c.c
47645@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47646 * we can use overriding functions instead of default.
47647 */
47648 if (sc->no_divider) {
47649- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47650- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47651- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47652+ pax_open_kernel();
47653+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47654+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47655+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47656+ pax_close_kernel();
47657 }
47658
47659 /* It supports additional host capabilities if needed */
47660diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47661index 9a1a6ff..b8f1a57 100644
47662--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47663+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47664@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47665 size_t totlen = 0, thislen;
47666 int ret = 0;
47667 size_t buflen = 0;
47668- static char *buffer;
47669+ char *buffer;
47670
47671 if (!ECCBUF_SIZE) {
47672 /* We should fall back to a general writev implementation.
47673diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47674index 870c7fc..c7d6440 100644
47675--- a/drivers/mtd/nand/denali.c
47676+++ b/drivers/mtd/nand/denali.c
47677@@ -24,6 +24,7 @@
47678 #include <linux/slab.h>
47679 #include <linux/mtd/mtd.h>
47680 #include <linux/module.h>
47681+#include <linux/slab.h>
47682
47683 #include "denali.h"
47684
47685diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47686index 1b8f350..990f2e9 100644
47687--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47688+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47689@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47690
47691 /* first try to map the upper buffer directly */
47692 if (virt_addr_valid(this->upper_buf) &&
47693- !object_is_on_stack(this->upper_buf)) {
47694+ !object_starts_on_stack(this->upper_buf)) {
47695 sg_init_one(sgl, this->upper_buf, this->upper_len);
47696 ret = dma_map_sg(this->dev, sgl, 1, dr);
47697 if (ret == 0)
47698diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47699index a5dfbfb..8042ab4 100644
47700--- a/drivers/mtd/nftlmount.c
47701+++ b/drivers/mtd/nftlmount.c
47702@@ -24,6 +24,7 @@
47703 #include <asm/errno.h>
47704 #include <linux/delay.h>
47705 #include <linux/slab.h>
47706+#include <linux/sched.h>
47707 #include <linux/mtd/mtd.h>
47708 #include <linux/mtd/nand.h>
47709 #include <linux/mtd/nftl.h>
47710diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47711index c23184a..4115c41 100644
47712--- a/drivers/mtd/sm_ftl.c
47713+++ b/drivers/mtd/sm_ftl.c
47714@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47715 #define SM_CIS_VENDOR_OFFSET 0x59
47716 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47717 {
47718- struct attribute_group *attr_group;
47719+ attribute_group_no_const *attr_group;
47720 struct attribute **attributes;
47721 struct sm_sysfs_attribute *vendor_attribute;
47722 char *vendor;
47723diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47724index 7b11243..b3278a3 100644
47725--- a/drivers/net/bonding/bond_netlink.c
47726+++ b/drivers/net/bonding/bond_netlink.c
47727@@ -585,7 +585,7 @@ nla_put_failure:
47728 return -EMSGSIZE;
47729 }
47730
47731-struct rtnl_link_ops bond_link_ops __read_mostly = {
47732+struct rtnl_link_ops bond_link_ops = {
47733 .kind = "bond",
47734 .priv_size = sizeof(struct bonding),
47735 .setup = bond_setup,
47736diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47737index b3b922a..80bba38 100644
47738--- a/drivers/net/caif/caif_hsi.c
47739+++ b/drivers/net/caif/caif_hsi.c
47740@@ -1444,7 +1444,7 @@ err:
47741 return -ENODEV;
47742 }
47743
47744-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47745+static struct rtnl_link_ops caif_hsi_link_ops = {
47746 .kind = "cfhsi",
47747 .priv_size = sizeof(struct cfhsi),
47748 .setup = cfhsi_setup,
47749diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47750index e8c96b8..516a96c 100644
47751--- a/drivers/net/can/Kconfig
47752+++ b/drivers/net/can/Kconfig
47753@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47754
47755 config CAN_FLEXCAN
47756 tristate "Support for Freescale FLEXCAN based chips"
47757- depends on ARM || PPC
47758+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47759 ---help---
47760 Say Y here if you want to support for Freescale FlexCAN.
47761
47762diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47763index aede704..b516b4d 100644
47764--- a/drivers/net/can/dev.c
47765+++ b/drivers/net/can/dev.c
47766@@ -961,7 +961,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47767 return -EOPNOTSUPP;
47768 }
47769
47770-static struct rtnl_link_ops can_link_ops __read_mostly = {
47771+static struct rtnl_link_ops can_link_ops = {
47772 .kind = "can",
47773 .maxtype = IFLA_CAN_MAX,
47774 .policy = can_policy,
47775diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47776index 674f367..ec3a31f 100644
47777--- a/drivers/net/can/vcan.c
47778+++ b/drivers/net/can/vcan.c
47779@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
47780 dev->destructor = free_netdev;
47781 }
47782
47783-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47784+static struct rtnl_link_ops vcan_link_ops = {
47785 .kind = "vcan",
47786 .setup = vcan_setup,
47787 };
47788diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47789index 49adbf1..fff7ff8 100644
47790--- a/drivers/net/dummy.c
47791+++ b/drivers/net/dummy.c
47792@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47793 return 0;
47794 }
47795
47796-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47797+static struct rtnl_link_ops dummy_link_ops = {
47798 .kind = DRV_NAME,
47799 .setup = dummy_setup,
47800 .validate = dummy_validate,
47801diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47802index 0443654..4f0aa18 100644
47803--- a/drivers/net/ethernet/8390/ax88796.c
47804+++ b/drivers/net/ethernet/8390/ax88796.c
47805@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47806 if (ax->plat->reg_offsets)
47807 ei_local->reg_offset = ax->plat->reg_offsets;
47808 else {
47809+ resource_size_t _mem_size = mem_size;
47810+ do_div(_mem_size, 0x18);
47811 ei_local->reg_offset = ax->reg_offsets;
47812 for (ret = 0; ret < 0x18; ret++)
47813- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47814+ ax->reg_offsets[ret] = _mem_size * ret;
47815 }
47816
47817 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47818diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47819index da48e66..2dbec80 100644
47820--- a/drivers/net/ethernet/altera/altera_tse_main.c
47821+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47822@@ -1256,7 +1256,7 @@ static int tse_shutdown(struct net_device *dev)
47823 return 0;
47824 }
47825
47826-static struct net_device_ops altera_tse_netdev_ops = {
47827+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47828 .ndo_open = tse_open,
47829 .ndo_stop = tse_shutdown,
47830 .ndo_start_xmit = tse_start_xmit,
47831@@ -1493,11 +1493,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47832 ndev->netdev_ops = &altera_tse_netdev_ops;
47833 altera_tse_set_ethtool_ops(ndev);
47834
47835+ pax_open_kernel();
47836 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47837
47838 if (priv->hash_filter)
47839 altera_tse_netdev_ops.ndo_set_rx_mode =
47840 tse_set_rx_mode_hashfilter;
47841+ pax_close_kernel();
47842
47843 /* Scatter/gather IO is not supported,
47844 * so it is turned off
47845diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47846index 34c28aa..5e06567 100644
47847--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47848+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47849@@ -1124,14 +1124,14 @@ do { \
47850 * operations, everything works on mask values.
47851 */
47852 #define XMDIO_READ(_pdata, _mmd, _reg) \
47853- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47854+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47855 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47856
47857 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47858 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47859
47860 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47861- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47862+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47863 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47864
47865 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47866diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47867index 8a50b01..39c1ad0 100644
47868--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47869+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47870@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47871
47872 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47873
47874- pdata->hw_if.config_dcb_tc(pdata);
47875+ pdata->hw_if->config_dcb_tc(pdata);
47876
47877 return 0;
47878 }
47879@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47880
47881 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47882
47883- pdata->hw_if.config_dcb_pfc(pdata);
47884+ pdata->hw_if->config_dcb_pfc(pdata);
47885
47886 return 0;
47887 }
47888diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47889index 5c92fb7..08be735 100644
47890--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47891+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47892@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
47893
47894 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47895 {
47896- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47897+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47898 struct xgbe_channel *channel;
47899 struct xgbe_ring *ring;
47900 struct xgbe_ring_data *rdata;
47901@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47902
47903 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47904 {
47905- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47906+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47907 struct xgbe_channel *channel;
47908 struct xgbe_ring *ring;
47909 struct xgbe_ring_desc *rdesc;
47910@@ -620,17 +620,12 @@ err_out:
47911 return 0;
47912 }
47913
47914-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47915-{
47916- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47917-
47918- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47919- desc_if->free_ring_resources = xgbe_free_ring_resources;
47920- desc_if->map_tx_skb = xgbe_map_tx_skb;
47921- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
47922- desc_if->unmap_rdata = xgbe_unmap_rdata;
47923- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47924- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47925-
47926- DBGPR("<--xgbe_init_function_ptrs_desc\n");
47927-}
47928+struct xgbe_desc_if default_xgbe_desc_if = {
47929+ .alloc_ring_resources = xgbe_alloc_ring_resources,
47930+ .free_ring_resources = xgbe_free_ring_resources,
47931+ .map_tx_skb = xgbe_map_tx_skb,
47932+ .map_rx_buffer = xgbe_map_rx_buffer,
47933+ .unmap_rdata = xgbe_unmap_rdata,
47934+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47935+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47936+};
47937diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47938index 21d9497..c74b40f 100644
47939--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47940+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47941@@ -2772,7 +2772,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47942
47943 static int xgbe_init(struct xgbe_prv_data *pdata)
47944 {
47945- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47946+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47947 int ret;
47948
47949 DBGPR("-->xgbe_init\n");
47950@@ -2838,106 +2838,101 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47951 return 0;
47952 }
47953
47954-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47955-{
47956- DBGPR("-->xgbe_init_function_ptrs\n");
47957-
47958- hw_if->tx_complete = xgbe_tx_complete;
47959-
47960- hw_if->set_mac_address = xgbe_set_mac_address;
47961- hw_if->config_rx_mode = xgbe_config_rx_mode;
47962-
47963- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47964- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47965-
47966- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47967- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47968- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47969- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47970- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47971-
47972- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47973- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47974-
47975- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47976- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47977- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47978-
47979- hw_if->enable_tx = xgbe_enable_tx;
47980- hw_if->disable_tx = xgbe_disable_tx;
47981- hw_if->enable_rx = xgbe_enable_rx;
47982- hw_if->disable_rx = xgbe_disable_rx;
47983-
47984- hw_if->powerup_tx = xgbe_powerup_tx;
47985- hw_if->powerdown_tx = xgbe_powerdown_tx;
47986- hw_if->powerup_rx = xgbe_powerup_rx;
47987- hw_if->powerdown_rx = xgbe_powerdown_rx;
47988-
47989- hw_if->dev_xmit = xgbe_dev_xmit;
47990- hw_if->dev_read = xgbe_dev_read;
47991- hw_if->enable_int = xgbe_enable_int;
47992- hw_if->disable_int = xgbe_disable_int;
47993- hw_if->init = xgbe_init;
47994- hw_if->exit = xgbe_exit;
47995+struct xgbe_hw_if default_xgbe_hw_if = {
47996+ .tx_complete = xgbe_tx_complete,
47997+
47998+ .set_mac_address = xgbe_set_mac_address,
47999+ .config_rx_mode = xgbe_config_rx_mode,
48000+
48001+ .enable_rx_csum = xgbe_enable_rx_csum,
48002+ .disable_rx_csum = xgbe_disable_rx_csum,
48003+
48004+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48005+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48006+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48007+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48008+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48009+
48010+ .read_mmd_regs = xgbe_read_mmd_regs,
48011+ .write_mmd_regs = xgbe_write_mmd_regs,
48012+
48013+ .set_gmii_speed = xgbe_set_gmii_speed,
48014+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48015+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48016+
48017+ .enable_tx = xgbe_enable_tx,
48018+ .disable_tx = xgbe_disable_tx,
48019+ .enable_rx = xgbe_enable_rx,
48020+ .disable_rx = xgbe_disable_rx,
48021+
48022+ .powerup_tx = xgbe_powerup_tx,
48023+ .powerdown_tx = xgbe_powerdown_tx,
48024+ .powerup_rx = xgbe_powerup_rx,
48025+ .powerdown_rx = xgbe_powerdown_rx,
48026+
48027+ .dev_xmit = xgbe_dev_xmit,
48028+ .dev_read = xgbe_dev_read,
48029+ .enable_int = xgbe_enable_int,
48030+ .disable_int = xgbe_disable_int,
48031+ .init = xgbe_init,
48032+ .exit = xgbe_exit,
48033
48034 /* Descriptor related Sequences have to be initialized here */
48035- hw_if->tx_desc_init = xgbe_tx_desc_init;
48036- hw_if->rx_desc_init = xgbe_rx_desc_init;
48037- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48038- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48039- hw_if->is_last_desc = xgbe_is_last_desc;
48040- hw_if->is_context_desc = xgbe_is_context_desc;
48041- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48042+ .tx_desc_init = xgbe_tx_desc_init,
48043+ .rx_desc_init = xgbe_rx_desc_init,
48044+ .tx_desc_reset = xgbe_tx_desc_reset,
48045+ .rx_desc_reset = xgbe_rx_desc_reset,
48046+ .is_last_desc = xgbe_is_last_desc,
48047+ .is_context_desc = xgbe_is_context_desc,
48048+ .tx_start_xmit = xgbe_tx_start_xmit,
48049
48050 /* For FLOW ctrl */
48051- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48052- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48053+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48054+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48055
48056 /* For RX coalescing */
48057- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48058- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48059- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48060- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48061+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48062+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48063+ .usec_to_riwt = xgbe_usec_to_riwt,
48064+ .riwt_to_usec = xgbe_riwt_to_usec,
48065
48066 /* For RX and TX threshold config */
48067- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48068- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48069+ .config_rx_threshold = xgbe_config_rx_threshold,
48070+ .config_tx_threshold = xgbe_config_tx_threshold,
48071
48072 /* For RX and TX Store and Forward Mode config */
48073- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48074- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48075+ .config_rsf_mode = xgbe_config_rsf_mode,
48076+ .config_tsf_mode = xgbe_config_tsf_mode,
48077
48078 /* For TX DMA Operating on Second Frame config */
48079- hw_if->config_osp_mode = xgbe_config_osp_mode;
48080+ .config_osp_mode = xgbe_config_osp_mode,
48081
48082 /* For RX and TX PBL config */
48083- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48084- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48085- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48086- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48087- hw_if->config_pblx8 = xgbe_config_pblx8;
48088+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48089+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48090+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48091+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48092+ .config_pblx8 = xgbe_config_pblx8,
48093
48094 /* For MMC statistics support */
48095- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48096- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48097- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48098+ .tx_mmc_int = xgbe_tx_mmc_int,
48099+ .rx_mmc_int = xgbe_rx_mmc_int,
48100+ .read_mmc_stats = xgbe_read_mmc_stats,
48101
48102 /* For PTP config */
48103- hw_if->config_tstamp = xgbe_config_tstamp;
48104- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48105- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48106- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48107- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48108+ .config_tstamp = xgbe_config_tstamp,
48109+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48110+ .set_tstamp_time = xgbe_set_tstamp_time,
48111+ .get_tstamp_time = xgbe_get_tstamp_time,
48112+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48113
48114 /* For Data Center Bridging config */
48115- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48116- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48117+ .config_dcb_tc = xgbe_config_dcb_tc,
48118+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48119
48120 /* For Receive Side Scaling */
48121- hw_if->enable_rss = xgbe_enable_rss;
48122- hw_if->disable_rss = xgbe_disable_rss;
48123- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48124- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48125-
48126- DBGPR("<--xgbe_init_function_ptrs\n");
48127-}
48128+ .enable_rss = xgbe_enable_rss,
48129+ .disable_rss = xgbe_disable_rss,
48130+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48131+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48132+};
48133diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48134index 9fd6c69..588ff02 100644
48135--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48136+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48137@@ -243,7 +243,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48138 * support, tell it now
48139 */
48140 if (ring->tx.xmit_more)
48141- pdata->hw_if.tx_start_xmit(channel, ring);
48142+ pdata->hw_if->tx_start_xmit(channel, ring);
48143
48144 return NETDEV_TX_BUSY;
48145 }
48146@@ -271,7 +271,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48147
48148 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48149 {
48150- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48151+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48152 struct xgbe_channel *channel;
48153 enum xgbe_int int_id;
48154 unsigned int i;
48155@@ -293,7 +293,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48156
48157 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48158 {
48159- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48160+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48161 struct xgbe_channel *channel;
48162 enum xgbe_int int_id;
48163 unsigned int i;
48164@@ -316,7 +316,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48165 static irqreturn_t xgbe_isr(int irq, void *data)
48166 {
48167 struct xgbe_prv_data *pdata = data;
48168- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48169+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48170 struct xgbe_channel *channel;
48171 unsigned int dma_isr, dma_ch_isr;
48172 unsigned int mac_isr, mac_tssr;
48173@@ -682,7 +682,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48174
48175 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48176 {
48177- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48178+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48179
48180 DBGPR("-->xgbe_init_tx_coalesce\n");
48181
48182@@ -696,7 +696,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48183
48184 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48185 {
48186- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48187+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48188
48189 DBGPR("-->xgbe_init_rx_coalesce\n");
48190
48191@@ -711,7 +711,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48192
48193 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48194 {
48195- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48196+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48197 struct xgbe_channel *channel;
48198 struct xgbe_ring *ring;
48199 struct xgbe_ring_data *rdata;
48200@@ -736,7 +736,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48201
48202 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48203 {
48204- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48205+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48206 struct xgbe_channel *channel;
48207 struct xgbe_ring *ring;
48208 struct xgbe_ring_data *rdata;
48209@@ -762,7 +762,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48210 static void xgbe_adjust_link(struct net_device *netdev)
48211 {
48212 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48213- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48214+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48215 struct phy_device *phydev = pdata->phydev;
48216 int new_state = 0;
48217
48218@@ -870,7 +870,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48219 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48220 {
48221 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48222- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48223+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48224 unsigned long flags;
48225
48226 DBGPR("-->xgbe_powerdown\n");
48227@@ -908,7 +908,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48228 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48229 {
48230 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48231- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48232+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48233 unsigned long flags;
48234
48235 DBGPR("-->xgbe_powerup\n");
48236@@ -945,7 +945,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48237
48238 static int xgbe_start(struct xgbe_prv_data *pdata)
48239 {
48240- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48241+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48242 struct net_device *netdev = pdata->netdev;
48243 int ret;
48244
48245@@ -984,7 +984,7 @@ err_napi:
48246
48247 static void xgbe_stop(struct xgbe_prv_data *pdata)
48248 {
48249- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48250+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48251 struct xgbe_channel *channel;
48252 struct net_device *netdev = pdata->netdev;
48253 struct netdev_queue *txq;
48254@@ -1211,7 +1211,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48255 return -ERANGE;
48256 }
48257
48258- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48259+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48260
48261 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48262
48263@@ -1360,7 +1360,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48264 static int xgbe_open(struct net_device *netdev)
48265 {
48266 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48267- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48268+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48269 int ret;
48270
48271 DBGPR("-->xgbe_open\n");
48272@@ -1432,7 +1432,7 @@ err_phy_init:
48273 static int xgbe_close(struct net_device *netdev)
48274 {
48275 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48276- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48277+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48278
48279 DBGPR("-->xgbe_close\n");
48280
48281@@ -1460,8 +1460,8 @@ static int xgbe_close(struct net_device *netdev)
48282 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48283 {
48284 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48285- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48286- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48287+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48288+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48289 struct xgbe_channel *channel;
48290 struct xgbe_ring *ring;
48291 struct xgbe_packet_data *packet;
48292@@ -1529,7 +1529,7 @@ tx_netdev_return:
48293 static void xgbe_set_rx_mode(struct net_device *netdev)
48294 {
48295 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48296- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48297+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48298
48299 DBGPR("-->xgbe_set_rx_mode\n");
48300
48301@@ -1541,7 +1541,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48302 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48303 {
48304 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48305- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48306+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48307 struct sockaddr *saddr = addr;
48308
48309 DBGPR("-->xgbe_set_mac_address\n");
48310@@ -1616,7 +1616,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48311
48312 DBGPR("-->%s\n", __func__);
48313
48314- pdata->hw_if.read_mmc_stats(pdata);
48315+ pdata->hw_if->read_mmc_stats(pdata);
48316
48317 s->rx_packets = pstats->rxframecount_gb;
48318 s->rx_bytes = pstats->rxoctetcount_gb;
48319@@ -1643,7 +1643,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48320 u16 vid)
48321 {
48322 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48323- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48324+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48325
48326 DBGPR("-->%s\n", __func__);
48327
48328@@ -1659,7 +1659,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48329 u16 vid)
48330 {
48331 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48332- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48333+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48334
48335 DBGPR("-->%s\n", __func__);
48336
48337@@ -1725,7 +1725,7 @@ static int xgbe_set_features(struct net_device *netdev,
48338 netdev_features_t features)
48339 {
48340 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48341- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48342+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48343 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48344 int ret = 0;
48345
48346@@ -1791,8 +1791,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48347 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48348 {
48349 struct xgbe_prv_data *pdata = channel->pdata;
48350- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48351- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48352+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48353+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48354 struct xgbe_ring *ring = channel->rx_ring;
48355 struct xgbe_ring_data *rdata;
48356
48357@@ -1847,8 +1847,8 @@ static struct sk_buff *xgbe_create_skb(struct napi_struct *napi,
48358 static int xgbe_tx_poll(struct xgbe_channel *channel)
48359 {
48360 struct xgbe_prv_data *pdata = channel->pdata;
48361- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48362- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48363+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48364+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48365 struct xgbe_ring *ring = channel->tx_ring;
48366 struct xgbe_ring_data *rdata;
48367 struct xgbe_ring_desc *rdesc;
48368@@ -1913,7 +1913,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48369 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48370 {
48371 struct xgbe_prv_data *pdata = channel->pdata;
48372- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48373+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48374 struct xgbe_ring *ring = channel->rx_ring;
48375 struct xgbe_ring_data *rdata;
48376 struct xgbe_packet_data *packet;
48377diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48378index 5f149e8..6736bf4 100644
48379--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48380+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48381@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48382
48383 DBGPR("-->%s\n", __func__);
48384
48385- pdata->hw_if.read_mmc_stats(pdata);
48386+ pdata->hw_if->read_mmc_stats(pdata);
48387 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48388 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48389 *data++ = *(u64 *)stat;
48390@@ -396,7 +396,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48391 struct ethtool_coalesce *ec)
48392 {
48393 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48394- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48395+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48396 unsigned int rx_frames, rx_riwt, rx_usecs;
48397 unsigned int tx_frames;
48398
48399@@ -521,7 +521,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48400 const u8 *key, const u8 hfunc)
48401 {
48402 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48403- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48404+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48405 unsigned int ret;
48406
48407 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48408diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48409index 7149053..889c5492 100644
48410--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48411+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48412@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48413 DBGPR("<--xgbe_default_config\n");
48414 }
48415
48416-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48417-{
48418- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48419- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48420-}
48421-
48422 #ifdef CONFIG_ACPI
48423 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48424 {
48425@@ -387,9 +381,8 @@ static int xgbe_probe(struct platform_device *pdev)
48426 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48427
48428 /* Set all the function pointers */
48429- xgbe_init_all_fptrs(pdata);
48430- hw_if = &pdata->hw_if;
48431- desc_if = &pdata->desc_if;
48432+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48433+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48434
48435 /* Issue software reset to device */
48436 hw_if->exit(pdata);
48437diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48438index 59e267f..0842a88 100644
48439--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48440+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48441@@ -126,7 +126,7 @@
48442 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48443 {
48444 struct xgbe_prv_data *pdata = mii->priv;
48445- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48446+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48447 int mmd_data;
48448
48449 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48450@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48451 u16 mmd_val)
48452 {
48453 struct xgbe_prv_data *pdata = mii->priv;
48454- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48455+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48456 int mmd_data = mmd_val;
48457
48458 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48459diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48460index b03e4f5..78e4cc4 100644
48461--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48462+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48463@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48464 tstamp_cc);
48465 u64 nsec;
48466
48467- nsec = pdata->hw_if.get_tstamp_time(pdata);
48468+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48469
48470 return nsec;
48471 }
48472@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48473
48474 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48475
48476- pdata->hw_if.update_tstamp_addend(pdata, addend);
48477+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48478
48479 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48480
48481diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48482index e62dfa2..7df28d5 100644
48483--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48484+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48485@@ -673,8 +673,8 @@ struct xgbe_prv_data {
48486 int dev_irq;
48487 unsigned int per_channel_irq;
48488
48489- struct xgbe_hw_if hw_if;
48490- struct xgbe_desc_if desc_if;
48491+ struct xgbe_hw_if *hw_if;
48492+ struct xgbe_desc_if *desc_if;
48493
48494 /* AXI DMA settings */
48495 unsigned int coherent;
48496@@ -797,6 +797,9 @@ struct xgbe_prv_data {
48497 #endif
48498 };
48499
48500+extern struct xgbe_hw_if default_xgbe_hw_if;
48501+extern struct xgbe_desc_if default_xgbe_desc_if;
48502+
48503 /* Function prototypes*/
48504
48505 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48506diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
48507index 783543a..a472348 100644
48508--- a/drivers/net/ethernet/broadcom/bcmsysport.c
48509+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
48510@@ -1721,7 +1721,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
48511 macaddr = of_get_mac_address(dn);
48512 if (!macaddr || !is_valid_ether_addr(macaddr)) {
48513 dev_warn(&pdev->dev, "using random Ethernet MAC\n");
48514- random_ether_addr(dev->dev_addr);
48515+ eth_hw_addr_random(dev);
48516 } else {
48517 ether_addr_copy(dev->dev_addr, macaddr);
48518 }
48519diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48520index d7a7175..7011194 100644
48521--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48522+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48523@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48524 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48525 {
48526 /* RX_MODE controlling object */
48527- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48528+ bnx2x_init_rx_mode_obj(bp);
48529
48530 /* multicast configuration controlling object */
48531 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48532diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48533index 07cdf9b..b08ecc7 100644
48534--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48535+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48536@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48537 return rc;
48538 }
48539
48540-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48541- struct bnx2x_rx_mode_obj *o)
48542+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48543 {
48544 if (CHIP_IS_E1x(bp)) {
48545- o->wait_comp = bnx2x_empty_rx_mode_wait;
48546- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48547+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48548+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48549 } else {
48550- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48551- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48552+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48553+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48554 }
48555 }
48556
48557diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48558index 86baecb..ff3bb46 100644
48559--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48560+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48561@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48562
48563 /********************* RX MODE ****************/
48564
48565-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48566- struct bnx2x_rx_mode_obj *o);
48567+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48568
48569 /**
48570 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48571diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48572index 31c9f82..e65e986 100644
48573--- a/drivers/net/ethernet/broadcom/tg3.h
48574+++ b/drivers/net/ethernet/broadcom/tg3.h
48575@@ -150,6 +150,7 @@
48576 #define CHIPREV_ID_5750_A0 0x4000
48577 #define CHIPREV_ID_5750_A1 0x4001
48578 #define CHIPREV_ID_5750_A3 0x4003
48579+#define CHIPREV_ID_5750_C1 0x4201
48580 #define CHIPREV_ID_5750_C2 0x4202
48581 #define CHIPREV_ID_5752_A0_HW 0x5000
48582 #define CHIPREV_ID_5752_A0 0x6000
48583diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48584index deb8da6..45d473b 100644
48585--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48586+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48587@@ -1694,10 +1694,10 @@ bna_cb_ioceth_reset(void *arg)
48588 }
48589
48590 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48591- bna_cb_ioceth_enable,
48592- bna_cb_ioceth_disable,
48593- bna_cb_ioceth_hbfail,
48594- bna_cb_ioceth_reset
48595+ .enable_cbfn = bna_cb_ioceth_enable,
48596+ .disable_cbfn = bna_cb_ioceth_disable,
48597+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48598+ .reset_cbfn = bna_cb_ioceth_reset
48599 };
48600
48601 static void bna_attr_init(struct bna_ioceth *ioceth)
48602diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48603index 8cffcdf..aadf043 100644
48604--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48605+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48606@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48607 */
48608 struct l2t_skb_cb {
48609 arp_failure_handler_func arp_failure_handler;
48610-};
48611+} __no_const;
48612
48613 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48614
48615diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48616index badff18..e15c4ec 100644
48617--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48618+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48619@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48620 for (i=0; i<ETH_ALEN; i++) {
48621 tmp.addr[i] = dev->dev_addr[i];
48622 }
48623- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48624+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48625 break;
48626
48627 case DE4X5_SET_HWADDR: /* Set the hardware address */
48628@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48629 spin_lock_irqsave(&lp->lock, flags);
48630 memcpy(&statbuf, &lp->pktStats, ioc->len);
48631 spin_unlock_irqrestore(&lp->lock, flags);
48632- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48633+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48634 return -EFAULT;
48635 break;
48636 }
48637diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48638index e43cc8a..f1cf67c 100644
48639--- a/drivers/net/ethernet/emulex/benet/be_main.c
48640+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48641@@ -539,7 +539,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48642
48643 if (wrapped)
48644 newacc += 65536;
48645- ACCESS_ONCE(*acc) = newacc;
48646+ ACCESS_ONCE_RW(*acc) = newacc;
48647 }
48648
48649 static void populate_erx_stats(struct be_adapter *adapter,
48650diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48651index 6d0c5d5..55be363 100644
48652--- a/drivers/net/ethernet/faraday/ftgmac100.c
48653+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48654@@ -30,6 +30,8 @@
48655 #include <linux/netdevice.h>
48656 #include <linux/phy.h>
48657 #include <linux/platform_device.h>
48658+#include <linux/interrupt.h>
48659+#include <linux/irqreturn.h>
48660 #include <net/ip.h>
48661
48662 #include "ftgmac100.h"
48663diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48664index dce5f7b..2433466 100644
48665--- a/drivers/net/ethernet/faraday/ftmac100.c
48666+++ b/drivers/net/ethernet/faraday/ftmac100.c
48667@@ -31,6 +31,8 @@
48668 #include <linux/module.h>
48669 #include <linux/netdevice.h>
48670 #include <linux/platform_device.h>
48671+#include <linux/interrupt.h>
48672+#include <linux/irqreturn.h>
48673
48674 #include "ftmac100.h"
48675
48676diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
48677index c754b20..c9da1b5 100644
48678--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
48679+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
48680@@ -216,7 +216,7 @@ static void fm10k_reuse_rx_page(struct fm10k_ring *rx_ring,
48681
48682 static inline bool fm10k_page_is_reserved(struct page *page)
48683 {
48684- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48685+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48686 }
48687
48688 static bool fm10k_can_reuse_rx_page(struct fm10k_rx_buffer *rx_buffer,
48689diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48690index a92b772..250fe69 100644
48691--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48692+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48693@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48694 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48695
48696 /* Update the base adjustement value. */
48697- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48698+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48699 smp_mb(); /* Force the above update. */
48700 }
48701
48702diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
48703index a0a9b1f..3fe93e7 100644
48704--- a/drivers/net/ethernet/intel/igb/igb_main.c
48705+++ b/drivers/net/ethernet/intel/igb/igb_main.c
48706@@ -6584,7 +6584,7 @@ static void igb_reuse_rx_page(struct igb_ring *rx_ring,
48707
48708 static inline bool igb_page_is_reserved(struct page *page)
48709 {
48710- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48711+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48712 }
48713
48714 static bool igb_can_reuse_rx_page(struct igb_rx_buffer *rx_buffer,
48715diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
48716index 5be12a0..463ff47 100644
48717--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
48718+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
48719@@ -1829,7 +1829,7 @@ static void ixgbe_reuse_rx_page(struct ixgbe_ring *rx_ring,
48720
48721 static inline bool ixgbe_page_is_reserved(struct page *page)
48722 {
48723- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48724+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48725 }
48726
48727 /**
48728diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48729index e5ba040..d47531c 100644
48730--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48731+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48732@@ -782,7 +782,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48733 }
48734
48735 /* update the base incval used to calculate frequency adjustment */
48736- ACCESS_ONCE(adapter->base_incval) = incval;
48737+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48738 smp_mb();
48739
48740 /* need lock to prevent incorrect read while modifying cyclecounter */
48741diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
48742index e71cdde..1d7b00b 100644
48743--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
48744+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
48745@@ -765,7 +765,7 @@ static void ixgbevf_reuse_rx_page(struct ixgbevf_ring *rx_ring,
48746
48747 static inline bool ixgbevf_page_is_reserved(struct page *page)
48748 {
48749- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48750+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48751 }
48752
48753 /**
48754diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
48755index 74d0389..086ac03 100644
48756--- a/drivers/net/ethernet/marvell/mvneta.c
48757+++ b/drivers/net/ethernet/marvell/mvneta.c
48758@@ -1462,7 +1462,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48759 struct mvneta_rx_queue *rxq)
48760 {
48761 struct net_device *dev = pp->dev;
48762- int rx_done, rx_filled;
48763+ int rx_done;
48764 u32 rcvd_pkts = 0;
48765 u32 rcvd_bytes = 0;
48766
48767@@ -1473,7 +1473,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48768 rx_todo = rx_done;
48769
48770 rx_done = 0;
48771- rx_filled = 0;
48772
48773 /* Fairness NAPI loop */
48774 while (rx_done < rx_todo) {
48775@@ -1484,7 +1483,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48776 int rx_bytes, err;
48777
48778 rx_done++;
48779- rx_filled++;
48780 rx_status = rx_desc->status;
48781 rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);
48782 data = (unsigned char *)rx_desc->buf_cookie;
48783@@ -1524,6 +1522,14 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48784 continue;
48785 }
48786
48787+ /* Refill processing */
48788+ err = mvneta_rx_refill(pp, rx_desc);
48789+ if (err) {
48790+ netdev_err(dev, "Linux processing - Can't refill\n");
48791+ rxq->missed++;
48792+ goto err_drop_frame;
48793+ }
48794+
48795 skb = build_skb(data, pp->frag_size > PAGE_SIZE ? 0 : pp->frag_size);
48796 if (!skb)
48797 goto err_drop_frame;
48798@@ -1543,14 +1549,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48799 mvneta_rx_csum(pp, rx_status, skb);
48800
48801 napi_gro_receive(&pp->napi, skb);
48802-
48803- /* Refill processing */
48804- err = mvneta_rx_refill(pp, rx_desc);
48805- if (err) {
48806- netdev_err(dev, "Linux processing - Can't refill\n");
48807- rxq->missed++;
48808- rx_filled--;
48809- }
48810 }
48811
48812 if (rcvd_pkts) {
48813@@ -1563,7 +1561,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48814 }
48815
48816 /* Update rxq management counters */
48817- mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_filled);
48818+ mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_done);
48819
48820 return rx_done;
48821 }
48822diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48823index c10d98f..72914c6 100644
48824--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48825+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48826@@ -475,8 +475,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48827 wmb();
48828
48829 /* we want to dirty this cache line once */
48830- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48831- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48832+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48833+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48834
48835 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48836
48837diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48838index 6223930..975033d 100644
48839--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48840+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48841@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48842 struct __vxge_hw_fifo *fifo;
48843 struct vxge_hw_fifo_config *config;
48844 u32 txdl_size, txdl_per_memblock;
48845- struct vxge_hw_mempool_cbs fifo_mp_callback;
48846+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48847+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48848+ };
48849+
48850 struct __vxge_hw_virtualpath *vpath;
48851
48852 if ((vp == NULL) || (attr == NULL)) {
48853@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48854 goto exit;
48855 }
48856
48857- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48858-
48859 fifo->mempool =
48860 __vxge_hw_mempool_create(vpath->hldev,
48861 fifo->config->memblock_size,
48862diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48863index 33669c2..674c39a 100644
48864--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48865+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48866@@ -1415,7 +1415,7 @@ static int qlcnic_83xx_copy_fw_file(struct qlcnic_adapter *adapter)
48867 if (fw->size & 0xF) {
48868 addr = dest + size;
48869 for (i = 0; i < (fw->size & 0xF); i++)
48870- data[i] = temp[size + i];
48871+ data[i] = ((u8 *)temp)[size + i];
48872 for (; i < 16; i++)
48873 data[i] = 0;
48874 ret = qlcnic_ms_mem_write128(adapter, addr,
48875@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48876 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48877 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48878 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48879- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48880+ pax_open_kernel();
48881+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48882+ pax_close_kernel();
48883 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48884 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48885 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48886diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48887index be7d7a6..a8983f8 100644
48888--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48889+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48890@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48891 case QLCNIC_NON_PRIV_FUNC:
48892 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48893 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48894- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48895+ pax_open_kernel();
48896+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48897+ pax_close_kernel();
48898 break;
48899 case QLCNIC_PRIV_FUNC:
48900 ahw->op_mode = QLCNIC_PRIV_FUNC;
48901 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48902- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48903+ pax_open_kernel();
48904+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48905+ pax_close_kernel();
48906 break;
48907 case QLCNIC_MGMT_FUNC:
48908 ahw->op_mode = QLCNIC_MGMT_FUNC;
48909 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48910- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48911+ pax_open_kernel();
48912+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48913+ pax_close_kernel();
48914 break;
48915 default:
48916 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48917diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48918index 332bb8a..e6adcd1 100644
48919--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48920+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48921@@ -1285,7 +1285,7 @@ flash_temp:
48922 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48923 {
48924 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48925- static const struct qlcnic_dump_operations *fw_dump_ops;
48926+ const struct qlcnic_dump_operations *fw_dump_ops;
48927 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48928 u32 entry_offset, dump, no_entries, buf_offset = 0;
48929 int i, k, ops_cnt, ops_index, dump_size = 0;
48930diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48931index 3df51fa..e9b517f 100644
48932--- a/drivers/net/ethernet/realtek/r8169.c
48933+++ b/drivers/net/ethernet/realtek/r8169.c
48934@@ -788,22 +788,22 @@ struct rtl8169_private {
48935 struct mdio_ops {
48936 void (*write)(struct rtl8169_private *, int, int);
48937 int (*read)(struct rtl8169_private *, int);
48938- } mdio_ops;
48939+ } __no_const mdio_ops;
48940
48941 struct pll_power_ops {
48942 void (*down)(struct rtl8169_private *);
48943 void (*up)(struct rtl8169_private *);
48944- } pll_power_ops;
48945+ } __no_const pll_power_ops;
48946
48947 struct jumbo_ops {
48948 void (*enable)(struct rtl8169_private *);
48949 void (*disable)(struct rtl8169_private *);
48950- } jumbo_ops;
48951+ } __no_const jumbo_ops;
48952
48953 struct csi_ops {
48954 void (*write)(struct rtl8169_private *, int, int);
48955 u32 (*read)(struct rtl8169_private *, int);
48956- } csi_ops;
48957+ } __no_const csi_ops;
48958
48959 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48960 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48961diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48962index a2e9aee..af41a0e 100644
48963--- a/drivers/net/ethernet/sfc/ptp.c
48964+++ b/drivers/net/ethernet/sfc/ptp.c
48965@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48966 ptp->start.dma_addr);
48967
48968 /* Clear flag that signals MC ready */
48969- ACCESS_ONCE(*start) = 0;
48970+ ACCESS_ONCE_RW(*start) = 0;
48971 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48972 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48973 EFX_BUG_ON_PARANOID(rc);
48974diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48975index 08c483b..2c4a553 100644
48976--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48977+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48978@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48979
48980 writel(value, ioaddr + MMC_CNTRL);
48981
48982- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48983- MMC_CNTRL, value);
48984+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48985+// MMC_CNTRL, value);
48986 }
48987
48988 /* To mask all all interrupts.*/
48989diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
48990index de28504..7f1c1cd 100644
48991--- a/drivers/net/ethernet/via/via-rhine.c
48992+++ b/drivers/net/ethernet/via/via-rhine.c
48993@@ -2525,7 +2525,7 @@ static struct platform_driver rhine_driver_platform = {
48994 }
48995 };
48996
48997-static struct dmi_system_id rhine_dmi_table[] __initdata = {
48998+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
48999 {
49000 .ident = "EPIA-M",
49001 .matches = {
49002diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49003index 41071d3..6e362e1 100644
49004--- a/drivers/net/hyperv/hyperv_net.h
49005+++ b/drivers/net/hyperv/hyperv_net.h
49006@@ -176,7 +176,7 @@ struct rndis_device {
49007 enum rndis_device_state state;
49008 bool link_state;
49009 bool link_change;
49010- atomic_t new_req_id;
49011+ atomic_unchecked_t new_req_id;
49012
49013 spinlock_t request_lock;
49014 struct list_head req_list;
49015diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49016index 9118cea..1a8e06a 100644
49017--- a/drivers/net/hyperv/rndis_filter.c
49018+++ b/drivers/net/hyperv/rndis_filter.c
49019@@ -100,7 +100,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49020 * template
49021 */
49022 set = &rndis_msg->msg.set_req;
49023- set->req_id = atomic_inc_return(&dev->new_req_id);
49024+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49025
49026 /* Add to the request list */
49027 spin_lock_irqsave(&dev->request_lock, flags);
49028@@ -923,7 +923,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49029
49030 /* Setup the rndis set */
49031 halt = &request->request_msg.msg.halt_req;
49032- halt->req_id = atomic_inc_return(&dev->new_req_id);
49033+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49034
49035 /* Ignore return since this msg is optional. */
49036 rndis_filter_send_request(dev, request);
49037diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49038index 94570aa..1a798e1 100644
49039--- a/drivers/net/ifb.c
49040+++ b/drivers/net/ifb.c
49041@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49042 return 0;
49043 }
49044
49045-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49046+static struct rtnl_link_ops ifb_link_ops = {
49047 .kind = "ifb",
49048 .priv_size = sizeof(struct ifb_private),
49049 .setup = ifb_setup,
49050diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
49051index 54549a6..0799442 100644
49052--- a/drivers/net/ipvlan/ipvlan.h
49053+++ b/drivers/net/ipvlan/ipvlan.h
49054@@ -102,6 +102,11 @@ static inline struct ipvl_port *ipvlan_port_get_rcu(const struct net_device *d)
49055 return rcu_dereference(d->rx_handler_data);
49056 }
49057
49058+static inline struct ipvl_port *ipvlan_port_get_rcu_bh(const struct net_device *d)
49059+{
49060+ return rcu_dereference_bh(d->rx_handler_data);
49061+}
49062+
49063 static inline struct ipvl_port *ipvlan_port_get_rtnl(const struct net_device *d)
49064 {
49065 return rtnl_dereference(d->rx_handler_data);
49066diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
49067index c30b5c3..b349dad 100644
49068--- a/drivers/net/ipvlan/ipvlan_core.c
49069+++ b/drivers/net/ipvlan/ipvlan_core.c
49070@@ -507,7 +507,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
49071 int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
49072 {
49073 struct ipvl_dev *ipvlan = netdev_priv(dev);
49074- struct ipvl_port *port = ipvlan_port_get_rcu(ipvlan->phy_dev);
49075+ struct ipvl_port *port = ipvlan_port_get_rcu_bh(ipvlan->phy_dev);
49076
49077 if (!port)
49078 goto out;
49079diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49080index 9f59f17..52cb38f 100644
49081--- a/drivers/net/macvlan.c
49082+++ b/drivers/net/macvlan.c
49083@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49084 free_nskb:
49085 kfree_skb(nskb);
49086 err:
49087- atomic_long_inc(&skb->dev->rx_dropped);
49088+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49089 }
49090
49091 static void macvlan_flush_sources(struct macvlan_port *port,
49092@@ -1480,13 +1480,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49093 int macvlan_link_register(struct rtnl_link_ops *ops)
49094 {
49095 /* common fields */
49096- ops->priv_size = sizeof(struct macvlan_dev);
49097- ops->validate = macvlan_validate;
49098- ops->maxtype = IFLA_MACVLAN_MAX;
49099- ops->policy = macvlan_policy;
49100- ops->changelink = macvlan_changelink;
49101- ops->get_size = macvlan_get_size;
49102- ops->fill_info = macvlan_fill_info;
49103+ pax_open_kernel();
49104+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49105+ *(void **)&ops->validate = macvlan_validate;
49106+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49107+ *(const void **)&ops->policy = macvlan_policy;
49108+ *(void **)&ops->changelink = macvlan_changelink;
49109+ *(void **)&ops->get_size = macvlan_get_size;
49110+ *(void **)&ops->fill_info = macvlan_fill_info;
49111+ pax_close_kernel();
49112
49113 return rtnl_link_register(ops);
49114 };
49115@@ -1572,7 +1574,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49116 return NOTIFY_DONE;
49117 }
49118
49119-static struct notifier_block macvlan_notifier_block __read_mostly = {
49120+static struct notifier_block macvlan_notifier_block = {
49121 .notifier_call = macvlan_device_event,
49122 };
49123
49124diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49125index 8c350c5..30fdc98 100644
49126--- a/drivers/net/macvtap.c
49127+++ b/drivers/net/macvtap.c
49128@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49129 dev->tx_queue_len = TUN_READQ_SIZE;
49130 }
49131
49132-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49133+static struct rtnl_link_ops macvtap_link_ops = {
49134 .kind = "macvtap",
49135 .setup = macvtap_setup,
49136 .newlink = macvtap_newlink,
49137@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49138
49139 ret = 0;
49140 u = q->flags;
49141- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49142+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49143 put_user(u, &ifr->ifr_flags))
49144 ret = -EFAULT;
49145 macvtap_put_vlan(vlan);
49146@@ -1214,7 +1214,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49147 return NOTIFY_DONE;
49148 }
49149
49150-static struct notifier_block macvtap_notifier_block __read_mostly = {
49151+static struct notifier_block macvtap_notifier_block = {
49152 .notifier_call = macvtap_device_event,
49153 };
49154
49155@@ -1268,6 +1268,7 @@ static void macvtap_exit(void)
49156 class_unregister(macvtap_class);
49157 cdev_del(&macvtap_cdev);
49158 unregister_chrdev_region(macvtap_major, MACVTAP_NUM_DEVS);
49159+ idr_destroy(&minor_idr);
49160 }
49161 module_exit(macvtap_exit);
49162
49163diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49164index 34924df..a747360 100644
49165--- a/drivers/net/nlmon.c
49166+++ b/drivers/net/nlmon.c
49167@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49168 return 0;
49169 }
49170
49171-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49172+static struct rtnl_link_ops nlmon_link_ops = {
49173 .kind = "nlmon",
49174 .priv_size = sizeof(struct nlmon),
49175 .setup = nlmon_setup,
49176diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49177index d551df6..fa4c2df 100644
49178--- a/drivers/net/phy/phy_device.c
49179+++ b/drivers/net/phy/phy_device.c
49180@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49181 * zero on success.
49182 *
49183 */
49184-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49185+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49186 struct phy_c45_device_ids *c45_ids) {
49187 int phy_reg;
49188 int i, reg_addr;
49189@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49190 * its return value is in turn returned.
49191 *
49192 */
49193-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49194+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49195 bool is_c45, struct phy_c45_device_ids *c45_ids)
49196 {
49197 int phy_reg;
49198@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49199 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49200 {
49201 struct phy_c45_device_ids c45_ids = {0};
49202- u32 phy_id = 0;
49203+ int phy_id = 0;
49204 int r;
49205
49206 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49207diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49208index 9d15566..5ad4ef6 100644
49209--- a/drivers/net/ppp/ppp_generic.c
49210+++ b/drivers/net/ppp/ppp_generic.c
49211@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49212 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49213 struct ppp_stats stats;
49214 struct ppp_comp_stats cstats;
49215- char *vers;
49216
49217 switch (cmd) {
49218 case SIOCGPPPSTATS:
49219@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49220 break;
49221
49222 case SIOCGPPPVER:
49223- vers = PPP_VERSION;
49224- if (copy_to_user(addr, vers, strlen(vers) + 1))
49225+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49226 break;
49227 err = 0;
49228 break;
49229diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49230index 079f7ad..b2a2bfa7 100644
49231--- a/drivers/net/slip/slhc.c
49232+++ b/drivers/net/slip/slhc.c
49233@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49234 register struct tcphdr *thp;
49235 register struct iphdr *ip;
49236 register struct cstate *cs;
49237- int len, hdrlen;
49238+ long len, hdrlen;
49239 unsigned char *cp = icp;
49240
49241 /* We've got a compressed packet; read the change byte */
49242diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49243index 6928448..e30c57f 100644
49244--- a/drivers/net/team/team.c
49245+++ b/drivers/net/team/team.c
49246@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
49247 return TEAM_DEFAULT_NUM_RX_QUEUES;
49248 }
49249
49250-static struct rtnl_link_ops team_link_ops __read_mostly = {
49251+static struct rtnl_link_ops team_link_ops = {
49252 .kind = DRV_NAME,
49253 .priv_size = sizeof(struct team),
49254 .setup = team_setup,
49255@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
49256 return NOTIFY_DONE;
49257 }
49258
49259-static struct notifier_block team_notifier_block __read_mostly = {
49260+static struct notifier_block team_notifier_block = {
49261 .notifier_call = team_device_event,
49262 };
49263
49264diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49265index e470ae5..e812f5e 100644
49266--- a/drivers/net/tun.c
49267+++ b/drivers/net/tun.c
49268@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49269 return -EINVAL;
49270 }
49271
49272-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49273+static struct rtnl_link_ops tun_link_ops = {
49274 .kind = DRV_NAME,
49275 .priv_size = sizeof(struct tun_struct),
49276 .setup = tun_setup,
49277@@ -1828,7 +1828,7 @@ unlock:
49278 }
49279
49280 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49281- unsigned long arg, int ifreq_len)
49282+ unsigned long arg, size_t ifreq_len)
49283 {
49284 struct tun_file *tfile = file->private_data;
49285 struct tun_struct *tun;
49286@@ -1842,6 +1842,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49287 int le;
49288 int ret;
49289
49290+ if (ifreq_len > sizeof ifr)
49291+ return -EFAULT;
49292+
49293 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49294 if (copy_from_user(&ifr, argp, ifreq_len))
49295 return -EFAULT;
49296diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49297index 111d907..1ee643e 100644
49298--- a/drivers/net/usb/hso.c
49299+++ b/drivers/net/usb/hso.c
49300@@ -70,7 +70,7 @@
49301 #include <asm/byteorder.h>
49302 #include <linux/serial_core.h>
49303 #include <linux/serial.h>
49304-
49305+#include <asm/local.h>
49306
49307 #define MOD_AUTHOR "Option Wireless"
49308 #define MOD_DESCRIPTION "USB High Speed Option driver"
49309@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49310 struct urb *urb;
49311
49312 urb = serial->rx_urb[0];
49313- if (serial->port.count > 0) {
49314+ if (atomic_read(&serial->port.count) > 0) {
49315 count = put_rxbuf_data(urb, serial);
49316 if (count == -1)
49317 return;
49318@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49319 DUMP1(urb->transfer_buffer, urb->actual_length);
49320
49321 /* Anyone listening? */
49322- if (serial->port.count == 0)
49323+ if (atomic_read(&serial->port.count) == 0)
49324 return;
49325
49326 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49327@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49328 tty_port_tty_set(&serial->port, tty);
49329
49330 /* check for port already opened, if not set the termios */
49331- serial->port.count++;
49332- if (serial->port.count == 1) {
49333+ if (atomic_inc_return(&serial->port.count) == 1) {
49334 serial->rx_state = RX_IDLE;
49335 /* Force default termio settings */
49336 _hso_serial_set_termios(tty, NULL);
49337@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49338 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49339 if (result) {
49340 hso_stop_serial_device(serial->parent);
49341- serial->port.count--;
49342+ atomic_dec(&serial->port.count);
49343 } else {
49344 kref_get(&serial->parent->ref);
49345 }
49346@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49347
49348 /* reset the rts and dtr */
49349 /* do the actual close */
49350- serial->port.count--;
49351+ atomic_dec(&serial->port.count);
49352
49353- if (serial->port.count <= 0) {
49354- serial->port.count = 0;
49355+ if (atomic_read(&serial->port.count) <= 0) {
49356+ atomic_set(&serial->port.count, 0);
49357 tty_port_tty_set(&serial->port, NULL);
49358 if (!usb_gone)
49359 hso_stop_serial_device(serial->parent);
49360@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49361
49362 /* the actual setup */
49363 spin_lock_irqsave(&serial->serial_lock, flags);
49364- if (serial->port.count)
49365+ if (atomic_read(&serial->port.count))
49366 _hso_serial_set_termios(tty, old);
49367 else
49368 tty->termios = *old;
49369@@ -1891,7 +1890,7 @@ static void intr_callback(struct urb *urb)
49370 D1("Pending read interrupt on port %d\n", i);
49371 spin_lock(&serial->serial_lock);
49372 if (serial->rx_state == RX_IDLE &&
49373- serial->port.count > 0) {
49374+ atomic_read(&serial->port.count) > 0) {
49375 /* Setup and send a ctrl req read on
49376 * port i */
49377 if (!serial->rx_urb_filled[0]) {
49378@@ -3058,7 +3057,7 @@ static int hso_resume(struct usb_interface *iface)
49379 /* Start all serial ports */
49380 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49381 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49382- if (dev2ser(serial_table[i])->port.count) {
49383+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49384 result =
49385 hso_start_serial_device(serial_table[i], GFP_NOIO);
49386 hso_kick_transmit(dev2ser(serial_table[i]));
49387diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49388index aafa1a1..f59c651 100644
49389--- a/drivers/net/usb/r8152.c
49390+++ b/drivers/net/usb/r8152.c
49391@@ -602,7 +602,7 @@ struct r8152 {
49392 void (*unload)(struct r8152 *);
49393 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49394 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49395- } rtl_ops;
49396+ } __no_const rtl_ops;
49397
49398 int intr_interval;
49399 u32 saved_wolopts;
49400diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49401index a2515887..6d13233 100644
49402--- a/drivers/net/usb/sierra_net.c
49403+++ b/drivers/net/usb/sierra_net.c
49404@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49405 /* atomic counter partially included in MAC address to make sure 2 devices
49406 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49407 */
49408-static atomic_t iface_counter = ATOMIC_INIT(0);
49409+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49410
49411 /*
49412 * SYNC Timer Delay definition used to set the expiry time
49413@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49414 dev->net->netdev_ops = &sierra_net_device_ops;
49415
49416 /* change MAC addr to include, ifacenum, and to be unique */
49417- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49418+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49419 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49420
49421 /* we will have to manufacture ethernet headers, prepare template */
49422diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49423index 63c7810..a694d2b 100644
49424--- a/drivers/net/virtio_net.c
49425+++ b/drivers/net/virtio_net.c
49426@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49427 #define RECEIVE_AVG_WEIGHT 64
49428
49429 /* Minimum alignment for mergeable packet buffers. */
49430-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49431+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49432
49433 #define VIRTNET_DRIVER_VERSION "1.0.0"
49434
49435@@ -1756,9 +1756,9 @@ static int virtnet_probe(struct virtio_device *vdev)
49436 /* Do we support "hardware" checksums? */
49437 if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
49438 /* This opens up the world of extra features. */
49439- dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
49440+ dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG;
49441 if (csum)
49442- dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
49443+ dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG;
49444
49445 if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
49446 dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO
49447diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
49448index 61c0840..92e7f7e 100644
49449--- a/drivers/net/vmxnet3/vmxnet3_drv.c
49450+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
49451@@ -1167,7 +1167,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49452 static const u32 rxprod_reg[2] = {
49453 VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
49454 };
49455- u32 num_rxd = 0;
49456+ u32 num_pkts = 0;
49457 bool skip_page_frags = false;
49458 struct Vmxnet3_RxCompDesc *rcd;
49459 struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
49460@@ -1185,13 +1185,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49461 struct Vmxnet3_RxDesc *rxd;
49462 u32 idx, ring_idx;
49463 struct vmxnet3_cmd_ring *ring = NULL;
49464- if (num_rxd >= quota) {
49465+ if (num_pkts >= quota) {
49466 /* we may stop even before we see the EOP desc of
49467 * the current pkt
49468 */
49469 break;
49470 }
49471- num_rxd++;
49472 BUG_ON(rcd->rqID != rq->qid && rcd->rqID != rq->qid2);
49473 idx = rcd->rxdIdx;
49474 ring_idx = rcd->rqID < adapter->num_rx_queues ? 0 : 1;
49475@@ -1323,6 +1322,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49476 napi_gro_receive(&rq->napi, skb);
49477
49478 ctx->skb = NULL;
49479+ num_pkts++;
49480 }
49481
49482 rcd_done:
49483@@ -1353,7 +1353,7 @@ rcd_done:
49484 &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
49485 }
49486
49487- return num_rxd;
49488+ return num_pkts;
49489 }
49490
49491
49492diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49493index 21a0fbf..055b54f 100644
49494--- a/drivers/net/vxlan.c
49495+++ b/drivers/net/vxlan.c
49496@@ -2878,7 +2878,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49497 return vxlan->net;
49498 }
49499
49500-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49501+static struct rtnl_link_ops vxlan_link_ops = {
49502 .kind = "vxlan",
49503 .maxtype = IFLA_VXLAN_MAX,
49504 .policy = vxlan_policy,
49505@@ -2926,7 +2926,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49506 return NOTIFY_DONE;
49507 }
49508
49509-static struct notifier_block vxlan_notifier_block __read_mostly = {
49510+static struct notifier_block vxlan_notifier_block = {
49511 .notifier_call = vxlan_lowerdev_event,
49512 };
49513
49514diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49515index 5920c99..ff2e4a5 100644
49516--- a/drivers/net/wan/lmc/lmc_media.c
49517+++ b/drivers/net/wan/lmc/lmc_media.c
49518@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49519 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49520
49521 lmc_media_t lmc_ds3_media = {
49522- lmc_ds3_init, /* special media init stuff */
49523- lmc_ds3_default, /* reset to default state */
49524- lmc_ds3_set_status, /* reset status to state provided */
49525- lmc_dummy_set_1, /* set clock source */
49526- lmc_dummy_set2_1, /* set line speed */
49527- lmc_ds3_set_100ft, /* set cable length */
49528- lmc_ds3_set_scram, /* set scrambler */
49529- lmc_ds3_get_link_status, /* get link status */
49530- lmc_dummy_set_1, /* set link status */
49531- lmc_ds3_set_crc_length, /* set CRC length */
49532- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49533- lmc_ds3_watchdog
49534+ .init = lmc_ds3_init, /* special media init stuff */
49535+ .defaults = lmc_ds3_default, /* reset to default state */
49536+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49537+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49538+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49539+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49540+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49541+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49542+ .set_link_status = lmc_dummy_set_1, /* set link status */
49543+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49544+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49545+ .watchdog = lmc_ds3_watchdog
49546 };
49547
49548 lmc_media_t lmc_hssi_media = {
49549- lmc_hssi_init, /* special media init stuff */
49550- lmc_hssi_default, /* reset to default state */
49551- lmc_hssi_set_status, /* reset status to state provided */
49552- lmc_hssi_set_clock, /* set clock source */
49553- lmc_dummy_set2_1, /* set line speed */
49554- lmc_dummy_set_1, /* set cable length */
49555- lmc_dummy_set_1, /* set scrambler */
49556- lmc_hssi_get_link_status, /* get link status */
49557- lmc_hssi_set_link_status, /* set link status */
49558- lmc_hssi_set_crc_length, /* set CRC length */
49559- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49560- lmc_hssi_watchdog
49561+ .init = lmc_hssi_init, /* special media init stuff */
49562+ .defaults = lmc_hssi_default, /* reset to default state */
49563+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49564+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49565+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49566+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49567+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49568+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49569+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49570+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49571+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49572+ .watchdog = lmc_hssi_watchdog
49573 };
49574
49575-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49576- lmc_ssi_default, /* reset to default state */
49577- lmc_ssi_set_status, /* reset status to state provided */
49578- lmc_ssi_set_clock, /* set clock source */
49579- lmc_ssi_set_speed, /* set line speed */
49580- lmc_dummy_set_1, /* set cable length */
49581- lmc_dummy_set_1, /* set scrambler */
49582- lmc_ssi_get_link_status, /* get link status */
49583- lmc_ssi_set_link_status, /* set link status */
49584- lmc_ssi_set_crc_length, /* set CRC length */
49585- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49586- lmc_ssi_watchdog
49587+lmc_media_t lmc_ssi_media = {
49588+ .init = lmc_ssi_init, /* special media init stuff */
49589+ .defaults = lmc_ssi_default, /* reset to default state */
49590+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49591+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49592+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49593+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49594+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49595+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49596+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49597+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49598+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49599+ .watchdog = lmc_ssi_watchdog
49600 };
49601
49602 lmc_media_t lmc_t1_media = {
49603- lmc_t1_init, /* special media init stuff */
49604- lmc_t1_default, /* reset to default state */
49605- lmc_t1_set_status, /* reset status to state provided */
49606- lmc_t1_set_clock, /* set clock source */
49607- lmc_dummy_set2_1, /* set line speed */
49608- lmc_dummy_set_1, /* set cable length */
49609- lmc_dummy_set_1, /* set scrambler */
49610- lmc_t1_get_link_status, /* get link status */
49611- lmc_dummy_set_1, /* set link status */
49612- lmc_t1_set_crc_length, /* set CRC length */
49613- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49614- lmc_t1_watchdog
49615+ .init = lmc_t1_init, /* special media init stuff */
49616+ .defaults = lmc_t1_default, /* reset to default state */
49617+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49618+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49619+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49620+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49621+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49622+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49623+ .set_link_status = lmc_dummy_set_1, /* set link status */
49624+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49625+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49626+ .watchdog = lmc_t1_watchdog
49627 };
49628
49629 static void
49630diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49631index feacc3b..5bac0de 100644
49632--- a/drivers/net/wan/z85230.c
49633+++ b/drivers/net/wan/z85230.c
49634@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49635
49636 struct z8530_irqhandler z8530_sync =
49637 {
49638- z8530_rx,
49639- z8530_tx,
49640- z8530_status
49641+ .rx = z8530_rx,
49642+ .tx = z8530_tx,
49643+ .status = z8530_status
49644 };
49645
49646 EXPORT_SYMBOL(z8530_sync);
49647@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49648 }
49649
49650 static struct z8530_irqhandler z8530_dma_sync = {
49651- z8530_dma_rx,
49652- z8530_dma_tx,
49653- z8530_dma_status
49654+ .rx = z8530_dma_rx,
49655+ .tx = z8530_dma_tx,
49656+ .status = z8530_dma_status
49657 };
49658
49659 static struct z8530_irqhandler z8530_txdma_sync = {
49660- z8530_rx,
49661- z8530_dma_tx,
49662- z8530_dma_status
49663+ .rx = z8530_rx,
49664+ .tx = z8530_dma_tx,
49665+ .status = z8530_dma_status
49666 };
49667
49668 /**
49669@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49670
49671 struct z8530_irqhandler z8530_nop=
49672 {
49673- z8530_rx_clear,
49674- z8530_tx_clear,
49675- z8530_status_clear
49676+ .rx = z8530_rx_clear,
49677+ .tx = z8530_tx_clear,
49678+ .status = z8530_status_clear
49679 };
49680
49681
49682diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49683index 0b60295..b8bfa5b 100644
49684--- a/drivers/net/wimax/i2400m/rx.c
49685+++ b/drivers/net/wimax/i2400m/rx.c
49686@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49687 if (i2400m->rx_roq == NULL)
49688 goto error_roq_alloc;
49689
49690- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49691+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49692 GFP_KERNEL);
49693 if (rd == NULL) {
49694 result = -ENOMEM;
49695diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49696index d0c97c2..108f59b 100644
49697--- a/drivers/net/wireless/airo.c
49698+++ b/drivers/net/wireless/airo.c
49699@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49700 struct airo_info *ai = dev->ml_priv;
49701 int ridcode;
49702 int enabled;
49703- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49704+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49705 unsigned char *iobuf;
49706
49707 /* Only super-user can write RIDs */
49708diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49709index 49219c5..3625441 100644
49710--- a/drivers/net/wireless/at76c50x-usb.c
49711+++ b/drivers/net/wireless/at76c50x-usb.c
49712@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49713 }
49714
49715 /* Convert timeout from the DFU status to jiffies */
49716-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49717+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49718 {
49719 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49720 | (s->poll_timeout[1] << 8)
49721diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49722index 2fd9e18..3f55bdd 100644
49723--- a/drivers/net/wireless/ath/ath10k/htc.c
49724+++ b/drivers/net/wireless/ath/ath10k/htc.c
49725@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49726 /* registered target arrival callback from the HIF layer */
49727 int ath10k_htc_init(struct ath10k *ar)
49728 {
49729- struct ath10k_hif_cb htc_callbacks;
49730+ static struct ath10k_hif_cb htc_callbacks = {
49731+ .rx_completion = ath10k_htc_rx_completion_handler,
49732+ .tx_completion = ath10k_htc_tx_completion_handler,
49733+ };
49734 struct ath10k_htc_ep *ep = NULL;
49735 struct ath10k_htc *htc = &ar->htc;
49736
49737@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49738 ath10k_htc_reset_endpoint_states(htc);
49739
49740 /* setup HIF layer callbacks */
49741- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49742- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49743 htc->ar = ar;
49744
49745 /* Get HIF default pipe for HTC message exchange */
49746diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49747index 527179c..a890150 100644
49748--- a/drivers/net/wireless/ath/ath10k/htc.h
49749+++ b/drivers/net/wireless/ath/ath10k/htc.h
49750@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49751
49752 struct ath10k_htc_ops {
49753 void (*target_send_suspend_complete)(struct ath10k *ar);
49754-};
49755+} __no_const;
49756
49757 struct ath10k_htc_ep_ops {
49758 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49759 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49760 void (*ep_tx_credits)(struct ath10k *);
49761-};
49762+} __no_const;
49763
49764 /* service connection information */
49765 struct ath10k_htc_svc_conn_req {
49766diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49767index f816909..e56cd8b 100644
49768--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49769+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49770@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49771 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49772 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49773
49774- ACCESS_ONCE(ads->ds_link) = i->link;
49775- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49776+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49777+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49778
49779 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49780 ctl6 = SM(i->keytype, AR_EncrType);
49781@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49782
49783 if ((i->is_first || i->is_last) &&
49784 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49785- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49786+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49787 | set11nTries(i->rates, 1)
49788 | set11nTries(i->rates, 2)
49789 | set11nTries(i->rates, 3)
49790 | (i->dur_update ? AR_DurUpdateEna : 0)
49791 | SM(0, AR_BurstDur);
49792
49793- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49794+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49795 | set11nRate(i->rates, 1)
49796 | set11nRate(i->rates, 2)
49797 | set11nRate(i->rates, 3);
49798 } else {
49799- ACCESS_ONCE(ads->ds_ctl2) = 0;
49800- ACCESS_ONCE(ads->ds_ctl3) = 0;
49801+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49802+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49803 }
49804
49805 if (!i->is_first) {
49806- ACCESS_ONCE(ads->ds_ctl0) = 0;
49807- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49808- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49809+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49810+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49811+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49812 return;
49813 }
49814
49815@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49816 break;
49817 }
49818
49819- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49820+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49821 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49822 | SM(i->txpower[0], AR_XmitPower0)
49823 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49824@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49825 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49826 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49827
49828- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49829- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49830+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49831+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49832
49833 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49834 return;
49835
49836- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49837+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49838 | set11nPktDurRTSCTS(i->rates, 1);
49839
49840- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49841+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49842 | set11nPktDurRTSCTS(i->rates, 3);
49843
49844- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49845+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49846 | set11nRateFlags(i->rates, 1)
49847 | set11nRateFlags(i->rates, 2)
49848 | set11nRateFlags(i->rates, 3)
49849 | SM(i->rtscts_rate, AR_RTSCTSRate);
49850
49851- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49852- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49853- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49854+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49855+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49856+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49857 }
49858
49859 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49860diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49861index da84b70..83e4978 100644
49862--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49863+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49864@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49865 (i->qcu << AR_TxQcuNum_S) | desc_len;
49866
49867 checksum += val;
49868- ACCESS_ONCE(ads->info) = val;
49869+ ACCESS_ONCE_RW(ads->info) = val;
49870
49871 checksum += i->link;
49872- ACCESS_ONCE(ads->link) = i->link;
49873+ ACCESS_ONCE_RW(ads->link) = i->link;
49874
49875 checksum += i->buf_addr[0];
49876- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49877+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49878 checksum += i->buf_addr[1];
49879- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49880+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49881 checksum += i->buf_addr[2];
49882- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49883+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49884 checksum += i->buf_addr[3];
49885- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49886+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49887
49888 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49889- ACCESS_ONCE(ads->ctl3) = val;
49890+ ACCESS_ONCE_RW(ads->ctl3) = val;
49891 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49892- ACCESS_ONCE(ads->ctl5) = val;
49893+ ACCESS_ONCE_RW(ads->ctl5) = val;
49894 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49895- ACCESS_ONCE(ads->ctl7) = val;
49896+ ACCESS_ONCE_RW(ads->ctl7) = val;
49897 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49898- ACCESS_ONCE(ads->ctl9) = val;
49899+ ACCESS_ONCE_RW(ads->ctl9) = val;
49900
49901 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49902- ACCESS_ONCE(ads->ctl10) = checksum;
49903+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49904
49905 if (i->is_first || i->is_last) {
49906- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49907+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49908 | set11nTries(i->rates, 1)
49909 | set11nTries(i->rates, 2)
49910 | set11nTries(i->rates, 3)
49911 | (i->dur_update ? AR_DurUpdateEna : 0)
49912 | SM(0, AR_BurstDur);
49913
49914- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49915+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49916 | set11nRate(i->rates, 1)
49917 | set11nRate(i->rates, 2)
49918 | set11nRate(i->rates, 3);
49919 } else {
49920- ACCESS_ONCE(ads->ctl13) = 0;
49921- ACCESS_ONCE(ads->ctl14) = 0;
49922+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49923+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49924 }
49925
49926 ads->ctl20 = 0;
49927@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49928
49929 ctl17 = SM(i->keytype, AR_EncrType);
49930 if (!i->is_first) {
49931- ACCESS_ONCE(ads->ctl11) = 0;
49932- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49933- ACCESS_ONCE(ads->ctl15) = 0;
49934- ACCESS_ONCE(ads->ctl16) = 0;
49935- ACCESS_ONCE(ads->ctl17) = ctl17;
49936- ACCESS_ONCE(ads->ctl18) = 0;
49937- ACCESS_ONCE(ads->ctl19) = 0;
49938+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49939+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49940+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49941+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49942+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49943+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49944+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49945 return;
49946 }
49947
49948- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49949+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49950 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49951 | SM(i->txpower[0], AR_XmitPower0)
49952 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49953@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49954 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49955 ctl12 |= SM(val, AR_PAPRDChainMask);
49956
49957- ACCESS_ONCE(ads->ctl12) = ctl12;
49958- ACCESS_ONCE(ads->ctl17) = ctl17;
49959+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49960+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49961
49962- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49963+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49964 | set11nPktDurRTSCTS(i->rates, 1);
49965
49966- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49967+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49968 | set11nPktDurRTSCTS(i->rates, 3);
49969
49970- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49971+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49972 | set11nRateFlags(i->rates, 1)
49973 | set11nRateFlags(i->rates, 2)
49974 | set11nRateFlags(i->rates, 3)
49975 | SM(i->rtscts_rate, AR_RTSCTSRate);
49976
49977- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49978+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49979
49980- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49981- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49982- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49983+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49984+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49985+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49986 }
49987
49988 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49989diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49990index c1d2d03..08352db 100644
49991--- a/drivers/net/wireless/ath/ath9k/hw.h
49992+++ b/drivers/net/wireless/ath/ath9k/hw.h
49993@@ -671,7 +671,7 @@ struct ath_hw_private_ops {
49994 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49995 bool (*is_aic_enabled)(struct ath_hw *ah);
49996 #endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
49997-};
49998+} __no_const;
49999
50000 /**
50001 * struct ath_spec_scan - parameters for Atheros spectral scan
50002@@ -747,7 +747,7 @@ struct ath_hw_ops {
50003 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50004 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50005 #endif
50006-};
50007+} __no_const;
50008
50009 struct ath_nf_limits {
50010 s16 max;
50011diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50012index d5f2fbf..0740c8b 100644
50013--- a/drivers/net/wireless/ath/ath9k/main.c
50014+++ b/drivers/net/wireless/ath/ath9k/main.c
50015@@ -2575,16 +2575,18 @@ void ath9k_fill_chanctx_ops(void)
50016 if (!ath9k_is_chanctx_enabled())
50017 return;
50018
50019- ath9k_ops.hw_scan = ath9k_hw_scan;
50020- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50021- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50022- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50023- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50024- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50025- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50026- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50027- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50028- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50029+ pax_open_kernel();
50030+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50031+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50032+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50033+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50034+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50035+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50036+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50037+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50038+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50039+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50040+ pax_close_kernel();
50041 }
50042
50043 #endif
50044diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50045index 058a9f2..d5cb1ba 100644
50046--- a/drivers/net/wireless/b43/phy_lp.c
50047+++ b/drivers/net/wireless/b43/phy_lp.c
50048@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50049 {
50050 struct ssb_bus *bus = dev->dev->sdev->bus;
50051
50052- static const struct b206x_channel *chandata = NULL;
50053+ const struct b206x_channel *chandata = NULL;
50054 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50055 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50056 u16 old_comm15, scale;
50057diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50058index e566580..2c218ca 100644
50059--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50060+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50061@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50062 */
50063 if (il3945_mod_params.disable_hw_scan) {
50064 D_INFO("Disabling hw_scan\n");
50065- il3945_mac_ops.hw_scan = NULL;
50066+ pax_open_kernel();
50067+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50068+ pax_close_kernel();
50069 }
50070
50071 D_INFO("*** LOAD DRIVER ***\n");
50072diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50073index 0ffb6ff..c0b7f0e 100644
50074--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50075+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50076@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50077 {
50078 struct iwl_priv *priv = file->private_data;
50079 char buf[64];
50080- int buf_size;
50081+ size_t buf_size;
50082 u32 offset, len;
50083
50084 memset(buf, 0, sizeof(buf));
50085@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50086 struct iwl_priv *priv = file->private_data;
50087
50088 char buf[8];
50089- int buf_size;
50090+ size_t buf_size;
50091 u32 reset_flag;
50092
50093 memset(buf, 0, sizeof(buf));
50094@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50095 {
50096 struct iwl_priv *priv = file->private_data;
50097 char buf[8];
50098- int buf_size;
50099+ size_t buf_size;
50100 int ht40;
50101
50102 memset(buf, 0, sizeof(buf));
50103@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50104 {
50105 struct iwl_priv *priv = file->private_data;
50106 char buf[8];
50107- int buf_size;
50108+ size_t buf_size;
50109 int value;
50110
50111 memset(buf, 0, sizeof(buf));
50112@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50113 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50114 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50115
50116-static const char *fmt_value = " %-30s %10u\n";
50117-static const char *fmt_hex = " %-30s 0x%02X\n";
50118-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50119-static const char *fmt_header =
50120+static const char fmt_value[] = " %-30s %10u\n";
50121+static const char fmt_hex[] = " %-30s 0x%02X\n";
50122+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50123+static const char fmt_header[] =
50124 "%-32s current cumulative delta max\n";
50125
50126 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50127@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50128 {
50129 struct iwl_priv *priv = file->private_data;
50130 char buf[8];
50131- int buf_size;
50132+ size_t buf_size;
50133 int clear;
50134
50135 memset(buf, 0, sizeof(buf));
50136@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50137 {
50138 struct iwl_priv *priv = file->private_data;
50139 char buf[8];
50140- int buf_size;
50141+ size_t buf_size;
50142 int trace;
50143
50144 memset(buf, 0, sizeof(buf));
50145@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50146 {
50147 struct iwl_priv *priv = file->private_data;
50148 char buf[8];
50149- int buf_size;
50150+ size_t buf_size;
50151 int missed;
50152
50153 memset(buf, 0, sizeof(buf));
50154@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50155
50156 struct iwl_priv *priv = file->private_data;
50157 char buf[8];
50158- int buf_size;
50159+ size_t buf_size;
50160 int plcp;
50161
50162 memset(buf, 0, sizeof(buf));
50163@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50164
50165 struct iwl_priv *priv = file->private_data;
50166 char buf[8];
50167- int buf_size;
50168+ size_t buf_size;
50169 int flush;
50170
50171 memset(buf, 0, sizeof(buf));
50172@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50173
50174 struct iwl_priv *priv = file->private_data;
50175 char buf[8];
50176- int buf_size;
50177+ size_t buf_size;
50178 int rts;
50179
50180 if (!priv->cfg->ht_params)
50181@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50182 {
50183 struct iwl_priv *priv = file->private_data;
50184 char buf[8];
50185- int buf_size;
50186+ size_t buf_size;
50187
50188 memset(buf, 0, sizeof(buf));
50189 buf_size = min(count, sizeof(buf) - 1);
50190@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50191 struct iwl_priv *priv = file->private_data;
50192 u32 event_log_flag;
50193 char buf[8];
50194- int buf_size;
50195+ size_t buf_size;
50196
50197 /* check that the interface is up */
50198 if (!iwl_is_ready(priv))
50199@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50200 struct iwl_priv *priv = file->private_data;
50201 char buf[8];
50202 u32 calib_disabled;
50203- int buf_size;
50204+ size_t buf_size;
50205
50206 memset(buf, 0, sizeof(buf));
50207 buf_size = min(count, sizeof(buf) - 1);
50208diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50209index 699a480..1801fc3 100644
50210--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50211+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50212@@ -1935,7 +1935,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50213 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50214
50215 char buf[8];
50216- int buf_size;
50217+ size_t buf_size;
50218 u32 reset_flag;
50219
50220 memset(buf, 0, sizeof(buf));
50221@@ -1956,7 +1956,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50222 {
50223 struct iwl_trans *trans = file->private_data;
50224 char buf[8];
50225- int buf_size;
50226+ size_t buf_size;
50227 int csr;
50228
50229 memset(buf, 0, sizeof(buf));
50230diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50231index d5c0a1a..d056b20 100644
50232--- a/drivers/net/wireless/mac80211_hwsim.c
50233+++ b/drivers/net/wireless/mac80211_hwsim.c
50234@@ -3149,20 +3149,20 @@ static int __init init_mac80211_hwsim(void)
50235 if (channels < 1)
50236 return -EINVAL;
50237
50238- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50239- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50240- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50241- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50242- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50243- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50244- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50245- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50246- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50247- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50248- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50249- mac80211_hwsim_assign_vif_chanctx;
50250- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50251- mac80211_hwsim_unassign_vif_chanctx;
50252+ pax_open_kernel();
50253+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50254+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50255+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50256+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50257+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50258+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50259+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50260+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50261+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50262+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50263+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50264+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50265+ pax_close_kernel();
50266
50267 spin_lock_init(&hwsim_radio_lock);
50268 INIT_LIST_HEAD(&hwsim_radios);
50269diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50270index d72ff8e..c209a45 100644
50271--- a/drivers/net/wireless/rndis_wlan.c
50272+++ b/drivers/net/wireless/rndis_wlan.c
50273@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50274
50275 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50276
50277- if (rts_threshold < 0 || rts_threshold > 2347)
50278+ if (rts_threshold > 2347)
50279 rts_threshold = 2347;
50280
50281 tmp = cpu_to_le32(rts_threshold);
50282diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50283index 9bb398b..b0cc047 100644
50284--- a/drivers/net/wireless/rt2x00/rt2x00.h
50285+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50286@@ -375,7 +375,7 @@ struct rt2x00_intf {
50287 * for hardware which doesn't support hardware
50288 * sequence counting.
50289 */
50290- atomic_t seqno;
50291+ atomic_unchecked_t seqno;
50292 };
50293
50294 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50295diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50296index 68b620b..92ecd9e 100644
50297--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50298+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50299@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50300 * sequence counter given by mac80211.
50301 */
50302 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50303- seqno = atomic_add_return(0x10, &intf->seqno);
50304+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50305 else
50306- seqno = atomic_read(&intf->seqno);
50307+ seqno = atomic_read_unchecked(&intf->seqno);
50308
50309 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50310 hdr->seq_ctrl |= cpu_to_le16(seqno);
50311diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50312index b661f896..ddf7d2b 100644
50313--- a/drivers/net/wireless/ti/wl1251/sdio.c
50314+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50315@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50316
50317 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50318
50319- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50320- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50321+ pax_open_kernel();
50322+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50323+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50324+ pax_close_kernel();
50325
50326 wl1251_info("using dedicated interrupt line");
50327 } else {
50328- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50329- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50330+ pax_open_kernel();
50331+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50332+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50333+ pax_close_kernel();
50334
50335 wl1251_info("using SDIO interrupt");
50336 }
50337diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50338index af0fe2e..d04986b 100644
50339--- a/drivers/net/wireless/ti/wl12xx/main.c
50340+++ b/drivers/net/wireless/ti/wl12xx/main.c
50341@@ -655,7 +655,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50342 sizeof(wl->conf.mem));
50343
50344 /* read data preparation is only needed by wl127x */
50345- wl->ops->prepare_read = wl127x_prepare_read;
50346+ pax_open_kernel();
50347+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50348+ pax_close_kernel();
50349
50350 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50351 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50352@@ -680,7 +682,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50353 sizeof(wl->conf.mem));
50354
50355 /* read data preparation is only needed by wl127x */
50356- wl->ops->prepare_read = wl127x_prepare_read;
50357+ pax_open_kernel();
50358+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50359+ pax_close_kernel();
50360
50361 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50362 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50363diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50364index 717c4f5..a813aeb 100644
50365--- a/drivers/net/wireless/ti/wl18xx/main.c
50366+++ b/drivers/net/wireless/ti/wl18xx/main.c
50367@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50368 }
50369
50370 if (!checksum_param) {
50371- wl18xx_ops.set_rx_csum = NULL;
50372- wl18xx_ops.init_vif = NULL;
50373+ pax_open_kernel();
50374+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50375+ *(void **)&wl18xx_ops.init_vif = NULL;
50376+ pax_close_kernel();
50377 }
50378
50379 /* Enable 11a Band only if we have 5G antennas */
50380diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50381index a912dc0..a8225ba 100644
50382--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50383+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50384@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50385 {
50386 struct zd_usb *usb = urb->context;
50387 struct zd_usb_interrupt *intr = &usb->intr;
50388- int len;
50389+ unsigned int len;
50390 u16 int_num;
50391
50392 ZD_ASSERT(in_interrupt());
50393diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
50394index 0d25943..0866c5d 100644
50395--- a/drivers/net/xen-netback/netback.c
50396+++ b/drivers/net/xen-netback/netback.c
50397@@ -1571,13 +1571,13 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
50398 smp_rmb();
50399
50400 while (dc != dp) {
50401- BUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS);
50402+ BUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS);
50403 pending_idx =
50404 queue->dealloc_ring[pending_index(dc++)];
50405
50406- pending_idx_release[gop-queue->tx_unmap_ops] =
50407+ pending_idx_release[gop - queue->tx_unmap_ops] =
50408 pending_idx;
50409- queue->pages_to_unmap[gop-queue->tx_unmap_ops] =
50410+ queue->pages_to_unmap[gop - queue->tx_unmap_ops] =
50411 queue->mmap_pages[pending_idx];
50412 gnttab_set_unmap_op(gop,
50413 idx_to_kaddr(queue, pending_idx),
50414diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50415index ce2e2cf..f81e500 100644
50416--- a/drivers/nfc/nfcwilink.c
50417+++ b/drivers/nfc/nfcwilink.c
50418@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50419
50420 static int nfcwilink_probe(struct platform_device *pdev)
50421 {
50422- static struct nfcwilink *drv;
50423+ struct nfcwilink *drv;
50424 int rc;
50425 __u32 protocols;
50426
50427diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50428index d251f72..0512865 100644
50429--- a/drivers/nfc/st21nfca/st21nfca.c
50430+++ b/drivers/nfc/st21nfca/st21nfca.c
50431@@ -148,14 +148,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50432 ST21NFCA_DEVICE_MGNT_GATE,
50433 ST21NFCA_DEVICE_MGNT_PIPE);
50434 if (r < 0)
50435- goto free_info;
50436+ return r;
50437
50438 /* Get pipe list */
50439 r = nfc_hci_send_cmd(hdev, ST21NFCA_DEVICE_MGNT_GATE,
50440 ST21NFCA_DM_GETINFO, pipe_list, sizeof(pipe_list),
50441 &skb_pipe_list);
50442 if (r < 0)
50443- goto free_info;
50444+ return r;
50445
50446 /* Complete the existing gate_pipe table */
50447 for (i = 0; i < skb_pipe_list->len; i++) {
50448@@ -181,6 +181,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50449 info->src_host_id != ST21NFCA_ESE_HOST_ID) {
50450 pr_err("Unexpected apdu_reader pipe on host %x\n",
50451 info->src_host_id);
50452+ kfree_skb(skb_pipe_info);
50453 continue;
50454 }
50455
50456@@ -200,6 +201,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50457 hdev->pipes[st21nfca_gates[j].pipe].dest_host =
50458 info->src_host_id;
50459 }
50460+ kfree_skb(skb_pipe_info);
50461 }
50462
50463 /*
50464@@ -214,13 +216,12 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50465 st21nfca_gates[i].gate,
50466 st21nfca_gates[i].pipe);
50467 if (r < 0)
50468- goto free_info;
50469+ goto free_list;
50470 }
50471 }
50472
50473 memcpy(hdev->init_data.gates, st21nfca_gates, sizeof(st21nfca_gates));
50474-free_info:
50475- kfree_skb(skb_pipe_info);
50476+free_list:
50477 kfree_skb(skb_pipe_list);
50478 return r;
50479 }
50480diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50481index cde35c5d01..2dbfdbbf 100644
50482--- a/drivers/of/fdt.c
50483+++ b/drivers/of/fdt.c
50484@@ -1136,7 +1136,9 @@ static int __init of_fdt_raw_init(void)
50485 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50486 return 0;
50487 }
50488- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50489+ pax_open_kernel();
50490+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50491+ pax_close_kernel();
50492 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50493 }
50494 late_initcall(of_fdt_raw_init);
50495diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50496index 82f7000..d6d0447 100644
50497--- a/drivers/oprofile/buffer_sync.c
50498+++ b/drivers/oprofile/buffer_sync.c
50499@@ -345,7 +345,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50500 if (cookie == NO_COOKIE)
50501 offset = pc;
50502 if (cookie == INVALID_COOKIE) {
50503- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50504+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50505 offset = pc;
50506 }
50507 if (cookie != last_cookie) {
50508@@ -389,14 +389,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50509 /* add userspace sample */
50510
50511 if (!mm) {
50512- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50513+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50514 return 0;
50515 }
50516
50517 cookie = lookup_dcookie(mm, s->eip, &offset);
50518
50519 if (cookie == INVALID_COOKIE) {
50520- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50521+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50522 return 0;
50523 }
50524
50525@@ -554,7 +554,7 @@ void sync_buffer(int cpu)
50526 /* ignore backtraces if failed to add a sample */
50527 if (state == sb_bt_start) {
50528 state = sb_bt_ignore;
50529- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50530+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50531 }
50532 }
50533 release_mm(mm);
50534diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50535index c0cc4e7..44d4e54 100644
50536--- a/drivers/oprofile/event_buffer.c
50537+++ b/drivers/oprofile/event_buffer.c
50538@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50539 }
50540
50541 if (buffer_pos == buffer_size) {
50542- atomic_inc(&oprofile_stats.event_lost_overflow);
50543+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50544 return;
50545 }
50546
50547diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50548index ed2c3ec..deda85a 100644
50549--- a/drivers/oprofile/oprof.c
50550+++ b/drivers/oprofile/oprof.c
50551@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50552 if (oprofile_ops.switch_events())
50553 return;
50554
50555- atomic_inc(&oprofile_stats.multiplex_counter);
50556+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50557 start_switch_worker();
50558 }
50559
50560diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50561index ee2cfce..7f8f699 100644
50562--- a/drivers/oprofile/oprofile_files.c
50563+++ b/drivers/oprofile/oprofile_files.c
50564@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50565
50566 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50567
50568-static ssize_t timeout_read(struct file *file, char __user *buf,
50569+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50570 size_t count, loff_t *offset)
50571 {
50572 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50573diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50574index 59659ce..6c860a0 100644
50575--- a/drivers/oprofile/oprofile_stats.c
50576+++ b/drivers/oprofile/oprofile_stats.c
50577@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50578 cpu_buf->sample_invalid_eip = 0;
50579 }
50580
50581- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50582- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50583- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50584- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50585- atomic_set(&oprofile_stats.multiplex_counter, 0);
50586+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50587+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50588+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50589+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50590+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50591 }
50592
50593
50594diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50595index 1fc622b..8c48fc3 100644
50596--- a/drivers/oprofile/oprofile_stats.h
50597+++ b/drivers/oprofile/oprofile_stats.h
50598@@ -13,11 +13,11 @@
50599 #include <linux/atomic.h>
50600
50601 struct oprofile_stat_struct {
50602- atomic_t sample_lost_no_mm;
50603- atomic_t sample_lost_no_mapping;
50604- atomic_t bt_lost_no_mapping;
50605- atomic_t event_lost_overflow;
50606- atomic_t multiplex_counter;
50607+ atomic_unchecked_t sample_lost_no_mm;
50608+ atomic_unchecked_t sample_lost_no_mapping;
50609+ atomic_unchecked_t bt_lost_no_mapping;
50610+ atomic_unchecked_t event_lost_overflow;
50611+ atomic_unchecked_t multiplex_counter;
50612 };
50613
50614 extern struct oprofile_stat_struct oprofile_stats;
50615diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50616index dd92c5e..dfc04b5 100644
50617--- a/drivers/oprofile/oprofilefs.c
50618+++ b/drivers/oprofile/oprofilefs.c
50619@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50620
50621 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50622 {
50623- atomic_t *val = file->private_data;
50624- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50625+ atomic_unchecked_t *val = file->private_data;
50626+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50627 }
50628
50629
50630@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50631
50632
50633 int oprofilefs_create_ro_atomic(struct dentry *root,
50634- char const *name, atomic_t *val)
50635+ char const *name, atomic_unchecked_t *val)
50636 {
50637 return __oprofilefs_create_file(root, name,
50638 &atomic_ro_fops, 0444, val);
50639diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50640index bdef916..88c7dee 100644
50641--- a/drivers/oprofile/timer_int.c
50642+++ b/drivers/oprofile/timer_int.c
50643@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50644 return NOTIFY_OK;
50645 }
50646
50647-static struct notifier_block __refdata oprofile_cpu_notifier = {
50648+static struct notifier_block oprofile_cpu_notifier = {
50649 .notifier_call = oprofile_cpu_notify,
50650 };
50651
50652diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50653index 3b47080..6cd05dd 100644
50654--- a/drivers/parport/procfs.c
50655+++ b/drivers/parport/procfs.c
50656@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50657
50658 *ppos += len;
50659
50660- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50661+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50662 }
50663
50664 #ifdef CONFIG_PARPORT_1284
50665@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50666
50667 *ppos += len;
50668
50669- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50670+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50671 }
50672 #endif /* IEEE1284.3 support. */
50673
50674diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50675index ba46e58..90cfc24 100644
50676--- a/drivers/pci/host/pci-host-generic.c
50677+++ b/drivers/pci/host/pci-host-generic.c
50678@@ -26,9 +26,9 @@
50679 #include <linux/platform_device.h>
50680
50681 struct gen_pci_cfg_bus_ops {
50682+ struct pci_ops ops;
50683 u32 bus_shift;
50684- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50685-};
50686+} __do_const;
50687
50688 struct gen_pci_cfg_windows {
50689 struct resource res;
50690@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50691 }
50692
50693 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50694+ .ops = {
50695+ .map_bus = gen_pci_map_cfg_bus_cam,
50696+ .read = pci_generic_config_read,
50697+ .write = pci_generic_config_write,
50698+ },
50699 .bus_shift = 16,
50700- .map_bus = gen_pci_map_cfg_bus_cam,
50701 };
50702
50703 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50704@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50705 }
50706
50707 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50708+ .ops = {
50709+ .map_bus = gen_pci_map_cfg_bus_ecam,
50710+ .read = pci_generic_config_read,
50711+ .write = pci_generic_config_write,
50712+ },
50713 .bus_shift = 20,
50714- .map_bus = gen_pci_map_cfg_bus_ecam,
50715-};
50716-
50717-static struct pci_ops gen_pci_ops = {
50718- .read = pci_generic_config_read,
50719- .write = pci_generic_config_write,
50720 };
50721
50722 static const struct of_device_id gen_pci_of_match[] = {
50723@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50724 .private_data = (void **)&pci,
50725 .setup = gen_pci_setup,
50726 .map_irq = of_irq_parse_and_map_pci,
50727- .ops = &gen_pci_ops,
50728 };
50729
50730 if (!pci)
50731@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50732
50733 of_id = of_match_node(gen_pci_of_match, np);
50734 pci->cfg.ops = of_id->data;
50735- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50736+ hw.ops = &pci->cfg.ops->ops;
50737 pci->host.dev.parent = dev;
50738 INIT_LIST_HEAD(&pci->host.windows);
50739 INIT_LIST_HEAD(&pci->resources);
50740diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50741index 6ca2399..68d866b 100644
50742--- a/drivers/pci/hotplug/acpiphp_ibm.c
50743+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50744@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50745 goto init_cleanup;
50746 }
50747
50748- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50749+ pax_open_kernel();
50750+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50751+ pax_close_kernel();
50752 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50753
50754 return retval;
50755diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50756index 66b7bbe..26bee78 100644
50757--- a/drivers/pci/hotplug/cpcihp_generic.c
50758+++ b/drivers/pci/hotplug/cpcihp_generic.c
50759@@ -73,7 +73,6 @@ static u16 port;
50760 static unsigned int enum_bit;
50761 static u8 enum_mask;
50762
50763-static struct cpci_hp_controller_ops generic_hpc_ops;
50764 static struct cpci_hp_controller generic_hpc;
50765
50766 static int __init validate_parameters(void)
50767@@ -139,6 +138,10 @@ static int query_enum(void)
50768 return ((value & enum_mask) == enum_mask);
50769 }
50770
50771+static struct cpci_hp_controller_ops generic_hpc_ops = {
50772+ .query_enum = query_enum,
50773+};
50774+
50775 static int __init cpcihp_generic_init(void)
50776 {
50777 int status;
50778@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50779 pci_dev_put(dev);
50780
50781 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50782- generic_hpc_ops.query_enum = query_enum;
50783 generic_hpc.ops = &generic_hpc_ops;
50784
50785 status = cpci_hp_register_controller(&generic_hpc);
50786diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50787index 7ecf34e..effed62 100644
50788--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50789+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50790@@ -59,7 +59,6 @@
50791 /* local variables */
50792 static bool debug;
50793 static bool poll;
50794-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50795 static struct cpci_hp_controller zt5550_hpc;
50796
50797 /* Primary cPCI bus bridge device */
50798@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50799 return 0;
50800 }
50801
50802+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50803+ .query_enum = zt5550_hc_query_enum,
50804+};
50805+
50806 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50807 {
50808 int status;
50809@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50810 dbg("returned from zt5550_hc_config");
50811
50812 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50813- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50814 zt5550_hpc.ops = &zt5550_hpc_ops;
50815 if (!poll) {
50816 zt5550_hpc.irq = hc_dev->irq;
50817 zt5550_hpc.irq_flags = IRQF_SHARED;
50818 zt5550_hpc.dev_id = hc_dev;
50819
50820- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50821- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50822- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50823+ pax_open_kernel();
50824+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50825+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50826+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50827+ pax_open_kernel();
50828 } else {
50829 info("using ENUM# polling mode");
50830 }
50831diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50832index 1e08ff8c..3cd145f 100644
50833--- a/drivers/pci/hotplug/cpqphp_nvram.c
50834+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50835@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50836
50837 void compaq_nvram_init (void __iomem *rom_start)
50838 {
50839+#ifndef CONFIG_PAX_KERNEXEC
50840 if (rom_start)
50841 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50842+#endif
50843
50844 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50845
50846diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50847index 56d8486..f26113f 100644
50848--- a/drivers/pci/hotplug/pci_hotplug_core.c
50849+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50850@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50851 return -EINVAL;
50852 }
50853
50854- slot->ops->owner = owner;
50855- slot->ops->mod_name = mod_name;
50856+ pax_open_kernel();
50857+ *(struct module **)&slot->ops->owner = owner;
50858+ *(const char **)&slot->ops->mod_name = mod_name;
50859+ pax_close_kernel();
50860
50861 mutex_lock(&pci_hp_mutex);
50862 /*
50863diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50864index 07aa722..84514b4 100644
50865--- a/drivers/pci/hotplug/pciehp_core.c
50866+++ b/drivers/pci/hotplug/pciehp_core.c
50867@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50868 struct slot *slot = ctrl->slot;
50869 struct hotplug_slot *hotplug = NULL;
50870 struct hotplug_slot_info *info = NULL;
50871- struct hotplug_slot_ops *ops = NULL;
50872+ hotplug_slot_ops_no_const *ops = NULL;
50873 char name[SLOT_NAME_SIZE];
50874 int retval = -ENOMEM;
50875
50876diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
50877index c3e7dfc..cbd9625 100644
50878--- a/drivers/pci/msi.c
50879+++ b/drivers/pci/msi.c
50880@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
50881 {
50882 struct attribute **msi_attrs;
50883 struct attribute *msi_attr;
50884- struct device_attribute *msi_dev_attr;
50885- struct attribute_group *msi_irq_group;
50886+ device_attribute_no_const *msi_dev_attr;
50887+ attribute_group_no_const *msi_irq_group;
50888 const struct attribute_group **msi_irq_groups;
50889 struct msi_desc *entry;
50890 int ret = -ENOMEM;
50891@@ -573,7 +573,7 @@ error_attrs:
50892 count = 0;
50893 msi_attr = msi_attrs[count];
50894 while (msi_attr) {
50895- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
50896+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
50897 kfree(msi_attr->name);
50898 kfree(msi_dev_attr);
50899 ++count;
50900diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
50901index 312f23a..d21181c 100644
50902--- a/drivers/pci/pci-sysfs.c
50903+++ b/drivers/pci/pci-sysfs.c
50904@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
50905 {
50906 /* allocate attribute structure, piggyback attribute name */
50907 int name_len = write_combine ? 13 : 10;
50908- struct bin_attribute *res_attr;
50909+ bin_attribute_no_const *res_attr;
50910 int retval;
50911
50912 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
50913@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
50914 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
50915 {
50916 int retval;
50917- struct bin_attribute *attr;
50918+ bin_attribute_no_const *attr;
50919
50920 /* If the device has VPD, try to expose it in sysfs. */
50921 if (dev->vpd) {
50922@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
50923 {
50924 int retval;
50925 int rom_size = 0;
50926- struct bin_attribute *attr;
50927+ bin_attribute_no_const *attr;
50928
50929 if (!sysfs_initialized)
50930 return -EACCES;
50931diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
50932index 9bd762c2..6fb9504 100644
50933--- a/drivers/pci/pci.h
50934+++ b/drivers/pci/pci.h
50935@@ -99,7 +99,7 @@ struct pci_vpd_ops {
50936 struct pci_vpd {
50937 unsigned int len;
50938 const struct pci_vpd_ops *ops;
50939- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
50940+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
50941 };
50942
50943 int pci_vpd_pci22_init(struct pci_dev *dev);
50944diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
50945index 7d4fcdc..2f6d8f8 100644
50946--- a/drivers/pci/pcie/aspm.c
50947+++ b/drivers/pci/pcie/aspm.c
50948@@ -27,9 +27,9 @@
50949 #define MODULE_PARAM_PREFIX "pcie_aspm."
50950
50951 /* Note: those are not register definitions */
50952-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
50953-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
50954-#define ASPM_STATE_L1 (4) /* L1 state */
50955+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
50956+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
50957+#define ASPM_STATE_L1 (4U) /* L1 state */
50958 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
50959 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
50960
50961diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
50962index be35da2..ec16cdb 100644
50963--- a/drivers/pci/pcie/portdrv_pci.c
50964+++ b/drivers/pci/pcie/portdrv_pci.c
50965@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
50966 return 0;
50967 }
50968
50969-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
50970+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
50971 /*
50972 * Boxes that should not use MSI for PCIe PME signaling.
50973 */
50974diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
50975index c911857..56f3f9d 100644
50976--- a/drivers/pci/probe.c
50977+++ b/drivers/pci/probe.c
50978@@ -176,7 +176,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
50979 u16 orig_cmd;
50980 struct pci_bus_region region, inverted_region;
50981
50982- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
50983+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
50984
50985 /* No printks while decoding is disabled! */
50986 if (!dev->mmio_always_on) {
50987diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
50988index 3f155e7..0f4b1f0 100644
50989--- a/drivers/pci/proc.c
50990+++ b/drivers/pci/proc.c
50991@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
50992 static int __init pci_proc_init(void)
50993 {
50994 struct pci_dev *dev = NULL;
50995+
50996+#ifdef CONFIG_GRKERNSEC_PROC_ADD
50997+#ifdef CONFIG_GRKERNSEC_PROC_USER
50998+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
50999+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51000+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51001+#endif
51002+#else
51003 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51004+#endif
51005 proc_create("devices", 0, proc_bus_pci_dir,
51006 &proc_bus_pci_dev_operations);
51007 proc_initialized = 1;
51008diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51009index 3474920..acc9581 100644
51010--- a/drivers/platform/chrome/chromeos_pstore.c
51011+++ b/drivers/platform/chrome/chromeos_pstore.c
51012@@ -13,7 +13,7 @@
51013 #include <linux/platform_device.h>
51014 #include <linux/pstore_ram.h>
51015
51016-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51017+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51018 {
51019 /*
51020 * Today all Chromebooks/boxes ship with Google_* as version and
51021diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51022index 1e1e594..8fe59c5 100644
51023--- a/drivers/platform/x86/alienware-wmi.c
51024+++ b/drivers/platform/x86/alienware-wmi.c
51025@@ -150,7 +150,7 @@ struct wmax_led_args {
51026 } __packed;
51027
51028 static struct platform_device *platform_device;
51029-static struct device_attribute *zone_dev_attrs;
51030+static device_attribute_no_const *zone_dev_attrs;
51031 static struct attribute **zone_attrs;
51032 static struct platform_zone *zone_data;
51033
51034@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51035 }
51036 };
51037
51038-static struct attribute_group zone_attribute_group = {
51039+static attribute_group_no_const zone_attribute_group = {
51040 .name = "rgb_zones",
51041 };
51042
51043diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51044index 7543a56..367ca8ed 100644
51045--- a/drivers/platform/x86/asus-wmi.c
51046+++ b/drivers/platform/x86/asus-wmi.c
51047@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51048 int err;
51049 u32 retval = -1;
51050
51051+#ifdef CONFIG_GRKERNSEC_KMEM
51052+ return -EPERM;
51053+#endif
51054+
51055 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51056
51057 if (err < 0)
51058@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51059 int err;
51060 u32 retval = -1;
51061
51062+#ifdef CONFIG_GRKERNSEC_KMEM
51063+ return -EPERM;
51064+#endif
51065+
51066 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51067 &retval);
51068
51069@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51070 union acpi_object *obj;
51071 acpi_status status;
51072
51073+#ifdef CONFIG_GRKERNSEC_KMEM
51074+ return -EPERM;
51075+#endif
51076+
51077 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51078 1, asus->debug.method_id,
51079 &input, &output);
51080diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51081index b4e9447..9dc6ec34 100644
51082--- a/drivers/platform/x86/compal-laptop.c
51083+++ b/drivers/platform/x86/compal-laptop.c
51084@@ -765,7 +765,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51085 return 1;
51086 }
51087
51088-static struct dmi_system_id __initdata compal_dmi_table[] = {
51089+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51090 {
51091 .ident = "FL90/IFL90",
51092 .matches = {
51093diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51094index 458e6c9..089aee7 100644
51095--- a/drivers/platform/x86/hdaps.c
51096+++ b/drivers/platform/x86/hdaps.c
51097@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51098 "ThinkPad T42p", so the order of the entries matters.
51099 If your ThinkPad is not recognized, please update to latest
51100 BIOS. This is especially the case for some R52 ThinkPads. */
51101-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51102+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51103 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51104 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51105 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51106diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51107index 97c2be1..2ee50ce 100644
51108--- a/drivers/platform/x86/ibm_rtl.c
51109+++ b/drivers/platform/x86/ibm_rtl.c
51110@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51111 }
51112
51113
51114-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51115+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51116 { \
51117 .matches = { \
51118 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51119diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51120index 8037c8b..f88445c 100644
51121--- a/drivers/platform/x86/intel_oaktrail.c
51122+++ b/drivers/platform/x86/intel_oaktrail.c
51123@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51124 return 0;
51125 }
51126
51127-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51128+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51129 {
51130 .ident = "OakTrail platform",
51131 .matches = {
51132diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51133index 0859877..59d596d 100644
51134--- a/drivers/platform/x86/msi-laptop.c
51135+++ b/drivers/platform/x86/msi-laptop.c
51136@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51137 return 1;
51138 }
51139
51140-static struct dmi_system_id __initdata msi_dmi_table[] = {
51141+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51142 {
51143 .ident = "MSI S270",
51144 .matches = {
51145@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51146
51147 if (!quirks->ec_read_only) {
51148 /* allow userland write sysfs file */
51149- dev_attr_bluetooth.store = store_bluetooth;
51150- dev_attr_wlan.store = store_wlan;
51151- dev_attr_threeg.store = store_threeg;
51152- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51153- dev_attr_wlan.attr.mode |= S_IWUSR;
51154- dev_attr_threeg.attr.mode |= S_IWUSR;
51155+ pax_open_kernel();
51156+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51157+ *(void **)&dev_attr_wlan.store = store_wlan;
51158+ *(void **)&dev_attr_threeg.store = store_threeg;
51159+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51160+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51161+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51162+ pax_close_kernel();
51163 }
51164
51165 /* disable hardware control by fn key */
51166diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51167index 6d2bac0..ec2b029 100644
51168--- a/drivers/platform/x86/msi-wmi.c
51169+++ b/drivers/platform/x86/msi-wmi.c
51170@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51171 static void msi_wmi_notify(u32 value, void *context)
51172 {
51173 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51174- static struct key_entry *key;
51175+ struct key_entry *key;
51176 union acpi_object *obj;
51177 acpi_status status;
51178
51179diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51180index 9e701b2..c68a7b5 100644
51181--- a/drivers/platform/x86/samsung-laptop.c
51182+++ b/drivers/platform/x86/samsung-laptop.c
51183@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51184 return 0;
51185 }
51186
51187-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51188+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51189 {
51190 .matches = {
51191 DMI_MATCH(DMI_SYS_VENDOR,
51192diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51193index e6aac72..e11ff24 100644
51194--- a/drivers/platform/x86/samsung-q10.c
51195+++ b/drivers/platform/x86/samsung-q10.c
51196@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51197 return 1;
51198 }
51199
51200-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51201+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51202 {
51203 .ident = "Samsung Q10",
51204 .matches = {
51205diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51206index e51c1e7..71bb385 100644
51207--- a/drivers/platform/x86/sony-laptop.c
51208+++ b/drivers/platform/x86/sony-laptop.c
51209@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51210 }
51211
51212 /* High speed charging function */
51213-static struct device_attribute *hsc_handle;
51214+static device_attribute_no_const *hsc_handle;
51215
51216 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51217 struct device_attribute *attr,
51218@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51219 }
51220
51221 /* low battery function */
51222-static struct device_attribute *lowbatt_handle;
51223+static device_attribute_no_const *lowbatt_handle;
51224
51225 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51226 struct device_attribute *attr,
51227@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51228 }
51229
51230 /* fan speed function */
51231-static struct device_attribute *fan_handle, *hsf_handle;
51232+static device_attribute_no_const *fan_handle, *hsf_handle;
51233
51234 static ssize_t sony_nc_hsfan_store(struct device *dev,
51235 struct device_attribute *attr,
51236@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51237 }
51238
51239 /* USB charge function */
51240-static struct device_attribute *uc_handle;
51241+static device_attribute_no_const *uc_handle;
51242
51243 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51244 struct device_attribute *attr,
51245@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51246 }
51247
51248 /* Panel ID function */
51249-static struct device_attribute *panel_handle;
51250+static device_attribute_no_const *panel_handle;
51251
51252 static ssize_t sony_nc_panelid_show(struct device *dev,
51253 struct device_attribute *attr, char *buffer)
51254@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51255 }
51256
51257 /* smart connect function */
51258-static struct device_attribute *sc_handle;
51259+static device_attribute_no_const *sc_handle;
51260
51261 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51262 struct device_attribute *attr,
51263@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51264 .drv.pm = &sony_pic_pm,
51265 };
51266
51267-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51268+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51269 {
51270 .ident = "Sony Vaio",
51271 .matches = {
51272diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51273index 28f3281..171d8c3 100644
51274--- a/drivers/platform/x86/thinkpad_acpi.c
51275+++ b/drivers/platform/x86/thinkpad_acpi.c
51276@@ -2459,10 +2459,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51277 && !tp_features.bright_unkfw)
51278 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51279 }
51280+}
51281
51282 #undef TPACPI_COMPARE_KEY
51283 #undef TPACPI_MAY_SEND_KEY
51284-}
51285
51286 /*
51287 * Polling driver
51288diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51289index 438d4c7..ca8a2fb 100644
51290--- a/drivers/pnp/pnpbios/bioscalls.c
51291+++ b/drivers/pnp/pnpbios/bioscalls.c
51292@@ -59,7 +59,7 @@ do { \
51293 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51294 } while(0)
51295
51296-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51297+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51298 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51299
51300 /*
51301@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51302
51303 cpu = get_cpu();
51304 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51305+
51306+ pax_open_kernel();
51307 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51308+ pax_close_kernel();
51309
51310 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51311 spin_lock_irqsave(&pnp_bios_lock, flags);
51312@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51313 :"memory");
51314 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51315
51316+ pax_open_kernel();
51317 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51318+ pax_close_kernel();
51319+
51320 put_cpu();
51321
51322 /* If we get here and this is set then the PnP BIOS faulted on us. */
51323@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51324 return status;
51325 }
51326
51327-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51328+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51329 {
51330 int i;
51331
51332@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51333 pnp_bios_callpoint.offset = header->fields.pm16offset;
51334 pnp_bios_callpoint.segment = PNP_CS16;
51335
51336+ pax_open_kernel();
51337+
51338 for_each_possible_cpu(i) {
51339 struct desc_struct *gdt = get_cpu_gdt_table(i);
51340 if (!gdt)
51341@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51342 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51343 (unsigned long)__va(header->fields.pm16dseg));
51344 }
51345+
51346+ pax_close_kernel();
51347 }
51348diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51349index facd43b..b291260 100644
51350--- a/drivers/pnp/pnpbios/core.c
51351+++ b/drivers/pnp/pnpbios/core.c
51352@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51353 return 0;
51354 }
51355
51356-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51357+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51358 { /* PnPBIOS GPF on boot */
51359 .callback = exploding_pnp_bios,
51360 .ident = "Higraded P14H",
51361diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51362index dfe1ee8..67e820c 100644
51363--- a/drivers/power/pda_power.c
51364+++ b/drivers/power/pda_power.c
51365@@ -38,7 +38,11 @@ static struct power_supply *pda_psy_ac, *pda_psy_usb;
51366
51367 #if IS_ENABLED(CONFIG_USB_PHY)
51368 static struct usb_phy *transceiver;
51369-static struct notifier_block otg_nb;
51370+static int otg_handle_notification(struct notifier_block *nb,
51371+ unsigned long event, void *unused);
51372+static struct notifier_block otg_nb = {
51373+ .notifier_call = otg_handle_notification
51374+};
51375 #endif
51376
51377 static struct regulator *ac_draw;
51378@@ -373,7 +377,6 @@ static int pda_power_probe(struct platform_device *pdev)
51379
51380 #if IS_ENABLED(CONFIG_USB_PHY)
51381 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51382- otg_nb.notifier_call = otg_handle_notification;
51383 ret = usb_register_notifier(transceiver, &otg_nb);
51384 if (ret) {
51385 dev_err(dev, "failure to register otg notifier\n");
51386diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51387index cc439fd..8fa30df 100644
51388--- a/drivers/power/power_supply.h
51389+++ b/drivers/power/power_supply.h
51390@@ -16,12 +16,12 @@ struct power_supply;
51391
51392 #ifdef CONFIG_SYSFS
51393
51394-extern void power_supply_init_attrs(struct device_type *dev_type);
51395+extern void power_supply_init_attrs(void);
51396 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51397
51398 #else
51399
51400-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51401+static inline void power_supply_init_attrs(void) {}
51402 #define power_supply_uevent NULL
51403
51404 #endif /* CONFIG_SYSFS */
51405diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51406index 4bc0c7f..198c99d 100644
51407--- a/drivers/power/power_supply_core.c
51408+++ b/drivers/power/power_supply_core.c
51409@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51410 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51411 EXPORT_SYMBOL_GPL(power_supply_notifier);
51412
51413-static struct device_type power_supply_dev_type;
51414+extern const struct attribute_group *power_supply_attr_groups[];
51415+static struct device_type power_supply_dev_type = {
51416+ .groups = power_supply_attr_groups,
51417+};
51418
51419 #define POWER_SUPPLY_DEFERRED_REGISTER_TIME msecs_to_jiffies(10)
51420
51421@@ -921,7 +924,7 @@ static int __init power_supply_class_init(void)
51422 return PTR_ERR(power_supply_class);
51423
51424 power_supply_class->dev_uevent = power_supply_uevent;
51425- power_supply_init_attrs(&power_supply_dev_type);
51426+ power_supply_init_attrs();
51427
51428 return 0;
51429 }
51430diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51431index 9134e3d..45eee1e 100644
51432--- a/drivers/power/power_supply_sysfs.c
51433+++ b/drivers/power/power_supply_sysfs.c
51434@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51435 .is_visible = power_supply_attr_is_visible,
51436 };
51437
51438-static const struct attribute_group *power_supply_attr_groups[] = {
51439+const struct attribute_group *power_supply_attr_groups[] = {
51440 &power_supply_attr_group,
51441 NULL,
51442 };
51443
51444-void power_supply_init_attrs(struct device_type *dev_type)
51445+void power_supply_init_attrs(void)
51446 {
51447 int i;
51448
51449- dev_type->groups = power_supply_attr_groups;
51450-
51451 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51452 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51453 }
51454diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51455index 84419af..268ede8 100644
51456--- a/drivers/powercap/powercap_sys.c
51457+++ b/drivers/powercap/powercap_sys.c
51458@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51459 struct device_attribute name_attr;
51460 };
51461
51462+static ssize_t show_constraint_name(struct device *dev,
51463+ struct device_attribute *dev_attr,
51464+ char *buf);
51465+
51466 static struct powercap_constraint_attr
51467- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51468+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51469+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51470+ .power_limit_attr = {
51471+ .attr = {
51472+ .name = NULL,
51473+ .mode = S_IWUSR | S_IRUGO
51474+ },
51475+ .show = show_constraint_power_limit_uw,
51476+ .store = store_constraint_power_limit_uw
51477+ },
51478+
51479+ .time_window_attr = {
51480+ .attr = {
51481+ .name = NULL,
51482+ .mode = S_IWUSR | S_IRUGO
51483+ },
51484+ .show = show_constraint_time_window_us,
51485+ .store = store_constraint_time_window_us
51486+ },
51487+
51488+ .max_power_attr = {
51489+ .attr = {
51490+ .name = NULL,
51491+ .mode = S_IRUGO
51492+ },
51493+ .show = show_constraint_max_power_uw,
51494+ .store = NULL
51495+ },
51496+
51497+ .min_power_attr = {
51498+ .attr = {
51499+ .name = NULL,
51500+ .mode = S_IRUGO
51501+ },
51502+ .show = show_constraint_min_power_uw,
51503+ .store = NULL
51504+ },
51505+
51506+ .max_time_window_attr = {
51507+ .attr = {
51508+ .name = NULL,
51509+ .mode = S_IRUGO
51510+ },
51511+ .show = show_constraint_max_time_window_us,
51512+ .store = NULL
51513+ },
51514+
51515+ .min_time_window_attr = {
51516+ .attr = {
51517+ .name = NULL,
51518+ .mode = S_IRUGO
51519+ },
51520+ .show = show_constraint_min_time_window_us,
51521+ .store = NULL
51522+ },
51523+
51524+ .name_attr = {
51525+ .attr = {
51526+ .name = NULL,
51527+ .mode = S_IRUGO
51528+ },
51529+ .show = show_constraint_name,
51530+ .store = NULL
51531+ }
51532+ }
51533+};
51534
51535 /* A list of powercap control_types */
51536 static LIST_HEAD(powercap_cntrl_list);
51537@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51538 }
51539
51540 static int create_constraint_attribute(int id, const char *name,
51541- int mode,
51542- struct device_attribute *dev_attr,
51543- ssize_t (*show)(struct device *,
51544- struct device_attribute *, char *),
51545- ssize_t (*store)(struct device *,
51546- struct device_attribute *,
51547- const char *, size_t)
51548- )
51549+ struct device_attribute *dev_attr)
51550 {
51551+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51552
51553- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51554- id, name);
51555- if (!dev_attr->attr.name)
51556+ if (!name)
51557 return -ENOMEM;
51558- dev_attr->attr.mode = mode;
51559- dev_attr->show = show;
51560- dev_attr->store = store;
51561+
51562+ pax_open_kernel();
51563+ *(const char **)&dev_attr->attr.name = name;
51564+ pax_close_kernel();
51565
51566 return 0;
51567 }
51568@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51569
51570 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51571 ret = create_constraint_attribute(i, "power_limit_uw",
51572- S_IWUSR | S_IRUGO,
51573- &constraint_attrs[i].power_limit_attr,
51574- show_constraint_power_limit_uw,
51575- store_constraint_power_limit_uw);
51576+ &constraint_attrs[i].power_limit_attr);
51577 if (ret)
51578 goto err_alloc;
51579 ret = create_constraint_attribute(i, "time_window_us",
51580- S_IWUSR | S_IRUGO,
51581- &constraint_attrs[i].time_window_attr,
51582- show_constraint_time_window_us,
51583- store_constraint_time_window_us);
51584+ &constraint_attrs[i].time_window_attr);
51585 if (ret)
51586 goto err_alloc;
51587- ret = create_constraint_attribute(i, "name", S_IRUGO,
51588- &constraint_attrs[i].name_attr,
51589- show_constraint_name,
51590- NULL);
51591+ ret = create_constraint_attribute(i, "name",
51592+ &constraint_attrs[i].name_attr);
51593 if (ret)
51594 goto err_alloc;
51595- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51596- &constraint_attrs[i].max_power_attr,
51597- show_constraint_max_power_uw,
51598- NULL);
51599+ ret = create_constraint_attribute(i, "max_power_uw",
51600+ &constraint_attrs[i].max_power_attr);
51601 if (ret)
51602 goto err_alloc;
51603- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51604- &constraint_attrs[i].min_power_attr,
51605- show_constraint_min_power_uw,
51606- NULL);
51607+ ret = create_constraint_attribute(i, "min_power_uw",
51608+ &constraint_attrs[i].min_power_attr);
51609 if (ret)
51610 goto err_alloc;
51611 ret = create_constraint_attribute(i, "max_time_window_us",
51612- S_IRUGO,
51613- &constraint_attrs[i].max_time_window_attr,
51614- show_constraint_max_time_window_us,
51615- NULL);
51616+ &constraint_attrs[i].max_time_window_attr);
51617 if (ret)
51618 goto err_alloc;
51619 ret = create_constraint_attribute(i, "min_time_window_us",
51620- S_IRUGO,
51621- &constraint_attrs[i].min_time_window_attr,
51622- show_constraint_min_time_window_us,
51623- NULL);
51624+ &constraint_attrs[i].min_time_window_attr);
51625 if (ret)
51626 goto err_alloc;
51627
51628@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51629 power_zone->zone_dev_attrs[count++] =
51630 &dev_attr_max_energy_range_uj.attr;
51631 if (power_zone->ops->get_energy_uj) {
51632+ pax_open_kernel();
51633 if (power_zone->ops->reset_energy_uj)
51634- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51635+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51636 else
51637- dev_attr_energy_uj.attr.mode = S_IRUGO;
51638+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51639+ pax_close_kernel();
51640 power_zone->zone_dev_attrs[count++] =
51641 &dev_attr_energy_uj.attr;
51642 }
51643diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51644index 9c5d414..c7900ce 100644
51645--- a/drivers/ptp/ptp_private.h
51646+++ b/drivers/ptp/ptp_private.h
51647@@ -51,7 +51,7 @@ struct ptp_clock {
51648 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51649 wait_queue_head_t tsev_wq;
51650 int defunct; /* tells readers to go away when clock is being removed */
51651- struct device_attribute *pin_dev_attr;
51652+ device_attribute_no_const *pin_dev_attr;
51653 struct attribute **pin_attr;
51654 struct attribute_group pin_attr_group;
51655 };
51656diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51657index 302e626..12579af 100644
51658--- a/drivers/ptp/ptp_sysfs.c
51659+++ b/drivers/ptp/ptp_sysfs.c
51660@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51661 goto no_pin_attr;
51662
51663 for (i = 0; i < n_pins; i++) {
51664- struct device_attribute *da = &ptp->pin_dev_attr[i];
51665+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51666 sysfs_attr_init(&da->attr);
51667 da->attr.name = info->pin_config[i].name;
51668 da->attr.mode = 0644;
51669diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51670index 8a28116..05b0ad5 100644
51671--- a/drivers/regulator/core.c
51672+++ b/drivers/regulator/core.c
51673@@ -3603,7 +3603,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51674 const struct regulation_constraints *constraints = NULL;
51675 const struct regulator_init_data *init_data;
51676 struct regulator_config *config = NULL;
51677- static atomic_t regulator_no = ATOMIC_INIT(-1);
51678+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51679 struct regulator_dev *rdev;
51680 struct device *dev;
51681 int ret, i;
51682@@ -3686,7 +3686,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51683 rdev->dev.class = &regulator_class;
51684 rdev->dev.parent = dev;
51685 dev_set_name(&rdev->dev, "regulator.%lu",
51686- (unsigned long) atomic_inc_return(&regulator_no));
51687+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51688 ret = device_register(&rdev->dev);
51689 if (ret != 0) {
51690 put_device(&rdev->dev);
51691diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51692index 4071d74..260b15a 100644
51693--- a/drivers/regulator/max8660.c
51694+++ b/drivers/regulator/max8660.c
51695@@ -423,8 +423,10 @@ static int max8660_probe(struct i2c_client *client,
51696 max8660->shadow_regs[MAX8660_OVER1] = 5;
51697 } else {
51698 /* Otherwise devices can be toggled via software */
51699- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51700- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51701+ pax_open_kernel();
51702+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51703+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51704+ pax_close_kernel();
51705 }
51706
51707 /*
51708diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51709index c3d55c2..0dddfe6 100644
51710--- a/drivers/regulator/max8973-regulator.c
51711+++ b/drivers/regulator/max8973-regulator.c
51712@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51713 if (!pdata || !pdata->enable_ext_control) {
51714 max->desc.enable_reg = MAX8973_VOUT;
51715 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51716- max->ops.enable = regulator_enable_regmap;
51717- max->ops.disable = regulator_disable_regmap;
51718- max->ops.is_enabled = regulator_is_enabled_regmap;
51719+ pax_open_kernel();
51720+ *(void **)&max->ops.enable = regulator_enable_regmap;
51721+ *(void **)&max->ops.disable = regulator_disable_regmap;
51722+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51723+ pax_close_kernel();
51724 }
51725
51726 if (pdata) {
51727diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51728index 0d17c92..a29f627 100644
51729--- a/drivers/regulator/mc13892-regulator.c
51730+++ b/drivers/regulator/mc13892-regulator.c
51731@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51732 mc13xxx_unlock(mc13892);
51733
51734 /* update mc13892_vcam ops */
51735- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51736+ pax_open_kernel();
51737+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51738 sizeof(struct regulator_ops));
51739- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51740- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51741+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51742+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51743+ pax_close_kernel();
51744 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51745
51746 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51747diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51748index a82556a0..e842923 100644
51749--- a/drivers/rtc/rtc-cmos.c
51750+++ b/drivers/rtc/rtc-cmos.c
51751@@ -793,7 +793,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51752 hpet_rtc_timer_init();
51753
51754 /* export at least the first block of NVRAM */
51755- nvram.size = address_space - NVRAM_OFFSET;
51756+ pax_open_kernel();
51757+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51758+ pax_close_kernel();
51759 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51760 if (retval < 0) {
51761 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51762diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51763index 799c34b..8e9786a 100644
51764--- a/drivers/rtc/rtc-dev.c
51765+++ b/drivers/rtc/rtc-dev.c
51766@@ -16,6 +16,7 @@
51767 #include <linux/module.h>
51768 #include <linux/rtc.h>
51769 #include <linux/sched.h>
51770+#include <linux/grsecurity.h>
51771 #include "rtc-core.h"
51772
51773 static dev_t rtc_devt;
51774@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51775 if (copy_from_user(&tm, uarg, sizeof(tm)))
51776 return -EFAULT;
51777
51778+ gr_log_timechange();
51779+
51780 return rtc_set_time(rtc, &tm);
51781
51782 case RTC_PIE_ON:
51783diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51784index 4ffabb3..1f87fca 100644
51785--- a/drivers/rtc/rtc-ds1307.c
51786+++ b/drivers/rtc/rtc-ds1307.c
51787@@ -107,7 +107,7 @@ struct ds1307 {
51788 u8 offset; /* register's offset */
51789 u8 regs[11];
51790 u16 nvram_offset;
51791- struct bin_attribute *nvram;
51792+ bin_attribute_no_const *nvram;
51793 enum ds_type type;
51794 unsigned long flags;
51795 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51796diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51797index 90abb5b..e0bf6dd 100644
51798--- a/drivers/rtc/rtc-m48t59.c
51799+++ b/drivers/rtc/rtc-m48t59.c
51800@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51801 if (IS_ERR(m48t59->rtc))
51802 return PTR_ERR(m48t59->rtc);
51803
51804- m48t59_nvram_attr.size = pdata->offset;
51805+ pax_open_kernel();
51806+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51807+ pax_close_kernel();
51808
51809 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51810 if (ret)
51811diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
51812index 3a2da4c..e88493c 100644
51813--- a/drivers/rtc/rtc-test.c
51814+++ b/drivers/rtc/rtc-test.c
51815@@ -112,8 +112,10 @@ static int test_probe(struct platform_device *plat_dev)
51816 struct rtc_device *rtc;
51817
51818 if (test_mmss64) {
51819- test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
51820- test_rtc_ops.set_mmss = NULL;
51821+ pax_open_kernel();
51822+ *(void **)&test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
51823+ *(void **)&test_rtc_ops.set_mmss = NULL;
51824+ pax_close_kernel();
51825 }
51826
51827 rtc = devm_rtc_device_register(&plat_dev->dev, "test",
51828diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
51829index 1f74760..8e00a89 100644
51830--- a/drivers/scsi/be2iscsi/be_main.c
51831+++ b/drivers/scsi/be2iscsi/be_main.c
51832@@ -3165,7 +3165,7 @@ be_sgl_create_contiguous(void *virtual_address,
51833 {
51834 WARN_ON(!virtual_address);
51835 WARN_ON(!physical_address);
51836- WARN_ON(!length > 0);
51837+ WARN_ON(!length);
51838 WARN_ON(!sgl);
51839
51840 sgl->va = virtual_address;
51841diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51842index e693af6..2e525b6 100644
51843--- a/drivers/scsi/bfa/bfa_fcpim.h
51844+++ b/drivers/scsi/bfa/bfa_fcpim.h
51845@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51846
51847 struct bfa_itn_s {
51848 bfa_isr_func_t isr;
51849-};
51850+} __no_const;
51851
51852 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51853 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51854diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51855index 0f19455..ef7adb5 100644
51856--- a/drivers/scsi/bfa/bfa_fcs.c
51857+++ b/drivers/scsi/bfa/bfa_fcs.c
51858@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51859 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51860
51861 static struct bfa_fcs_mod_s fcs_modules[] = {
51862- { bfa_fcs_port_attach, NULL, NULL },
51863- { bfa_fcs_uf_attach, NULL, NULL },
51864- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51865- bfa_fcs_fabric_modexit },
51866+ {
51867+ .attach = bfa_fcs_port_attach,
51868+ .modinit = NULL,
51869+ .modexit = NULL
51870+ },
51871+ {
51872+ .attach = bfa_fcs_uf_attach,
51873+ .modinit = NULL,
51874+ .modexit = NULL
51875+ },
51876+ {
51877+ .attach = bfa_fcs_fabric_attach,
51878+ .modinit = bfa_fcs_fabric_modinit,
51879+ .modexit = bfa_fcs_fabric_modexit
51880+ },
51881 };
51882
51883 /*
51884diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
51885index ff75ef8..2dfe00a 100644
51886--- a/drivers/scsi/bfa/bfa_fcs_lport.c
51887+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
51888@@ -89,15 +89,26 @@ static struct {
51889 void (*offline) (struct bfa_fcs_lport_s *port);
51890 } __port_action[] = {
51891 {
51892- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
51893- bfa_fcs_lport_unknown_offline}, {
51894- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
51895- bfa_fcs_lport_fab_offline}, {
51896- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
51897- bfa_fcs_lport_n2n_offline}, {
51898- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
51899- bfa_fcs_lport_loop_offline},
51900- };
51901+ .init = bfa_fcs_lport_unknown_init,
51902+ .online = bfa_fcs_lport_unknown_online,
51903+ .offline = bfa_fcs_lport_unknown_offline
51904+ },
51905+ {
51906+ .init = bfa_fcs_lport_fab_init,
51907+ .online = bfa_fcs_lport_fab_online,
51908+ .offline = bfa_fcs_lport_fab_offline
51909+ },
51910+ {
51911+ .init = bfa_fcs_lport_n2n_init,
51912+ .online = bfa_fcs_lport_n2n_online,
51913+ .offline = bfa_fcs_lport_n2n_offline
51914+ },
51915+ {
51916+ .init = bfa_fcs_lport_loop_init,
51917+ .online = bfa_fcs_lport_loop_online,
51918+ .offline = bfa_fcs_lport_loop_offline
51919+ },
51920+};
51921
51922 /*
51923 * fcs_port_sm FCS logical port state machine
51924diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
51925index a38aafa0..fe8f03b 100644
51926--- a/drivers/scsi/bfa/bfa_ioc.h
51927+++ b/drivers/scsi/bfa/bfa_ioc.h
51928@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
51929 bfa_ioc_disable_cbfn_t disable_cbfn;
51930 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
51931 bfa_ioc_reset_cbfn_t reset_cbfn;
51932-};
51933+} __no_const;
51934
51935 /*
51936 * IOC event notification mechanism.
51937@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
51938 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
51939 enum bfi_ioc_state fwstate);
51940 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
51941-};
51942+} __no_const;
51943
51944 /*
51945 * Queue element to wait for room in request queue. FIFO order is
51946diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
51947index a14c784..6de6790 100644
51948--- a/drivers/scsi/bfa/bfa_modules.h
51949+++ b/drivers/scsi/bfa/bfa_modules.h
51950@@ -78,12 +78,12 @@ enum {
51951 \
51952 extern struct bfa_module_s hal_mod_ ## __mod; \
51953 struct bfa_module_s hal_mod_ ## __mod = { \
51954- bfa_ ## __mod ## _meminfo, \
51955- bfa_ ## __mod ## _attach, \
51956- bfa_ ## __mod ## _detach, \
51957- bfa_ ## __mod ## _start, \
51958- bfa_ ## __mod ## _stop, \
51959- bfa_ ## __mod ## _iocdisable, \
51960+ .meminfo = bfa_ ## __mod ## _meminfo, \
51961+ .attach = bfa_ ## __mod ## _attach, \
51962+ .detach = bfa_ ## __mod ## _detach, \
51963+ .start = bfa_ ## __mod ## _start, \
51964+ .stop = bfa_ ## __mod ## _stop, \
51965+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
51966 }
51967
51968 #define BFA_CACHELINE_SZ (256)
51969diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
51970index 045c4e1..13de803 100644
51971--- a/drivers/scsi/fcoe/fcoe_sysfs.c
51972+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
51973@@ -33,8 +33,8 @@
51974 */
51975 #include "libfcoe.h"
51976
51977-static atomic_t ctlr_num;
51978-static atomic_t fcf_num;
51979+static atomic_unchecked_t ctlr_num;
51980+static atomic_unchecked_t fcf_num;
51981
51982 /*
51983 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
51984@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
51985 if (!ctlr)
51986 goto out;
51987
51988- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
51989+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
51990 ctlr->f = f;
51991 ctlr->mode = FIP_CONN_TYPE_FABRIC;
51992 INIT_LIST_HEAD(&ctlr->fcfs);
51993@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
51994 fcf->dev.parent = &ctlr->dev;
51995 fcf->dev.bus = &fcoe_bus_type;
51996 fcf->dev.type = &fcoe_fcf_device_type;
51997- fcf->id = atomic_inc_return(&fcf_num) - 1;
51998+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
51999 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52000
52001 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52002@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52003 {
52004 int error;
52005
52006- atomic_set(&ctlr_num, 0);
52007- atomic_set(&fcf_num, 0);
52008+ atomic_set_unchecked(&ctlr_num, 0);
52009+ atomic_set_unchecked(&fcf_num, 0);
52010
52011 error = bus_register(&fcoe_bus_type);
52012 if (error)
52013diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52014index 8bb173e..20236b4 100644
52015--- a/drivers/scsi/hosts.c
52016+++ b/drivers/scsi/hosts.c
52017@@ -42,7 +42,7 @@
52018 #include "scsi_logging.h"
52019
52020
52021-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52022+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52023
52024
52025 static void scsi_host_cls_release(struct device *dev)
52026@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52027 * subtract one because we increment first then return, but we need to
52028 * know what the next host number was before increment
52029 */
52030- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52031+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52032 shost->dma_channel = 0xff;
52033
52034 /* These three are default values which can be overridden */
52035diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52036index 8eab107..599cd79 100644
52037--- a/drivers/scsi/hpsa.c
52038+++ b/drivers/scsi/hpsa.c
52039@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52040 struct reply_queue_buffer *rq = &h->reply_queue[q];
52041
52042 if (h->transMethod & CFGTBL_Trans_io_accel1)
52043- return h->access.command_completed(h, q);
52044+ return h->access->command_completed(h, q);
52045
52046 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52047- return h->access.command_completed(h, q);
52048+ return h->access->command_completed(h, q);
52049
52050 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52051 a = rq->head[rq->current_entry];
52052@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52053 break;
52054 default:
52055 set_performant_mode(h, c);
52056- h->access.submit_command(h, c);
52057+ h->access->submit_command(h, c);
52058 }
52059 }
52060
52061@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52062
52063 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52064 {
52065- return h->access.command_completed(h, q);
52066+ return h->access->command_completed(h, q);
52067 }
52068
52069 static inline bool interrupt_pending(struct ctlr_info *h)
52070 {
52071- return h->access.intr_pending(h);
52072+ return h->access->intr_pending(h);
52073 }
52074
52075 static inline long interrupt_not_for_us(struct ctlr_info *h)
52076 {
52077- return (h->access.intr_pending(h) == 0) ||
52078+ return (h->access->intr_pending(h) == 0) ||
52079 (h->interrupts_enabled == 0);
52080 }
52081
52082@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52083 if (prod_index < 0)
52084 return prod_index;
52085 h->product_name = products[prod_index].product_name;
52086- h->access = *(products[prod_index].access);
52087+ h->access = products[prod_index].access;
52088
52089 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52090 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52091@@ -6647,7 +6647,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52092 unsigned long flags;
52093 u32 lockup_detected;
52094
52095- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52096+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52097 spin_lock_irqsave(&h->lock, flags);
52098 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52099 if (!lockup_detected) {
52100@@ -6922,7 +6922,7 @@ reinit_after_soft_reset:
52101 }
52102
52103 /* make sure the board interrupts are off */
52104- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52105+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52106
52107 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52108 goto clean2;
52109@@ -6958,7 +6958,7 @@ reinit_after_soft_reset:
52110 * fake ones to scoop up any residual completions.
52111 */
52112 spin_lock_irqsave(&h->lock, flags);
52113- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52114+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52115 spin_unlock_irqrestore(&h->lock, flags);
52116 hpsa_free_irqs(h);
52117 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52118@@ -6977,9 +6977,9 @@ reinit_after_soft_reset:
52119 dev_info(&h->pdev->dev, "Board READY.\n");
52120 dev_info(&h->pdev->dev,
52121 "Waiting for stale completions to drain.\n");
52122- h->access.set_intr_mask(h, HPSA_INTR_ON);
52123+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52124 msleep(10000);
52125- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52126+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52127
52128 rc = controller_reset_failed(h->cfgtable);
52129 if (rc)
52130@@ -7004,7 +7004,7 @@ reinit_after_soft_reset:
52131
52132
52133 /* Turn the interrupts on so we can service requests */
52134- h->access.set_intr_mask(h, HPSA_INTR_ON);
52135+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52136
52137 hpsa_hba_inquiry(h);
52138 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52139@@ -7077,7 +7077,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52140 * To write all data in the battery backed cache to disks
52141 */
52142 hpsa_flush_cache(h);
52143- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52144+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52145 hpsa_free_irqs_and_disable_msix(h);
52146 }
52147
52148@@ -7198,7 +7198,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52149 CFGTBL_Trans_enable_directed_msix |
52150 (trans_support & (CFGTBL_Trans_io_accel1 |
52151 CFGTBL_Trans_io_accel2));
52152- struct access_method access = SA5_performant_access;
52153+ struct access_method *access = &SA5_performant_access;
52154
52155 /* This is a bit complicated. There are 8 registers on
52156 * the controller which we write to to tell it 8 different
52157@@ -7240,7 +7240,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52158 * perform the superfluous readl() after each command submission.
52159 */
52160 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52161- access = SA5_performant_access_no_read;
52162+ access = &SA5_performant_access_no_read;
52163
52164 /* Controller spec: zero out this buffer. */
52165 for (i = 0; i < h->nreply_queues; i++)
52166@@ -7270,12 +7270,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52167 * enable outbound interrupt coalescing in accelerator mode;
52168 */
52169 if (trans_support & CFGTBL_Trans_io_accel1) {
52170- access = SA5_ioaccel_mode1_access;
52171+ access = &SA5_ioaccel_mode1_access;
52172 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52173 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52174 } else {
52175 if (trans_support & CFGTBL_Trans_io_accel2) {
52176- access = SA5_ioaccel_mode2_access;
52177+ access = &SA5_ioaccel_mode2_access;
52178 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52179 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52180 }
52181diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52182index 6577130..955f9a4 100644
52183--- a/drivers/scsi/hpsa.h
52184+++ b/drivers/scsi/hpsa.h
52185@@ -143,7 +143,7 @@ struct ctlr_info {
52186 unsigned int msix_vector;
52187 unsigned int msi_vector;
52188 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52189- struct access_method access;
52190+ struct access_method *access;
52191 char hba_mode_enabled;
52192
52193 /* queue and queue Info */
52194@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52195 }
52196
52197 static struct access_method SA5_access = {
52198- SA5_submit_command,
52199- SA5_intr_mask,
52200- SA5_intr_pending,
52201- SA5_completed,
52202+ .submit_command = SA5_submit_command,
52203+ .set_intr_mask = SA5_intr_mask,
52204+ .intr_pending = SA5_intr_pending,
52205+ .command_completed = SA5_completed,
52206 };
52207
52208 static struct access_method SA5_ioaccel_mode1_access = {
52209- SA5_submit_command,
52210- SA5_performant_intr_mask,
52211- SA5_ioaccel_mode1_intr_pending,
52212- SA5_ioaccel_mode1_completed,
52213+ .submit_command = SA5_submit_command,
52214+ .set_intr_mask = SA5_performant_intr_mask,
52215+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52216+ .command_completed = SA5_ioaccel_mode1_completed,
52217 };
52218
52219 static struct access_method SA5_ioaccel_mode2_access = {
52220- SA5_submit_command_ioaccel2,
52221- SA5_performant_intr_mask,
52222- SA5_performant_intr_pending,
52223- SA5_performant_completed,
52224+ .submit_command = SA5_submit_command_ioaccel2,
52225+ .set_intr_mask = SA5_performant_intr_mask,
52226+ .intr_pending = SA5_performant_intr_pending,
52227+ .command_completed = SA5_performant_completed,
52228 };
52229
52230 static struct access_method SA5_performant_access = {
52231- SA5_submit_command,
52232- SA5_performant_intr_mask,
52233- SA5_performant_intr_pending,
52234- SA5_performant_completed,
52235+ .submit_command = SA5_submit_command,
52236+ .set_intr_mask = SA5_performant_intr_mask,
52237+ .intr_pending = SA5_performant_intr_pending,
52238+ .command_completed = SA5_performant_completed,
52239 };
52240
52241 static struct access_method SA5_performant_access_no_read = {
52242- SA5_submit_command_no_read,
52243- SA5_performant_intr_mask,
52244- SA5_performant_intr_pending,
52245- SA5_performant_completed,
52246+ .submit_command = SA5_submit_command_no_read,
52247+ .set_intr_mask = SA5_performant_intr_mask,
52248+ .intr_pending = SA5_performant_intr_pending,
52249+ .command_completed = SA5_performant_completed,
52250 };
52251
52252 struct board_type {
52253diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52254index 30f9ef0..a1e29ac 100644
52255--- a/drivers/scsi/libfc/fc_exch.c
52256+++ b/drivers/scsi/libfc/fc_exch.c
52257@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52258 u16 pool_max_index;
52259
52260 struct {
52261- atomic_t no_free_exch;
52262- atomic_t no_free_exch_xid;
52263- atomic_t xid_not_found;
52264- atomic_t xid_busy;
52265- atomic_t seq_not_found;
52266- atomic_t non_bls_resp;
52267+ atomic_unchecked_t no_free_exch;
52268+ atomic_unchecked_t no_free_exch_xid;
52269+ atomic_unchecked_t xid_not_found;
52270+ atomic_unchecked_t xid_busy;
52271+ atomic_unchecked_t seq_not_found;
52272+ atomic_unchecked_t non_bls_resp;
52273 } stats;
52274 };
52275
52276@@ -809,7 +809,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52277 /* allocate memory for exchange */
52278 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52279 if (!ep) {
52280- atomic_inc(&mp->stats.no_free_exch);
52281+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52282 goto out;
52283 }
52284 memset(ep, 0, sizeof(*ep));
52285@@ -872,7 +872,7 @@ out:
52286 return ep;
52287 err:
52288 spin_unlock_bh(&pool->lock);
52289- atomic_inc(&mp->stats.no_free_exch_xid);
52290+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52291 mempool_free(ep, mp->ep_pool);
52292 return NULL;
52293 }
52294@@ -1021,7 +1021,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52295 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52296 ep = fc_exch_find(mp, xid);
52297 if (!ep) {
52298- atomic_inc(&mp->stats.xid_not_found);
52299+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52300 reject = FC_RJT_OX_ID;
52301 goto out;
52302 }
52303@@ -1051,7 +1051,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52304 ep = fc_exch_find(mp, xid);
52305 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52306 if (ep) {
52307- atomic_inc(&mp->stats.xid_busy);
52308+ atomic_inc_unchecked(&mp->stats.xid_busy);
52309 reject = FC_RJT_RX_ID;
52310 goto rel;
52311 }
52312@@ -1062,7 +1062,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52313 }
52314 xid = ep->xid; /* get our XID */
52315 } else if (!ep) {
52316- atomic_inc(&mp->stats.xid_not_found);
52317+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52318 reject = FC_RJT_RX_ID; /* XID not found */
52319 goto out;
52320 }
52321@@ -1080,7 +1080,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52322 } else {
52323 sp = &ep->seq;
52324 if (sp->id != fh->fh_seq_id) {
52325- atomic_inc(&mp->stats.seq_not_found);
52326+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52327 if (f_ctl & FC_FC_END_SEQ) {
52328 /*
52329 * Update sequence_id based on incoming last
52330@@ -1531,22 +1531,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52331
52332 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52333 if (!ep) {
52334- atomic_inc(&mp->stats.xid_not_found);
52335+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52336 goto out;
52337 }
52338 if (ep->esb_stat & ESB_ST_COMPLETE) {
52339- atomic_inc(&mp->stats.xid_not_found);
52340+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52341 goto rel;
52342 }
52343 if (ep->rxid == FC_XID_UNKNOWN)
52344 ep->rxid = ntohs(fh->fh_rx_id);
52345 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52346- atomic_inc(&mp->stats.xid_not_found);
52347+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52348 goto rel;
52349 }
52350 if (ep->did != ntoh24(fh->fh_s_id) &&
52351 ep->did != FC_FID_FLOGI) {
52352- atomic_inc(&mp->stats.xid_not_found);
52353+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52354 goto rel;
52355 }
52356 sof = fr_sof(fp);
52357@@ -1555,7 +1555,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52358 sp->ssb_stat |= SSB_ST_RESP;
52359 sp->id = fh->fh_seq_id;
52360 } else if (sp->id != fh->fh_seq_id) {
52361- atomic_inc(&mp->stats.seq_not_found);
52362+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52363 goto rel;
52364 }
52365
52366@@ -1618,9 +1618,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52367 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52368
52369 if (!sp)
52370- atomic_inc(&mp->stats.xid_not_found);
52371+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52372 else
52373- atomic_inc(&mp->stats.non_bls_resp);
52374+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52375
52376 fc_frame_free(fp);
52377 }
52378@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52379
52380 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52381 mp = ema->mp;
52382- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52383+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52384 st->fc_no_free_exch_xid +=
52385- atomic_read(&mp->stats.no_free_exch_xid);
52386- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52387- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52388- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52389- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52390+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52391+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52392+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52393+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52394+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52395 }
52396 }
52397 EXPORT_SYMBOL(fc_exch_update_stats);
52398diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52399index 9c706d8..d3e3ed2 100644
52400--- a/drivers/scsi/libsas/sas_ata.c
52401+++ b/drivers/scsi/libsas/sas_ata.c
52402@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52403 .postreset = ata_std_postreset,
52404 .error_handler = ata_std_error_handler,
52405 .post_internal_cmd = sas_ata_post_internal,
52406- .qc_defer = ata_std_qc_defer,
52407+ .qc_defer = ata_std_qc_defer,
52408 .qc_prep = ata_noop_qc_prep,
52409 .qc_issue = sas_ata_qc_issue,
52410 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52411diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52412index 9b81a34..a9b7b8c 100644
52413--- a/drivers/scsi/lpfc/lpfc.h
52414+++ b/drivers/scsi/lpfc/lpfc.h
52415@@ -433,7 +433,7 @@ struct lpfc_vport {
52416 struct dentry *debug_nodelist;
52417 struct dentry *vport_debugfs_root;
52418 struct lpfc_debugfs_trc *disc_trc;
52419- atomic_t disc_trc_cnt;
52420+ atomic_unchecked_t disc_trc_cnt;
52421 #endif
52422 uint8_t stat_data_enabled;
52423 uint8_t stat_data_blocked;
52424@@ -883,8 +883,8 @@ struct lpfc_hba {
52425 struct timer_list fabric_block_timer;
52426 unsigned long bit_flags;
52427 #define FABRIC_COMANDS_BLOCKED 0
52428- atomic_t num_rsrc_err;
52429- atomic_t num_cmd_success;
52430+ atomic_unchecked_t num_rsrc_err;
52431+ atomic_unchecked_t num_cmd_success;
52432 unsigned long last_rsrc_error_time;
52433 unsigned long last_ramp_down_time;
52434 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52435@@ -919,7 +919,7 @@ struct lpfc_hba {
52436
52437 struct dentry *debug_slow_ring_trc;
52438 struct lpfc_debugfs_trc *slow_ring_trc;
52439- atomic_t slow_ring_trc_cnt;
52440+ atomic_unchecked_t slow_ring_trc_cnt;
52441 /* iDiag debugfs sub-directory */
52442 struct dentry *idiag_root;
52443 struct dentry *idiag_pci_cfg;
52444diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52445index 513edcb..805c6a8 100644
52446--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52447+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52448@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52449
52450 #include <linux/debugfs.h>
52451
52452-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52453+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52454 static unsigned long lpfc_debugfs_start_time = 0L;
52455
52456 /* iDiag */
52457@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52458 lpfc_debugfs_enable = 0;
52459
52460 len = 0;
52461- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52462+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52463 (lpfc_debugfs_max_disc_trc - 1);
52464 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52465 dtp = vport->disc_trc + i;
52466@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52467 lpfc_debugfs_enable = 0;
52468
52469 len = 0;
52470- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52471+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52472 (lpfc_debugfs_max_slow_ring_trc - 1);
52473 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52474 dtp = phba->slow_ring_trc + i;
52475@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52476 !vport || !vport->disc_trc)
52477 return;
52478
52479- index = atomic_inc_return(&vport->disc_trc_cnt) &
52480+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52481 (lpfc_debugfs_max_disc_trc - 1);
52482 dtp = vport->disc_trc + index;
52483 dtp->fmt = fmt;
52484 dtp->data1 = data1;
52485 dtp->data2 = data2;
52486 dtp->data3 = data3;
52487- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52488+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52489 dtp->jif = jiffies;
52490 #endif
52491 return;
52492@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52493 !phba || !phba->slow_ring_trc)
52494 return;
52495
52496- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52497+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52498 (lpfc_debugfs_max_slow_ring_trc - 1);
52499 dtp = phba->slow_ring_trc + index;
52500 dtp->fmt = fmt;
52501 dtp->data1 = data1;
52502 dtp->data2 = data2;
52503 dtp->data3 = data3;
52504- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52505+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52506 dtp->jif = jiffies;
52507 #endif
52508 return;
52509@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52510 "slow_ring buffer\n");
52511 goto debug_failed;
52512 }
52513- atomic_set(&phba->slow_ring_trc_cnt, 0);
52514+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52515 memset(phba->slow_ring_trc, 0,
52516 (sizeof(struct lpfc_debugfs_trc) *
52517 lpfc_debugfs_max_slow_ring_trc));
52518@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52519 "buffer\n");
52520 goto debug_failed;
52521 }
52522- atomic_set(&vport->disc_trc_cnt, 0);
52523+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52524
52525 snprintf(name, sizeof(name), "discovery_trace");
52526 vport->debug_disc_trc =
52527diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52528index e8c8c1e..5f2e11c 100644
52529--- a/drivers/scsi/lpfc/lpfc_init.c
52530+++ b/drivers/scsi/lpfc/lpfc_init.c
52531@@ -11406,8 +11406,10 @@ lpfc_init(void)
52532 "misc_register returned with status %d", error);
52533
52534 if (lpfc_enable_npiv) {
52535- lpfc_transport_functions.vport_create = lpfc_vport_create;
52536- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52537+ pax_open_kernel();
52538+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52539+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52540+ pax_close_kernel();
52541 }
52542 lpfc_transport_template =
52543 fc_attach_transport(&lpfc_transport_functions);
52544diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52545index c140f99..11b2505 100644
52546--- a/drivers/scsi/lpfc/lpfc_scsi.c
52547+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52548@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52549 unsigned long expires;
52550
52551 spin_lock_irqsave(&phba->hbalock, flags);
52552- atomic_inc(&phba->num_rsrc_err);
52553+ atomic_inc_unchecked(&phba->num_rsrc_err);
52554 phba->last_rsrc_error_time = jiffies;
52555
52556 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52557@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52558 unsigned long num_rsrc_err, num_cmd_success;
52559 int i;
52560
52561- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52562- num_cmd_success = atomic_read(&phba->num_cmd_success);
52563+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52564+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52565
52566 /*
52567 * The error and success command counters are global per
52568@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52569 }
52570 }
52571 lpfc_destroy_vport_work_array(phba, vports);
52572- atomic_set(&phba->num_rsrc_err, 0);
52573- atomic_set(&phba->num_cmd_success, 0);
52574+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52575+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52576 }
52577
52578 /**
52579diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52580index 3f26147..ee8efd1 100644
52581--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52582+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52583@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52584 {
52585 struct scsi_device *sdev = to_scsi_device(dev);
52586 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52587- static struct _raid_device *raid_device;
52588+ struct _raid_device *raid_device;
52589 unsigned long flags;
52590 Mpi2RaidVolPage0_t vol_pg0;
52591 Mpi2ConfigReply_t mpi_reply;
52592@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52593 {
52594 struct scsi_device *sdev = to_scsi_device(dev);
52595 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52596- static struct _raid_device *raid_device;
52597+ struct _raid_device *raid_device;
52598 unsigned long flags;
52599 Mpi2RaidVolPage0_t vol_pg0;
52600 Mpi2ConfigReply_t mpi_reply;
52601@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52602 Mpi2EventDataIrOperationStatus_t *event_data =
52603 (Mpi2EventDataIrOperationStatus_t *)
52604 fw_event->event_data;
52605- static struct _raid_device *raid_device;
52606+ struct _raid_device *raid_device;
52607 unsigned long flags;
52608 u16 handle;
52609
52610@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52611 u64 sas_address;
52612 struct _sas_device *sas_device;
52613 struct _sas_node *expander_device;
52614- static struct _raid_device *raid_device;
52615+ struct _raid_device *raid_device;
52616 u8 retry_count;
52617 unsigned long flags;
52618
52619diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52620index ed31d8c..ab856b3 100644
52621--- a/drivers/scsi/pmcraid.c
52622+++ b/drivers/scsi/pmcraid.c
52623@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52624 res->scsi_dev = scsi_dev;
52625 scsi_dev->hostdata = res;
52626 res->change_detected = 0;
52627- atomic_set(&res->read_failures, 0);
52628- atomic_set(&res->write_failures, 0);
52629+ atomic_set_unchecked(&res->read_failures, 0);
52630+ atomic_set_unchecked(&res->write_failures, 0);
52631 rc = 0;
52632 }
52633 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52634@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52635
52636 /* If this was a SCSI read/write command keep count of errors */
52637 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52638- atomic_inc(&res->read_failures);
52639+ atomic_inc_unchecked(&res->read_failures);
52640 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52641- atomic_inc(&res->write_failures);
52642+ atomic_inc_unchecked(&res->write_failures);
52643
52644 if (!RES_IS_GSCSI(res->cfg_entry) &&
52645 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52646@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52647 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52648 * hrrq_id assigned here in queuecommand
52649 */
52650- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52651+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52652 pinstance->num_hrrq;
52653 cmd->cmd_done = pmcraid_io_done;
52654
52655@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52656 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52657 * hrrq_id assigned here in queuecommand
52658 */
52659- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52660+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52661 pinstance->num_hrrq;
52662
52663 if (request_size) {
52664@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52665
52666 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52667 /* add resources only after host is added into system */
52668- if (!atomic_read(&pinstance->expose_resources))
52669+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52670 return;
52671
52672 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52673@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52674 init_waitqueue_head(&pinstance->reset_wait_q);
52675
52676 atomic_set(&pinstance->outstanding_cmds, 0);
52677- atomic_set(&pinstance->last_message_id, 0);
52678- atomic_set(&pinstance->expose_resources, 0);
52679+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52680+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52681
52682 INIT_LIST_HEAD(&pinstance->free_res_q);
52683 INIT_LIST_HEAD(&pinstance->used_res_q);
52684@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52685 /* Schedule worker thread to handle CCN and take care of adding and
52686 * removing devices to OS
52687 */
52688- atomic_set(&pinstance->expose_resources, 1);
52689+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52690 schedule_work(&pinstance->worker_q);
52691 return rc;
52692
52693diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52694index e1d150f..6c6df44 100644
52695--- a/drivers/scsi/pmcraid.h
52696+++ b/drivers/scsi/pmcraid.h
52697@@ -748,7 +748,7 @@ struct pmcraid_instance {
52698 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52699
52700 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52701- atomic_t last_message_id;
52702+ atomic_unchecked_t last_message_id;
52703
52704 /* configuration table */
52705 struct pmcraid_config_table *cfg_table;
52706@@ -777,7 +777,7 @@ struct pmcraid_instance {
52707 atomic_t outstanding_cmds;
52708
52709 /* should add/delete resources to mid-layer now ?*/
52710- atomic_t expose_resources;
52711+ atomic_unchecked_t expose_resources;
52712
52713
52714
52715@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52716 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52717 };
52718 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52719- atomic_t read_failures; /* count of failed READ commands */
52720- atomic_t write_failures; /* count of failed WRITE commands */
52721+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52722+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52723
52724 /* To indicate add/delete/modify during CCN */
52725 u8 change_detected;
52726diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52727index 82b92c4..3178171 100644
52728--- a/drivers/scsi/qla2xxx/qla_attr.c
52729+++ b/drivers/scsi/qla2xxx/qla_attr.c
52730@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52731 return 0;
52732 }
52733
52734-struct fc_function_template qla2xxx_transport_functions = {
52735+fc_function_template_no_const qla2xxx_transport_functions = {
52736
52737 .show_host_node_name = 1,
52738 .show_host_port_name = 1,
52739@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52740 .bsg_timeout = qla24xx_bsg_timeout,
52741 };
52742
52743-struct fc_function_template qla2xxx_transport_vport_functions = {
52744+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52745
52746 .show_host_node_name = 1,
52747 .show_host_port_name = 1,
52748diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52749index 7686bfe..4710893 100644
52750--- a/drivers/scsi/qla2xxx/qla_gbl.h
52751+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52752@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52753 struct device_attribute;
52754 extern struct device_attribute *qla2x00_host_attrs[];
52755 struct fc_function_template;
52756-extern struct fc_function_template qla2xxx_transport_functions;
52757-extern struct fc_function_template qla2xxx_transport_vport_functions;
52758+extern fc_function_template_no_const qla2xxx_transport_functions;
52759+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52760 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52761 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52762 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52763diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52764index 7462dd7..5b64c24 100644
52765--- a/drivers/scsi/qla2xxx/qla_os.c
52766+++ b/drivers/scsi/qla2xxx/qla_os.c
52767@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52768 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52769 /* Ok, a 64bit DMA mask is applicable. */
52770 ha->flags.enable_64bit_addressing = 1;
52771- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52772- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52773+ pax_open_kernel();
52774+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52775+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52776+ pax_close_kernel();
52777 return;
52778 }
52779 }
52780diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52781index 8f6d0fb..1b21097 100644
52782--- a/drivers/scsi/qla4xxx/ql4_def.h
52783+++ b/drivers/scsi/qla4xxx/ql4_def.h
52784@@ -305,7 +305,7 @@ struct ddb_entry {
52785 * (4000 only) */
52786 atomic_t relogin_timer; /* Max Time to wait for
52787 * relogin to complete */
52788- atomic_t relogin_retry_count; /* Num of times relogin has been
52789+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52790 * retried */
52791 uint32_t default_time2wait; /* Default Min time between
52792 * relogins (+aens) */
52793diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52794index 6d25879..3031a9f 100644
52795--- a/drivers/scsi/qla4xxx/ql4_os.c
52796+++ b/drivers/scsi/qla4xxx/ql4_os.c
52797@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52798 */
52799 if (!iscsi_is_session_online(cls_sess)) {
52800 /* Reset retry relogin timer */
52801- atomic_inc(&ddb_entry->relogin_retry_count);
52802+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52803 DEBUG2(ql4_printk(KERN_INFO, ha,
52804 "%s: index[%d] relogin timed out-retrying"
52805 " relogin (%d), retry (%d)\n", __func__,
52806 ddb_entry->fw_ddb_index,
52807- atomic_read(&ddb_entry->relogin_retry_count),
52808+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52809 ddb_entry->default_time2wait + 4));
52810 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52811 atomic_set(&ddb_entry->retry_relogin_timer,
52812@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52813
52814 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52815 atomic_set(&ddb_entry->relogin_timer, 0);
52816- atomic_set(&ddb_entry->relogin_retry_count, 0);
52817+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52818 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52819 ddb_entry->default_relogin_timeout =
52820 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52821diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
52822index 3833bf5..95feaf1 100644
52823--- a/drivers/scsi/scsi.c
52824+++ b/drivers/scsi/scsi.c
52825@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
52826
52827 good_bytes = scsi_bufflen(cmd);
52828 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
52829- int old_good_bytes = good_bytes;
52830+ unsigned int old_good_bytes = good_bytes;
52831 drv = scsi_cmd_to_driver(cmd);
52832 if (drv->done)
52833 good_bytes = drv->done(cmd);
52834diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52835index 448ebda..9bd345f 100644
52836--- a/drivers/scsi/scsi_lib.c
52837+++ b/drivers/scsi/scsi_lib.c
52838@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52839 shost = sdev->host;
52840 scsi_init_cmd_errh(cmd);
52841 cmd->result = DID_NO_CONNECT << 16;
52842- atomic_inc(&cmd->device->iorequest_cnt);
52843+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52844
52845 /*
52846 * SCSI request completion path will do scsi_device_unbusy(),
52847@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52848
52849 INIT_LIST_HEAD(&cmd->eh_entry);
52850
52851- atomic_inc(&cmd->device->iodone_cnt);
52852+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52853 if (cmd->result)
52854- atomic_inc(&cmd->device->ioerr_cnt);
52855+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52856
52857 disposition = scsi_decide_disposition(cmd);
52858 if (disposition != SUCCESS &&
52859@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52860 struct Scsi_Host *host = cmd->device->host;
52861 int rtn = 0;
52862
52863- atomic_inc(&cmd->device->iorequest_cnt);
52864+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52865
52866 /* check if the device is still usable */
52867 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52868diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52869index 9ad4116..4e736fc 100644
52870--- a/drivers/scsi/scsi_sysfs.c
52871+++ b/drivers/scsi/scsi_sysfs.c
52872@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52873 char *buf) \
52874 { \
52875 struct scsi_device *sdev = to_scsi_device(dev); \
52876- unsigned long long count = atomic_read(&sdev->field); \
52877+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52878 return snprintf(buf, 20, "0x%llx\n", count); \
52879 } \
52880 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
52881diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
52882index 24eaaf6..de30ec9 100644
52883--- a/drivers/scsi/scsi_transport_fc.c
52884+++ b/drivers/scsi/scsi_transport_fc.c
52885@@ -502,7 +502,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
52886 * Netlink Infrastructure
52887 */
52888
52889-static atomic_t fc_event_seq;
52890+static atomic_unchecked_t fc_event_seq;
52891
52892 /**
52893 * fc_get_event_number - Obtain the next sequential FC event number
52894@@ -515,7 +515,7 @@ static atomic_t fc_event_seq;
52895 u32
52896 fc_get_event_number(void)
52897 {
52898- return atomic_add_return(1, &fc_event_seq);
52899+ return atomic_add_return_unchecked(1, &fc_event_seq);
52900 }
52901 EXPORT_SYMBOL(fc_get_event_number);
52902
52903@@ -659,7 +659,7 @@ static __init int fc_transport_init(void)
52904 {
52905 int error;
52906
52907- atomic_set(&fc_event_seq, 0);
52908+ atomic_set_unchecked(&fc_event_seq, 0);
52909
52910 error = transport_class_register(&fc_host_class);
52911 if (error)
52912@@ -849,7 +849,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
52913 char *cp;
52914
52915 *val = simple_strtoul(buf, &cp, 0);
52916- if ((*cp && (*cp != '\n')) || (*val < 0))
52917+ if (*cp && (*cp != '\n'))
52918 return -EINVAL;
52919 /*
52920 * Check for overflow; dev_loss_tmo is u32
52921diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
52922index 67d43e3..8cee73c 100644
52923--- a/drivers/scsi/scsi_transport_iscsi.c
52924+++ b/drivers/scsi/scsi_transport_iscsi.c
52925@@ -79,7 +79,7 @@ struct iscsi_internal {
52926 struct transport_container session_cont;
52927 };
52928
52929-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
52930+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
52931 static struct workqueue_struct *iscsi_eh_timer_workq;
52932
52933 static DEFINE_IDA(iscsi_sess_ida);
52934@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
52935 int err;
52936
52937 ihost = shost->shost_data;
52938- session->sid = atomic_add_return(1, &iscsi_session_nr);
52939+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
52940
52941 if (target_id == ISCSI_MAX_TARGET) {
52942 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
52943@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
52944 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
52945 ISCSI_TRANSPORT_VERSION);
52946
52947- atomic_set(&iscsi_session_nr, 0);
52948+ atomic_set_unchecked(&iscsi_session_nr, 0);
52949
52950 err = class_register(&iscsi_transport_class);
52951 if (err)
52952diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
52953index f115f67..b80b2c1 100644
52954--- a/drivers/scsi/scsi_transport_srp.c
52955+++ b/drivers/scsi/scsi_transport_srp.c
52956@@ -35,7 +35,7 @@
52957 #include "scsi_priv.h"
52958
52959 struct srp_host_attrs {
52960- atomic_t next_port_id;
52961+ atomic_unchecked_t next_port_id;
52962 };
52963 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
52964
52965@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
52966 struct Scsi_Host *shost = dev_to_shost(dev);
52967 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
52968
52969- atomic_set(&srp_host->next_port_id, 0);
52970+ atomic_set_unchecked(&srp_host->next_port_id, 0);
52971 return 0;
52972 }
52973
52974@@ -744,7 +744,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
52975 rport_fast_io_fail_timedout);
52976 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
52977
52978- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
52979+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
52980 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
52981
52982 transport_setup_device(&rport->dev);
52983diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
52984index 11ea52b..7968d4d 100644
52985--- a/drivers/scsi/sd.c
52986+++ b/drivers/scsi/sd.c
52987@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
52988 static void sd_rescan(struct device *);
52989 static int sd_init_command(struct scsi_cmnd *SCpnt);
52990 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
52991-static int sd_done(struct scsi_cmnd *);
52992+static unsigned int sd_done(struct scsi_cmnd *);
52993 static int sd_eh_action(struct scsi_cmnd *, int);
52994 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
52995 static void scsi_disk_release(struct device *cdev);
52996@@ -1646,7 +1646,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
52997 *
52998 * Note: potentially run from within an ISR. Must not block.
52999 **/
53000-static int sd_done(struct scsi_cmnd *SCpnt)
53001+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53002 {
53003 int result = SCpnt->result;
53004 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53005@@ -2973,7 +2973,7 @@ static int sd_probe(struct device *dev)
53006 sdkp->disk = gd;
53007 sdkp->index = index;
53008 atomic_set(&sdkp->openers, 0);
53009- atomic_set(&sdkp->device->ioerr_cnt, 0);
53010+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53011
53012 if (!sdp->request_queue->rq_timeout) {
53013 if (sdp->type != TYPE_MOD)
53014diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53015index 9d7b7db..33ecc51 100644
53016--- a/drivers/scsi/sg.c
53017+++ b/drivers/scsi/sg.c
53018@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53019 sdp->disk->disk_name,
53020 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53021 NULL,
53022- (char *)arg);
53023+ (char __user *)arg);
53024 case BLKTRACESTART:
53025 return blk_trace_startstop(sdp->device->request_queue, 1);
53026 case BLKTRACESTOP:
53027diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
53028index 8bd54a6..58fa0d6 100644
53029--- a/drivers/scsi/sr.c
53030+++ b/drivers/scsi/sr.c
53031@@ -80,7 +80,7 @@ static DEFINE_MUTEX(sr_mutex);
53032 static int sr_probe(struct device *);
53033 static int sr_remove(struct device *);
53034 static int sr_init_command(struct scsi_cmnd *SCpnt);
53035-static int sr_done(struct scsi_cmnd *);
53036+static unsigned int sr_done(struct scsi_cmnd *);
53037 static int sr_runtime_suspend(struct device *dev);
53038
53039 static struct dev_pm_ops sr_pm_ops = {
53040@@ -312,13 +312,13 @@ do_tur:
53041 * It will be notified on the end of a SCSI read / write, and will take one
53042 * of several actions based on success or failure.
53043 */
53044-static int sr_done(struct scsi_cmnd *SCpnt)
53045+static unsigned int sr_done(struct scsi_cmnd *SCpnt)
53046 {
53047 int result = SCpnt->result;
53048- int this_count = scsi_bufflen(SCpnt);
53049- int good_bytes = (result == 0 ? this_count : 0);
53050- int block_sectors = 0;
53051- long error_sector;
53052+ unsigned int this_count = scsi_bufflen(SCpnt);
53053+ unsigned int good_bytes = (result == 0 ? this_count : 0);
53054+ unsigned int block_sectors = 0;
53055+ sector_t error_sector;
53056 struct scsi_cd *cd = scsi_cd(SCpnt->request->rq_disk);
53057
53058 #ifdef DEBUG
53059@@ -351,9 +351,12 @@ static int sr_done(struct scsi_cmnd *SCpnt)
53060 if (cd->device->sector_size == 2048)
53061 error_sector <<= 2;
53062 error_sector &= ~(block_sectors - 1);
53063- good_bytes = (error_sector -
53064- blk_rq_pos(SCpnt->request)) << 9;
53065- if (good_bytes < 0 || good_bytes >= this_count)
53066+ if (error_sector >= blk_rq_pos(SCpnt->request)) {
53067+ good_bytes = (error_sector -
53068+ blk_rq_pos(SCpnt->request)) << 9;
53069+ if (good_bytes >= this_count)
53070+ good_bytes = 0;
53071+ } else
53072 good_bytes = 0;
53073 /*
53074 * The SCSI specification allows for the value
53075diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53076index c0d660f..24a5854 100644
53077--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53078+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53079@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53080 return i;
53081 }
53082
53083-static struct bin_attribute fuse_bin_attr = {
53084+static bin_attribute_no_const fuse_bin_attr = {
53085 .attr = { .name = "fuse", .mode = S_IRUGO, },
53086 .read = fuse_read,
53087 };
53088diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53089index d35c1a1..eda08dc 100644
53090--- a/drivers/spi/spi.c
53091+++ b/drivers/spi/spi.c
53092@@ -2206,7 +2206,7 @@ int spi_bus_unlock(struct spi_master *master)
53093 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53094
53095 /* portable code must never pass more than 32 bytes */
53096-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53097+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53098
53099 static u8 *buf;
53100
53101diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53102index b41429f..2de5373 100644
53103--- a/drivers/staging/android/timed_output.c
53104+++ b/drivers/staging/android/timed_output.c
53105@@ -25,7 +25,7 @@
53106 #include "timed_output.h"
53107
53108 static struct class *timed_output_class;
53109-static atomic_t device_count;
53110+static atomic_unchecked_t device_count;
53111
53112 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53113 char *buf)
53114@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53115 timed_output_class = class_create(THIS_MODULE, "timed_output");
53116 if (IS_ERR(timed_output_class))
53117 return PTR_ERR(timed_output_class);
53118- atomic_set(&device_count, 0);
53119+ atomic_set_unchecked(&device_count, 0);
53120 timed_output_class->dev_groups = timed_output_groups;
53121 }
53122
53123@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53124 if (ret < 0)
53125 return ret;
53126
53127- tdev->index = atomic_inc_return(&device_count);
53128+ tdev->index = atomic_inc_return_unchecked(&device_count);
53129 tdev->dev = device_create(timed_output_class, NULL,
53130 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53131 if (IS_ERR(tdev->dev))
53132diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53133index e78ddbe..ac437c0 100644
53134--- a/drivers/staging/comedi/comedi_fops.c
53135+++ b/drivers/staging/comedi/comedi_fops.c
53136@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53137 }
53138 cfp->last_attached = dev->attached;
53139 cfp->last_detach_count = dev->detach_count;
53140- ACCESS_ONCE(cfp->read_subdev) = read_s;
53141- ACCESS_ONCE(cfp->write_subdev) = write_s;
53142+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53143+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53144 }
53145
53146 static void comedi_file_check(struct file *file)
53147@@ -1951,7 +1951,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53148 !(s_old->async->cmd.flags & CMDF_WRITE))
53149 return -EBUSY;
53150
53151- ACCESS_ONCE(cfp->read_subdev) = s_new;
53152+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53153 return 0;
53154 }
53155
53156@@ -1993,7 +1993,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53157 (s_old->async->cmd.flags & CMDF_WRITE))
53158 return -EBUSY;
53159
53160- ACCESS_ONCE(cfp->write_subdev) = s_new;
53161+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53162 return 0;
53163 }
53164
53165diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53166index 53b748b..a5ae0b3 100644
53167--- a/drivers/staging/fbtft/fbtft-core.c
53168+++ b/drivers/staging/fbtft/fbtft-core.c
53169@@ -680,7 +680,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53170 {
53171 struct fb_info *info;
53172 struct fbtft_par *par;
53173- struct fb_ops *fbops = NULL;
53174+ fb_ops_no_const *fbops = NULL;
53175 struct fb_deferred_io *fbdefio = NULL;
53176 struct fbtft_platform_data *pdata = dev->platform_data;
53177 u8 *vmem = NULL;
53178diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53179index 9fd98cb..a9cf912 100644
53180--- a/drivers/staging/fbtft/fbtft.h
53181+++ b/drivers/staging/fbtft/fbtft.h
53182@@ -106,7 +106,7 @@ struct fbtft_ops {
53183
53184 int (*set_var)(struct fbtft_par *par);
53185 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53186-};
53187+} __no_const;
53188
53189 /**
53190 * struct fbtft_display - Describes the display properties
53191diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53192index 001348c..cfaac8a 100644
53193--- a/drivers/staging/gdm724x/gdm_tty.c
53194+++ b/drivers/staging/gdm724x/gdm_tty.c
53195@@ -44,7 +44,7 @@
53196 #define gdm_tty_send_control(n, r, v, d, l) (\
53197 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53198
53199-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53200+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53201
53202 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53203 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53204diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53205index d23c3c2..eb63c81 100644
53206--- a/drivers/staging/i2o/i2o.h
53207+++ b/drivers/staging/i2o/i2o.h
53208@@ -565,7 +565,7 @@ struct i2o_controller {
53209 struct i2o_device *exec; /* Executive */
53210 #if BITS_PER_LONG == 64
53211 spinlock_t context_list_lock; /* lock for context_list */
53212- atomic_t context_list_counter; /* needed for unique contexts */
53213+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53214 struct list_head context_list; /* list of context id's
53215 and pointers */
53216 #endif
53217diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53218index 780fee3..ca9dcae 100644
53219--- a/drivers/staging/i2o/i2o_proc.c
53220+++ b/drivers/staging/i2o/i2o_proc.c
53221@@ -253,12 +253,6 @@ static char *scsi_devices[] = {
53222 "Array Controller Device"
53223 };
53224
53225-static char *chtostr(char *tmp, u8 *chars, int n)
53226-{
53227- tmp[0] = 0;
53228- return strncat(tmp, (char *)chars, n);
53229-}
53230-
53231 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53232 char *group)
53233 {
53234@@ -711,9 +705,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53235 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53236 {
53237 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53238- static u32 work32[5];
53239- static u8 *work8 = (u8 *) work32;
53240- static u16 *work16 = (u16 *) work32;
53241+ u32 work32[5];
53242+ u8 *work8 = (u8 *) work32;
53243+ u16 *work16 = (u16 *) work32;
53244 int token;
53245 u32 hwcap;
53246
53247@@ -794,7 +788,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53248 } *result;
53249
53250 i2o_exec_execute_ddm_table ddm_table;
53251- char tmp[28 + 1];
53252
53253 result = kmalloc(sizeof(*result), GFP_KERNEL);
53254 if (!result)
53255@@ -829,8 +822,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53256
53257 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53258 seq_printf(seq, "%-#8x", ddm_table.module_id);
53259- seq_printf(seq, "%-29s",
53260- chtostr(tmp, ddm_table.module_name_version, 28));
53261+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53262 seq_printf(seq, "%9d ", ddm_table.data_size);
53263 seq_printf(seq, "%8d", ddm_table.code_size);
53264
53265@@ -897,7 +889,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53266
53267 i2o_driver_result_table *result;
53268 i2o_driver_store_table *dst;
53269- char tmp[28 + 1];
53270
53271 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53272 if (result == NULL)
53273@@ -932,9 +923,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53274
53275 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53276 seq_printf(seq, "%-#8x", dst->module_id);
53277- seq_printf(seq, "%-29s",
53278- chtostr(tmp, dst->module_name_version, 28));
53279- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53280+ seq_printf(seq, "%-.28s", dst->module_name_version);
53281+ seq_printf(seq, "%-.8s", dst->date);
53282 seq_printf(seq, "%8d ", dst->module_size);
53283 seq_printf(seq, "%8d ", dst->mpb_size);
53284 seq_printf(seq, "0x%04x", dst->module_flags);
53285@@ -1250,11 +1240,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53286 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53287 {
53288 struct i2o_device *d = (struct i2o_device *)seq->private;
53289- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53290+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53291 // == (allow) 512d bytes (max)
53292- static u16 *work16 = (u16 *) work32;
53293+ u16 *work16 = (u16 *) work32;
53294 int token;
53295- char tmp[16 + 1];
53296
53297 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53298
53299@@ -1266,14 +1255,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53300 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53301 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53302 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53303- seq_printf(seq, "Vendor info : %s\n",
53304- chtostr(tmp, (u8 *) (work32 + 2), 16));
53305- seq_printf(seq, "Product info : %s\n",
53306- chtostr(tmp, (u8 *) (work32 + 6), 16));
53307- seq_printf(seq, "Description : %s\n",
53308- chtostr(tmp, (u8 *) (work32 + 10), 16));
53309- seq_printf(seq, "Product rev. : %s\n",
53310- chtostr(tmp, (u8 *) (work32 + 14), 8));
53311+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53312+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53313+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53314+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53315
53316 seq_printf(seq, "Serial number : ");
53317 print_serial_number(seq, (u8 *) (work32 + 16),
53318@@ -1310,8 +1295,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53319 u8 pad[256]; // allow up to 256 byte (max) serial number
53320 } result;
53321
53322- char tmp[24 + 1];
53323-
53324 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53325
53326 if (token < 0) {
53327@@ -1320,10 +1303,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53328 }
53329
53330 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53331- seq_printf(seq, "Module name : %s\n",
53332- chtostr(tmp, result.module_name, 24));
53333- seq_printf(seq, "Module revision : %s\n",
53334- chtostr(tmp, result.module_rev, 8));
53335+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53336+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53337
53338 seq_printf(seq, "Serial number : ");
53339 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53340@@ -1347,8 +1328,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53341 u8 instance_number[4];
53342 } result;
53343
53344- char tmp[64 + 1];
53345-
53346 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53347
53348 if (token < 0) {
53349@@ -1356,14 +1335,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53350 return 0;
53351 }
53352
53353- seq_printf(seq, "Device name : %s\n",
53354- chtostr(tmp, result.device_name, 64));
53355- seq_printf(seq, "Service name : %s\n",
53356- chtostr(tmp, result.service_name, 64));
53357- seq_printf(seq, "Physical name : %s\n",
53358- chtostr(tmp, result.physical_location, 64));
53359- seq_printf(seq, "Instance number : %s\n",
53360- chtostr(tmp, result.instance_number, 4));
53361+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53362+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53363+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53364+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53365
53366 return 0;
53367 }
53368@@ -1372,9 +1347,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53369 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53370 {
53371 struct i2o_device *d = (struct i2o_device *)seq->private;
53372- static u32 work32[12];
53373- static u16 *work16 = (u16 *) work32;
53374- static u8 *work8 = (u8 *) work32;
53375+ u32 work32[12];
53376+ u16 *work16 = (u16 *) work32;
53377+ u8 *work8 = (u8 *) work32;
53378 int token;
53379
53380 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53381diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53382index 23bdbe4..4e1f340 100644
53383--- a/drivers/staging/i2o/iop.c
53384+++ b/drivers/staging/i2o/iop.c
53385@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53386
53387 spin_lock_irqsave(&c->context_list_lock, flags);
53388
53389- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53390- atomic_inc(&c->context_list_counter);
53391+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53392+ atomic_inc_unchecked(&c->context_list_counter);
53393
53394- entry->context = atomic_read(&c->context_list_counter);
53395+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53396
53397 list_add(&entry->list, &c->context_list);
53398
53399@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53400
53401 #if BITS_PER_LONG == 64
53402 spin_lock_init(&c->context_list_lock);
53403- atomic_set(&c->context_list_counter, 0);
53404+ atomic_set_unchecked(&c->context_list_counter, 0);
53405 INIT_LIST_HEAD(&c->context_list);
53406 #endif
53407
53408diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
53409index b892f2c..9b4898a 100644
53410--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
53411+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
53412@@ -118,7 +118,7 @@ static int lis3l02dq_get_buffer_element(struct iio_dev *indio_dev,
53413 int scan_count = bitmap_weight(indio_dev->active_scan_mask,
53414 indio_dev->masklength);
53415
53416- rx_array = kcalloc(4, scan_count, GFP_KERNEL);
53417+ rx_array = kcalloc(scan_count, 4, GFP_KERNEL);
53418 if (!rx_array)
53419 return -ENOMEM;
53420 ret = lis3l02dq_read_all(indio_dev, rx_array);
53421diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
53422index d98e229..9c59bc2 100644
53423--- a/drivers/staging/iio/adc/ad7280a.c
53424+++ b/drivers/staging/iio/adc/ad7280a.c
53425@@ -547,8 +547,8 @@ static int ad7280_attr_init(struct ad7280_state *st)
53426 {
53427 int dev, ch, cnt;
53428
53429- st->iio_attr = kcalloc(2, sizeof(*st->iio_attr) *
53430- (st->slave_num + 1) * AD7280A_CELLS_PER_DEV,
53431+ st->iio_attr = kcalloc(sizeof(*st->iio_attr) *
53432+ (st->slave_num + 1) * AD7280A_CELLS_PER_DEV, 2,
53433 GFP_KERNEL);
53434 if (st->iio_attr == NULL)
53435 return -ENOMEM;
53436diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53437index 658f458..0564216 100644
53438--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53439+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53440@@ -487,13 +487,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53441 return 0;
53442 }
53443
53444-sfw_test_client_ops_t brw_test_client;
53445-void brw_init_test_client(void)
53446-{
53447- brw_test_client.tso_init = brw_client_init;
53448- brw_test_client.tso_fini = brw_client_fini;
53449- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53450- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53451+sfw_test_client_ops_t brw_test_client = {
53452+ .tso_init = brw_client_init,
53453+ .tso_fini = brw_client_fini,
53454+ .tso_prep_rpc = brw_client_prep_rpc,
53455+ .tso_done_rpc = brw_client_done_rpc,
53456 };
53457
53458 srpc_service_t brw_test_service;
53459diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53460index a93a90d..c51dde6 100644
53461--- a/drivers/staging/lustre/lnet/selftest/framework.c
53462+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53463@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53464
53465 extern sfw_test_client_ops_t ping_test_client;
53466 extern srpc_service_t ping_test_service;
53467-extern void ping_init_test_client(void);
53468 extern void ping_init_test_service(void);
53469
53470 extern sfw_test_client_ops_t brw_test_client;
53471 extern srpc_service_t brw_test_service;
53472-extern void brw_init_test_client(void);
53473 extern void brw_init_test_service(void);
53474
53475
53476@@ -1675,12 +1673,10 @@ sfw_startup(void)
53477 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53478 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53479
53480- brw_init_test_client();
53481 brw_init_test_service();
53482 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53483 LASSERT(rc == 0);
53484
53485- ping_init_test_client();
53486 ping_init_test_service();
53487 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53488 LASSERT(rc == 0);
53489diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53490index 644069a..83cbd26 100644
53491--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53492+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53493@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53494 return 0;
53495 }
53496
53497-sfw_test_client_ops_t ping_test_client;
53498-void ping_init_test_client(void)
53499-{
53500- ping_test_client.tso_init = ping_client_init;
53501- ping_test_client.tso_fini = ping_client_fini;
53502- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53503- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53504-}
53505+sfw_test_client_ops_t ping_test_client = {
53506+ .tso_init = ping_client_init,
53507+ .tso_fini = ping_client_fini,
53508+ .tso_prep_rpc = ping_client_prep_rpc,
53509+ .tso_done_rpc = ping_client_done_rpc,
53510+};
53511
53512 srpc_service_t ping_test_service;
53513 void ping_init_test_service(void)
53514diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53515index bac9902..0225fe1 100644
53516--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53517+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53518@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53519 ldlm_completion_callback lcs_completion;
53520 ldlm_blocking_callback lcs_blocking;
53521 ldlm_glimpse_callback lcs_glimpse;
53522-};
53523+} __no_const;
53524
53525 /* ldlm_lockd.c */
53526 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53527diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53528index 2a88b80..62e7e5f 100644
53529--- a/drivers/staging/lustre/lustre/include/obd.h
53530+++ b/drivers/staging/lustre/lustre/include/obd.h
53531@@ -1362,7 +1362,7 @@ struct md_ops {
53532 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53533 * wrapper function in include/linux/obd_class.h.
53534 */
53535-};
53536+} __no_const;
53537
53538 struct lsm_operations {
53539 void (*lsm_free)(struct lov_stripe_md *);
53540diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53541index a4c252f..b21acac 100644
53542--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53543+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53544@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53545 int added = (mode == LCK_NL);
53546 int overlaps = 0;
53547 int splitted = 0;
53548- const struct ldlm_callback_suite null_cbs = { NULL };
53549+ const struct ldlm_callback_suite null_cbs = { };
53550
53551 CDEBUG(D_DLMTRACE,
53552 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53553diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53554index f0ee76a..1d01af9 100644
53555--- a/drivers/staging/lustre/lustre/libcfs/module.c
53556+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53557@@ -380,11 +380,11 @@ out:
53558
53559
53560 struct cfs_psdev_ops libcfs_psdev_ops = {
53561- libcfs_psdev_open,
53562- libcfs_psdev_release,
53563- NULL,
53564- NULL,
53565- libcfs_ioctl
53566+ .p_open = libcfs_psdev_open,
53567+ .p_close = libcfs_psdev_release,
53568+ .p_read = NULL,
53569+ .p_write = NULL,
53570+ .p_ioctl = libcfs_ioctl
53571 };
53572
53573 static int init_libcfs_module(void)
53574@@ -631,7 +631,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53575 loff_t *ppos)
53576 {
53577 int rc, max_delay_cs;
53578- struct ctl_table dummy = *table;
53579+ ctl_table_no_const dummy = *table;
53580 long d;
53581
53582 dummy.data = &max_delay_cs;
53583@@ -664,7 +664,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53584 loff_t *ppos)
53585 {
53586 int rc, min_delay_cs;
53587- struct ctl_table dummy = *table;
53588+ ctl_table_no_const dummy = *table;
53589 long d;
53590
53591 dummy.data = &min_delay_cs;
53592@@ -696,7 +696,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53593 void __user *buffer, size_t *lenp, loff_t *ppos)
53594 {
53595 int rc, backoff;
53596- struct ctl_table dummy = *table;
53597+ ctl_table_no_const dummy = *table;
53598
53599 dummy.data = &backoff;
53600 dummy.proc_handler = &proc_dointvec;
53601diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53602index 22667db..8b703b6 100644
53603--- a/drivers/staging/octeon/ethernet-rx.c
53604+++ b/drivers/staging/octeon/ethernet-rx.c
53605@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53606 /* Increment RX stats for virtual ports */
53607 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53608 #ifdef CONFIG_64BIT
53609- atomic64_add(1,
53610+ atomic64_add_unchecked(1,
53611 (atomic64_t *)&priv->stats.rx_packets);
53612- atomic64_add(skb->len,
53613+ atomic64_add_unchecked(skb->len,
53614 (atomic64_t *)&priv->stats.rx_bytes);
53615 #else
53616- atomic_add(1,
53617+ atomic_add_unchecked(1,
53618 (atomic_t *)&priv->stats.rx_packets);
53619- atomic_add(skb->len,
53620+ atomic_add_unchecked(skb->len,
53621 (atomic_t *)&priv->stats.rx_bytes);
53622 #endif
53623 }
53624@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53625 dev->name);
53626 */
53627 #ifdef CONFIG_64BIT
53628- atomic64_add(1,
53629+ atomic64_add_unchecked(1,
53630 (atomic64_t *)&priv->stats.rx_dropped);
53631 #else
53632- atomic_add(1,
53633+ atomic_add_unchecked(1,
53634 (atomic_t *)&priv->stats.rx_dropped);
53635 #endif
53636 dev_kfree_skb_irq(skb);
53637diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53638index fbbe866..2943243 100644
53639--- a/drivers/staging/octeon/ethernet.c
53640+++ b/drivers/staging/octeon/ethernet.c
53641@@ -251,11 +251,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53642 * since the RX tasklet also increments it.
53643 */
53644 #ifdef CONFIG_64BIT
53645- atomic64_add(rx_status.dropped_packets,
53646- (atomic64_t *)&priv->stats.rx_dropped);
53647+ atomic64_add_unchecked(rx_status.dropped_packets,
53648+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53649 #else
53650- atomic_add(rx_status.dropped_packets,
53651- (atomic_t *)&priv->stats.rx_dropped);
53652+ atomic_add_unchecked(rx_status.dropped_packets,
53653+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53654 #endif
53655 }
53656
53657diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53658index 3b476d8..f522d68 100644
53659--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53660+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53661@@ -225,7 +225,7 @@ struct hal_ops {
53662
53663 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53664 void (*hal_reset_security_engine)(struct adapter *adapter);
53665-};
53666+} __no_const;
53667
53668 enum rt_eeprom_type {
53669 EEPROM_93C46,
53670diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53671index 070cc03..6806e37 100644
53672--- a/drivers/staging/rtl8712/rtl871x_io.h
53673+++ b/drivers/staging/rtl8712/rtl871x_io.h
53674@@ -108,7 +108,7 @@ struct _io_ops {
53675 u8 *pmem);
53676 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53677 u8 *pmem);
53678-};
53679+} __no_const;
53680
53681 struct io_req {
53682 struct list_head list;
53683diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
53684index dbbb2f8..5232114 100644
53685--- a/drivers/staging/sm750fb/sm750.c
53686+++ b/drivers/staging/sm750fb/sm750.c
53687@@ -780,6 +780,7 @@ static struct fb_ops lynxfb_ops = {
53688 .fb_set_par = lynxfb_ops_set_par,
53689 .fb_setcolreg = lynxfb_ops_setcolreg,
53690 .fb_blank = lynxfb_ops_blank,
53691+ .fb_pan_display = lynxfb_ops_pan_display,
53692 .fb_fillrect = cfb_fillrect,
53693 .fb_imageblit = cfb_imageblit,
53694 .fb_copyarea = cfb_copyarea,
53695@@ -827,8 +828,10 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53696 par->index = index;
53697 output->channel = &crtc->channel;
53698 sm750fb_set_drv(par);
53699- lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53700
53701+ pax_open_kernel();
53702+ *(void **)&lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53703+ pax_close_kernel();
53704
53705 /* set current cursor variable and proc pointer,
53706 * must be set after crtc member initialized */
53707@@ -850,7 +853,9 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53708 crtc->cursor.share = share;
53709 memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
53710 if (!g_hwcursor) {
53711- lynxfb_ops.fb_cursor = NULL;
53712+ pax_open_kernel();
53713+ *(void **)&lynxfb_ops.fb_cursor = NULL;
53714+ pax_close_kernel();
53715 crtc->cursor.disable(&crtc->cursor);
53716 }
53717
53718@@ -858,9 +863,11 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53719 /* set info->fbops, must be set before fb_find_mode */
53720 if (!share->accel_off) {
53721 /* use 2d acceleration */
53722- lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53723- lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53724- lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53725+ pax_open_kernel();
53726+ *(void **)&lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53727+ *(void **)&lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53728+ *(void **)&lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53729+ pax_close_kernel();
53730 }
53731 info->fbops = &lynxfb_ops;
53732
53733diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53734index bd46df9..a0a5274 100644
53735--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53736+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53737@@ -170,7 +170,7 @@ struct visorchipset_busdev_notifiers {
53738 void (*device_resume)(ulong bus_no, ulong dev_no);
53739 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53740 ulong *max_size);
53741-};
53742+} __no_const;
53743
53744 /* These functions live inside visorchipset, and will be called to indicate
53745 * responses to specific events (by code outside of visorchipset).
53746@@ -185,7 +185,7 @@ struct visorchipset_busdev_responders {
53747 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53748 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53749 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53750-};
53751+} __no_const;
53752
53753 /** Register functions (in the bus driver) to get called by visorchipset
53754 * whenever a bus or device appears for which this service partition is
53755diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53756index 18b0f97..9c7716e 100644
53757--- a/drivers/target/sbp/sbp_target.c
53758+++ b/drivers/target/sbp/sbp_target.c
53759@@ -61,7 +61,7 @@ static const u32 sbp_unit_directory_template[] = {
53760
53761 #define SESSION_MAINTENANCE_INTERVAL HZ
53762
53763-static atomic_t login_id = ATOMIC_INIT(0);
53764+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53765
53766 static void session_maintenance_work(struct work_struct *);
53767 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53768@@ -443,7 +443,7 @@ static void sbp_management_request_login(
53769 login->lun = se_lun;
53770 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53771 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53772- login->login_id = atomic_inc_return(&login_id);
53773+ login->login_id = atomic_inc_return_unchecked(&login_id);
53774
53775 login->tgt_agt = sbp_target_agent_register(login);
53776 if (IS_ERR(login->tgt_agt)) {
53777diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53778index ce5f768..a4f884a 100644
53779--- a/drivers/target/target_core_device.c
53780+++ b/drivers/target/target_core_device.c
53781@@ -1496,7 +1496,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53782 spin_lock_init(&dev->se_tmr_lock);
53783 spin_lock_init(&dev->qf_cmd_lock);
53784 sema_init(&dev->caw_sem, 1);
53785- atomic_set(&dev->dev_ordered_id, 0);
53786+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53787 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53788 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53789 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53790diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53791index 675f2d9..1389429 100644
53792--- a/drivers/target/target_core_transport.c
53793+++ b/drivers/target/target_core_transport.c
53794@@ -1208,7 +1208,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53795 * Used to determine when ORDERED commands should go from
53796 * Dormant to Active status.
53797 */
53798- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53799+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53800 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53801 cmd->se_ordered_id, cmd->sam_task_attr,
53802 dev->transport->name);
53803diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53804index 031018e..90981a1 100644
53805--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53806+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53807@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53808 platform_set_drvdata(pdev, priv);
53809
53810 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53811- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53812- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53813+ pax_open_kernel();
53814+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53815+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53816+ pax_close_kernel();
53817 }
53818 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53819 priv, &int3400_thermal_ops,
53820diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53821index 668fb1b..2737bbe 100644
53822--- a/drivers/thermal/of-thermal.c
53823+++ b/drivers/thermal/of-thermal.c
53824@@ -31,6 +31,7 @@
53825 #include <linux/export.h>
53826 #include <linux/string.h>
53827 #include <linux/thermal.h>
53828+#include <linux/mm.h>
53829
53830 #include "thermal_core.h"
53831
53832@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53833 tz->ops = ops;
53834 tz->sensor_data = data;
53835
53836- tzd->ops->get_temp = of_thermal_get_temp;
53837- tzd->ops->get_trend = of_thermal_get_trend;
53838- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53839+ pax_open_kernel();
53840+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53841+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53842+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53843+ pax_close_kernel();
53844 mutex_unlock(&tzd->lock);
53845
53846 return tzd;
53847@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53848 return;
53849
53850 mutex_lock(&tzd->lock);
53851- tzd->ops->get_temp = NULL;
53852- tzd->ops->get_trend = NULL;
53853- tzd->ops->set_emul_temp = NULL;
53854+ pax_open_kernel();
53855+ *(void **)&tzd->ops->get_temp = NULL;
53856+ *(void **)&tzd->ops->get_trend = NULL;
53857+ *(void **)&tzd->ops->set_emul_temp = NULL;
53858+ pax_close_kernel();
53859
53860 tz->ops = NULL;
53861 tz->sensor_data = NULL;
53862diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53863index 9ea3d9d..53e8792 100644
53864--- a/drivers/thermal/x86_pkg_temp_thermal.c
53865+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53866@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53867 return NOTIFY_OK;
53868 }
53869
53870-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53871+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53872 .notifier_call = pkg_temp_thermal_cpu_callback,
53873 };
53874
53875diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53876index fd66f57..48e6376 100644
53877--- a/drivers/tty/cyclades.c
53878+++ b/drivers/tty/cyclades.c
53879@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53880 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
53881 info->port.count);
53882 #endif
53883- info->port.count++;
53884+ atomic_inc(&info->port.count);
53885 #ifdef CY_DEBUG_COUNT
53886 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
53887- current->pid, info->port.count);
53888+ current->pid, atomic_read(&info->port.count));
53889 #endif
53890
53891 /*
53892@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
53893 for (j = 0; j < cy_card[i].nports; j++) {
53894 info = &cy_card[i].ports[j];
53895
53896- if (info->port.count) {
53897+ if (atomic_read(&info->port.count)) {
53898 /* XXX is the ldisc num worth this? */
53899 struct tty_struct *tty;
53900 struct tty_ldisc *ld;
53901diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
53902index 4fcec1d..5a036f7 100644
53903--- a/drivers/tty/hvc/hvc_console.c
53904+++ b/drivers/tty/hvc/hvc_console.c
53905@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
53906
53907 spin_lock_irqsave(&hp->port.lock, flags);
53908 /* Check and then increment for fast path open. */
53909- if (hp->port.count++ > 0) {
53910+ if (atomic_inc_return(&hp->port.count) > 1) {
53911 spin_unlock_irqrestore(&hp->port.lock, flags);
53912 hvc_kick();
53913 return 0;
53914@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53915
53916 spin_lock_irqsave(&hp->port.lock, flags);
53917
53918- if (--hp->port.count == 0) {
53919+ if (atomic_dec_return(&hp->port.count) == 0) {
53920 spin_unlock_irqrestore(&hp->port.lock, flags);
53921 /* We are done with the tty pointer now. */
53922 tty_port_tty_set(&hp->port, NULL);
53923@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53924 */
53925 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
53926 } else {
53927- if (hp->port.count < 0)
53928+ if (atomic_read(&hp->port.count) < 0)
53929 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
53930- hp->vtermno, hp->port.count);
53931+ hp->vtermno, atomic_read(&hp->port.count));
53932 spin_unlock_irqrestore(&hp->port.lock, flags);
53933 }
53934 }
53935@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
53936 * open->hangup case this can be called after the final close so prevent
53937 * that from happening for now.
53938 */
53939- if (hp->port.count <= 0) {
53940+ if (atomic_read(&hp->port.count) <= 0) {
53941 spin_unlock_irqrestore(&hp->port.lock, flags);
53942 return;
53943 }
53944
53945- hp->port.count = 0;
53946+ atomic_set(&hp->port.count, 0);
53947 spin_unlock_irqrestore(&hp->port.lock, flags);
53948 tty_port_tty_set(&hp->port, NULL);
53949
53950@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53951 return -EPIPE;
53952
53953 /* FIXME what's this (unprotected) check for? */
53954- if (hp->port.count <= 0)
53955+ if (atomic_read(&hp->port.count) <= 0)
53956 return -EIO;
53957
53958 spin_lock_irqsave(&hp->lock, flags);
53959diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
53960index 81ff7e1..dfb7b71 100644
53961--- a/drivers/tty/hvc/hvcs.c
53962+++ b/drivers/tty/hvc/hvcs.c
53963@@ -83,6 +83,7 @@
53964 #include <asm/hvcserver.h>
53965 #include <asm/uaccess.h>
53966 #include <asm/vio.h>
53967+#include <asm/local.h>
53968
53969 /*
53970 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
53971@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
53972
53973 spin_lock_irqsave(&hvcsd->lock, flags);
53974
53975- if (hvcsd->port.count > 0) {
53976+ if (atomic_read(&hvcsd->port.count) > 0) {
53977 spin_unlock_irqrestore(&hvcsd->lock, flags);
53978 printk(KERN_INFO "HVCS: vterm state unchanged. "
53979 "The hvcs device node is still in use.\n");
53980@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
53981 }
53982 }
53983
53984- hvcsd->port.count = 0;
53985+ atomic_set(&hvcsd->port.count, 0);
53986 hvcsd->port.tty = tty;
53987 tty->driver_data = hvcsd;
53988
53989@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
53990 unsigned long flags;
53991
53992 spin_lock_irqsave(&hvcsd->lock, flags);
53993- hvcsd->port.count++;
53994+ atomic_inc(&hvcsd->port.count);
53995 hvcsd->todo_mask |= HVCS_SCHED_READ;
53996 spin_unlock_irqrestore(&hvcsd->lock, flags);
53997
53998@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53999 hvcsd = tty->driver_data;
54000
54001 spin_lock_irqsave(&hvcsd->lock, flags);
54002- if (--hvcsd->port.count == 0) {
54003+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54004
54005 vio_disable_interrupts(hvcsd->vdev);
54006
54007@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54008
54009 free_irq(irq, hvcsd);
54010 return;
54011- } else if (hvcsd->port.count < 0) {
54012+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54013 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54014 " is missmanaged.\n",
54015- hvcsd->vdev->unit_address, hvcsd->port.count);
54016+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54017 }
54018
54019 spin_unlock_irqrestore(&hvcsd->lock, flags);
54020@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54021
54022 spin_lock_irqsave(&hvcsd->lock, flags);
54023 /* Preserve this so that we know how many kref refs to put */
54024- temp_open_count = hvcsd->port.count;
54025+ temp_open_count = atomic_read(&hvcsd->port.count);
54026
54027 /*
54028 * Don't kref put inside the spinlock because the destruction
54029@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54030 tty->driver_data = NULL;
54031 hvcsd->port.tty = NULL;
54032
54033- hvcsd->port.count = 0;
54034+ atomic_set(&hvcsd->port.count, 0);
54035
54036 /* This will drop any buffered data on the floor which is OK in a hangup
54037 * scenario. */
54038@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54039 * the middle of a write operation? This is a crummy place to do this
54040 * but we want to keep it all in the spinlock.
54041 */
54042- if (hvcsd->port.count <= 0) {
54043+ if (atomic_read(&hvcsd->port.count) <= 0) {
54044 spin_unlock_irqrestore(&hvcsd->lock, flags);
54045 return -ENODEV;
54046 }
54047@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54048 {
54049 struct hvcs_struct *hvcsd = tty->driver_data;
54050
54051- if (!hvcsd || hvcsd->port.count <= 0)
54052+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54053 return 0;
54054
54055 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54056diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54057index 4190199..06d5bfa 100644
54058--- a/drivers/tty/hvc/hvsi.c
54059+++ b/drivers/tty/hvc/hvsi.c
54060@@ -85,7 +85,7 @@ struct hvsi_struct {
54061 int n_outbuf;
54062 uint32_t vtermno;
54063 uint32_t virq;
54064- atomic_t seqno; /* HVSI packet sequence number */
54065+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54066 uint16_t mctrl;
54067 uint8_t state; /* HVSI protocol state */
54068 uint8_t flags;
54069@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54070
54071 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54072 packet.hdr.len = sizeof(struct hvsi_query_response);
54073- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54074+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54075 packet.verb = VSV_SEND_VERSION_NUMBER;
54076 packet.u.version = HVSI_VERSION;
54077 packet.query_seqno = query_seqno+1;
54078@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54079
54080 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54081 packet.hdr.len = sizeof(struct hvsi_query);
54082- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54083+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54084 packet.verb = verb;
54085
54086 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54087@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54088 int wrote;
54089
54090 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54091- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54092+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54093 packet.hdr.len = sizeof(struct hvsi_control);
54094 packet.verb = VSV_SET_MODEM_CTL;
54095 packet.mask = HVSI_TSDTR;
54096@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54097 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54098
54099 packet.hdr.type = VS_DATA_PACKET_HEADER;
54100- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54101+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54102 packet.hdr.len = count + sizeof(struct hvsi_header);
54103 memcpy(&packet.data, buf, count);
54104
54105@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54106 struct hvsi_control packet __ALIGNED__;
54107
54108 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54109- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54110+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54111 packet.hdr.len = 6;
54112 packet.verb = VSV_CLOSE_PROTOCOL;
54113
54114@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54115
54116 tty_port_tty_set(&hp->port, tty);
54117 spin_lock_irqsave(&hp->lock, flags);
54118- hp->port.count++;
54119+ atomic_inc(&hp->port.count);
54120 atomic_set(&hp->seqno, 0);
54121 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54122 spin_unlock_irqrestore(&hp->lock, flags);
54123@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54124
54125 spin_lock_irqsave(&hp->lock, flags);
54126
54127- if (--hp->port.count == 0) {
54128+ if (atomic_dec_return(&hp->port.count) == 0) {
54129 tty_port_tty_set(&hp->port, NULL);
54130 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54131
54132@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54133
54134 spin_lock_irqsave(&hp->lock, flags);
54135 }
54136- } else if (hp->port.count < 0)
54137+ } else if (atomic_read(&hp->port.count) < 0)
54138 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54139- hp - hvsi_ports, hp->port.count);
54140+ hp - hvsi_ports, atomic_read(&hp->port.count));
54141
54142 spin_unlock_irqrestore(&hp->lock, flags);
54143 }
54144@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54145 tty_port_tty_set(&hp->port, NULL);
54146
54147 spin_lock_irqsave(&hp->lock, flags);
54148- hp->port.count = 0;
54149+ atomic_set(&hp->port.count, 0);
54150 hp->n_outbuf = 0;
54151 spin_unlock_irqrestore(&hp->lock, flags);
54152 }
54153diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54154index a270f04..7c77b5d 100644
54155--- a/drivers/tty/hvc/hvsi_lib.c
54156+++ b/drivers/tty/hvc/hvsi_lib.c
54157@@ -8,7 +8,7 @@
54158
54159 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54160 {
54161- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54162+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54163
54164 /* Assumes that always succeeds, works in practice */
54165 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54166@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54167
54168 /* Reset state */
54169 pv->established = 0;
54170- atomic_set(&pv->seqno, 0);
54171+ atomic_set_unchecked(&pv->seqno, 0);
54172
54173 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54174
54175diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54176index 345cebb..d5a1e9e 100644
54177--- a/drivers/tty/ipwireless/tty.c
54178+++ b/drivers/tty/ipwireless/tty.c
54179@@ -28,6 +28,7 @@
54180 #include <linux/tty_driver.h>
54181 #include <linux/tty_flip.h>
54182 #include <linux/uaccess.h>
54183+#include <asm/local.h>
54184
54185 #include "tty.h"
54186 #include "network.h"
54187@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54188 return -ENODEV;
54189
54190 mutex_lock(&tty->ipw_tty_mutex);
54191- if (tty->port.count == 0)
54192+ if (atomic_read(&tty->port.count) == 0)
54193 tty->tx_bytes_queued = 0;
54194
54195- tty->port.count++;
54196+ atomic_inc(&tty->port.count);
54197
54198 tty->port.tty = linux_tty;
54199 linux_tty->driver_data = tty;
54200@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54201
54202 static void do_ipw_close(struct ipw_tty *tty)
54203 {
54204- tty->port.count--;
54205-
54206- if (tty->port.count == 0) {
54207+ if (atomic_dec_return(&tty->port.count) == 0) {
54208 struct tty_struct *linux_tty = tty->port.tty;
54209
54210 if (linux_tty != NULL) {
54211@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54212 return;
54213
54214 mutex_lock(&tty->ipw_tty_mutex);
54215- if (tty->port.count == 0) {
54216+ if (atomic_read(&tty->port.count) == 0) {
54217 mutex_unlock(&tty->ipw_tty_mutex);
54218 return;
54219 }
54220@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54221
54222 mutex_lock(&tty->ipw_tty_mutex);
54223
54224- if (!tty->port.count) {
54225+ if (!atomic_read(&tty->port.count)) {
54226 mutex_unlock(&tty->ipw_tty_mutex);
54227 return;
54228 }
54229@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54230 return -ENODEV;
54231
54232 mutex_lock(&tty->ipw_tty_mutex);
54233- if (!tty->port.count) {
54234+ if (!atomic_read(&tty->port.count)) {
54235 mutex_unlock(&tty->ipw_tty_mutex);
54236 return -EINVAL;
54237 }
54238@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54239 if (!tty)
54240 return -ENODEV;
54241
54242- if (!tty->port.count)
54243+ if (!atomic_read(&tty->port.count))
54244 return -EINVAL;
54245
54246 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54247@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54248 if (!tty)
54249 return 0;
54250
54251- if (!tty->port.count)
54252+ if (!atomic_read(&tty->port.count))
54253 return 0;
54254
54255 return tty->tx_bytes_queued;
54256@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54257 if (!tty)
54258 return -ENODEV;
54259
54260- if (!tty->port.count)
54261+ if (!atomic_read(&tty->port.count))
54262 return -EINVAL;
54263
54264 return get_control_lines(tty);
54265@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54266 if (!tty)
54267 return -ENODEV;
54268
54269- if (!tty->port.count)
54270+ if (!atomic_read(&tty->port.count))
54271 return -EINVAL;
54272
54273 return set_control_lines(tty, set, clear);
54274@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54275 if (!tty)
54276 return -ENODEV;
54277
54278- if (!tty->port.count)
54279+ if (!atomic_read(&tty->port.count))
54280 return -EINVAL;
54281
54282 /* FIXME: Exactly how is the tty object locked here .. */
54283@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54284 * are gone */
54285 mutex_lock(&ttyj->ipw_tty_mutex);
54286 }
54287- while (ttyj->port.count)
54288+ while (atomic_read(&ttyj->port.count))
54289 do_ipw_close(ttyj);
54290 ipwireless_disassociate_network_ttys(network,
54291 ttyj->channel_idx);
54292diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54293index 14c54e0..1efd4f2 100644
54294--- a/drivers/tty/moxa.c
54295+++ b/drivers/tty/moxa.c
54296@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54297 }
54298
54299 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54300- ch->port.count++;
54301+ atomic_inc(&ch->port.count);
54302 tty->driver_data = ch;
54303 tty_port_tty_set(&ch->port, tty);
54304 mutex_lock(&ch->port.mutex);
54305diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54306index 2c34c32..81d10e1 100644
54307--- a/drivers/tty/n_gsm.c
54308+++ b/drivers/tty/n_gsm.c
54309@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54310 spin_lock_init(&dlci->lock);
54311 mutex_init(&dlci->mutex);
54312 dlci->fifo = &dlci->_fifo;
54313- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54314+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54315 kfree(dlci);
54316 return NULL;
54317 }
54318@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54319 struct gsm_dlci *dlci = tty->driver_data;
54320 struct tty_port *port = &dlci->port;
54321
54322- port->count++;
54323+ atomic_inc(&port->count);
54324 tty_port_tty_set(port, tty);
54325
54326 dlci->modem_rx = 0;
54327diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54328index 16ed0b6..7d944b4 100644
54329--- a/drivers/tty/n_tty.c
54330+++ b/drivers/tty/n_tty.c
54331@@ -116,7 +116,7 @@ struct n_tty_data {
54332 int minimum_to_wake;
54333
54334 /* consumer-published */
54335- size_t read_tail;
54336+ size_t read_tail __intentional_overflow(-1);
54337 size_t line_start;
54338
54339 /* protected by output lock */
54340@@ -2582,6 +2582,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54341 {
54342 *ops = tty_ldisc_N_TTY;
54343 ops->owner = NULL;
54344- ops->refcount = ops->flags = 0;
54345+ atomic_set(&ops->refcount, 0);
54346+ ops->flags = 0;
54347 }
54348 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54349diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54350index 4d5e840..a2340a6 100644
54351--- a/drivers/tty/pty.c
54352+++ b/drivers/tty/pty.c
54353@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54354 panic("Couldn't register Unix98 pts driver");
54355
54356 /* Now create the /dev/ptmx special device */
54357+ pax_open_kernel();
54358 tty_default_fops(&ptmx_fops);
54359- ptmx_fops.open = ptmx_open;
54360+ *(void **)&ptmx_fops.open = ptmx_open;
54361+ pax_close_kernel();
54362
54363 cdev_init(&ptmx_cdev, &ptmx_fops);
54364 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54365diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54366index c8dd8dc..dca6cfd 100644
54367--- a/drivers/tty/rocket.c
54368+++ b/drivers/tty/rocket.c
54369@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54370 tty->driver_data = info;
54371 tty_port_tty_set(port, tty);
54372
54373- if (port->count++ == 0) {
54374+ if (atomic_inc_return(&port->count) == 1) {
54375 atomic_inc(&rp_num_ports_open);
54376
54377 #ifdef ROCKET_DEBUG_OPEN
54378@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54379 #endif
54380 }
54381 #ifdef ROCKET_DEBUG_OPEN
54382- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54383+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54384 #endif
54385
54386 /*
54387@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54388 spin_unlock_irqrestore(&info->port.lock, flags);
54389 return;
54390 }
54391- if (info->port.count)
54392+ if (atomic_read(&info->port.count))
54393 atomic_dec(&rp_num_ports_open);
54394 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54395 spin_unlock_irqrestore(&info->port.lock, flags);
54396diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
54397index 4506e40..ac0b470 100644
54398--- a/drivers/tty/serial/8250/8250_core.c
54399+++ b/drivers/tty/serial/8250/8250_core.c
54400@@ -3241,9 +3241,9 @@ static void univ8250_release_port(struct uart_port *port)
54401
54402 static void univ8250_rsa_support(struct uart_ops *ops)
54403 {
54404- ops->config_port = univ8250_config_port;
54405- ops->request_port = univ8250_request_port;
54406- ops->release_port = univ8250_release_port;
54407+ *(void **)&ops->config_port = univ8250_config_port;
54408+ *(void **)&ops->request_port = univ8250_request_port;
54409+ *(void **)&ops->release_port = univ8250_release_port;
54410 }
54411
54412 #else
54413@@ -3286,8 +3286,10 @@ static void __init serial8250_isa_init_ports(void)
54414 }
54415
54416 /* chain base port ops to support Remote Supervisor Adapter */
54417- univ8250_port_ops = *base_ops;
54418+ pax_open_kernel();
54419+ memcpy((void *)&univ8250_port_ops, base_ops, sizeof univ8250_port_ops);
54420 univ8250_rsa_support(&univ8250_port_ops);
54421+ pax_close_kernel();
54422
54423 if (share_irqs)
54424 irqflag = IRQF_SHARED;
54425diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54426index aa28209..e08fb85 100644
54427--- a/drivers/tty/serial/ioc4_serial.c
54428+++ b/drivers/tty/serial/ioc4_serial.c
54429@@ -437,7 +437,7 @@ struct ioc4_soft {
54430 } is_intr_info[MAX_IOC4_INTR_ENTS];
54431
54432 /* Number of entries active in the above array */
54433- atomic_t is_num_intrs;
54434+ atomic_unchecked_t is_num_intrs;
54435 } is_intr_type[IOC4_NUM_INTR_TYPES];
54436
54437 /* is_ir_lock must be held while
54438@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54439 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54440 || (type == IOC4_OTHER_INTR_TYPE)));
54441
54442- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54443+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54444 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54445
54446 /* Save off the lower level interrupt handler */
54447@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54448
54449 soft = arg;
54450 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54451- num_intrs = (int)atomic_read(
54452+ num_intrs = (int)atomic_read_unchecked(
54453 &soft->is_intr_type[intr_type].is_num_intrs);
54454
54455 this_mir = this_ir = pending_intrs(soft, intr_type);
54456diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54457index 129dc5b..1da5bb8 100644
54458--- a/drivers/tty/serial/kgdb_nmi.c
54459+++ b/drivers/tty/serial/kgdb_nmi.c
54460@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54461 * I/O utilities that messages sent to the console will automatically
54462 * be displayed on the dbg_io.
54463 */
54464- dbg_io_ops->is_console = true;
54465+ pax_open_kernel();
54466+ *(int *)&dbg_io_ops->is_console = true;
54467+ pax_close_kernel();
54468
54469 return 0;
54470 }
54471diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54472index a260cde..6b2b5ce 100644
54473--- a/drivers/tty/serial/kgdboc.c
54474+++ b/drivers/tty/serial/kgdboc.c
54475@@ -24,8 +24,9 @@
54476 #define MAX_CONFIG_LEN 40
54477
54478 static struct kgdb_io kgdboc_io_ops;
54479+static struct kgdb_io kgdboc_io_ops_console;
54480
54481-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54482+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54483 static int configured = -1;
54484
54485 static char config[MAX_CONFIG_LEN];
54486@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54487 kgdboc_unregister_kbd();
54488 if (configured == 1)
54489 kgdb_unregister_io_module(&kgdboc_io_ops);
54490+ else if (configured == 2)
54491+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54492 }
54493
54494 static int configure_kgdboc(void)
54495@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54496 int err;
54497 char *cptr = config;
54498 struct console *cons;
54499+ int is_console = 0;
54500
54501 err = kgdboc_option_setup(config);
54502 if (err || !strlen(config) || isspace(config[0]))
54503 goto noconfig;
54504
54505 err = -ENODEV;
54506- kgdboc_io_ops.is_console = 0;
54507 kgdb_tty_driver = NULL;
54508
54509 kgdboc_use_kms = 0;
54510@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54511 int idx;
54512 if (cons->device && cons->device(cons, &idx) == p &&
54513 idx == tty_line) {
54514- kgdboc_io_ops.is_console = 1;
54515+ is_console = 1;
54516 break;
54517 }
54518 cons = cons->next;
54519@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54520 kgdb_tty_line = tty_line;
54521
54522 do_register:
54523- err = kgdb_register_io_module(&kgdboc_io_ops);
54524+ if (is_console) {
54525+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54526+ configured = 2;
54527+ } else {
54528+ err = kgdb_register_io_module(&kgdboc_io_ops);
54529+ configured = 1;
54530+ }
54531 if (err)
54532 goto noconfig;
54533
54534@@ -205,8 +214,6 @@ do_register:
54535 if (err)
54536 goto nmi_con_failed;
54537
54538- configured = 1;
54539-
54540 return 0;
54541
54542 nmi_con_failed:
54543@@ -223,7 +230,7 @@ noconfig:
54544 static int __init init_kgdboc(void)
54545 {
54546 /* Already configured? */
54547- if (configured == 1)
54548+ if (configured >= 1)
54549 return 0;
54550
54551 return configure_kgdboc();
54552@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54553 if (config[len - 1] == '\n')
54554 config[len - 1] = '\0';
54555
54556- if (configured == 1)
54557+ if (configured >= 1)
54558 cleanup_kgdboc();
54559
54560 /* Go and configure with the new params. */
54561@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54562 .post_exception = kgdboc_post_exp_handler,
54563 };
54564
54565+static struct kgdb_io kgdboc_io_ops_console = {
54566+ .name = "kgdboc",
54567+ .read_char = kgdboc_get_char,
54568+ .write_char = kgdboc_put_char,
54569+ .pre_exception = kgdboc_pre_exp_handler,
54570+ .post_exception = kgdboc_post_exp_handler,
54571+ .is_console = 1
54572+};
54573+
54574 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54575 /* This is only available if kgdboc is a built in for early debugging */
54576 static int __init kgdboc_early_init(char *opt)
54577diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54578index b73889c..9f74f0a 100644
54579--- a/drivers/tty/serial/msm_serial.c
54580+++ b/drivers/tty/serial/msm_serial.c
54581@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54582 .cons = MSM_CONSOLE,
54583 };
54584
54585-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54586+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54587
54588 static const struct of_device_id msm_uartdm_table[] = {
54589 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54590@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54591 line = pdev->id;
54592
54593 if (line < 0)
54594- line = atomic_inc_return(&msm_uart_next_id) - 1;
54595+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54596
54597 if (unlikely(line < 0 || line >= UART_NR))
54598 return -ENXIO;
54599diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54600index a0ae942..befa48d 100644
54601--- a/drivers/tty/serial/samsung.c
54602+++ b/drivers/tty/serial/samsung.c
54603@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54604 ourport->tx_in_progress = 0;
54605 }
54606
54607+static int s3c64xx_serial_startup(struct uart_port *port);
54608 static int s3c24xx_serial_startup(struct uart_port *port)
54609 {
54610 struct s3c24xx_uart_port *ourport = to_ourport(port);
54611 int ret;
54612
54613+ /* Startup sequence is different for s3c64xx and higher SoC's */
54614+ if (s3c24xx_serial_has_interrupt_mask(port))
54615+ return s3c64xx_serial_startup(port);
54616+
54617 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54618 port, (unsigned long long)port->mapbase, port->membase);
54619
54620@@ -1698,10 +1703,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54621 /* setup info for port */
54622 port->dev = &platdev->dev;
54623
54624- /* Startup sequence is different for s3c64xx and higher SoC's */
54625- if (s3c24xx_serial_has_interrupt_mask(port))
54626- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54627-
54628 port->uartclk = 1;
54629
54630 if (cfg->uart_flags & UPF_CONS_FLOW) {
54631diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54632index ec54044..fc93d3f 100644
54633--- a/drivers/tty/serial/serial_core.c
54634+++ b/drivers/tty/serial/serial_core.c
54635@@ -1376,7 +1376,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54636 state = drv->state + tty->index;
54637 port = &state->port;
54638 spin_lock_irq(&port->lock);
54639- --port->count;
54640+ atomic_dec(&port->count);
54641 spin_unlock_irq(&port->lock);
54642 return;
54643 }
54644@@ -1386,7 +1386,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54645
54646 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54647
54648- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54649+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54650 return;
54651
54652 /*
54653@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54654 uart_flush_buffer(tty);
54655 uart_shutdown(tty, state);
54656 spin_lock_irqsave(&port->lock, flags);
54657- port->count = 0;
54658+ atomic_set(&port->count, 0);
54659 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54660 spin_unlock_irqrestore(&port->lock, flags);
54661 tty_port_tty_set(port, NULL);
54662@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54663 pr_debug("uart_open(%d) called\n", line);
54664
54665 spin_lock_irq(&port->lock);
54666- ++port->count;
54667+ atomic_inc(&port->count);
54668 spin_unlock_irq(&port->lock);
54669
54670 /*
54671diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
54672index b1c6bd3..5f038e2 100644
54673--- a/drivers/tty/serial/uartlite.c
54674+++ b/drivers/tty/serial/uartlite.c
54675@@ -341,13 +341,13 @@ static int ulite_request_port(struct uart_port *port)
54676 return -EBUSY;
54677 }
54678
54679- port->private_data = &uartlite_be;
54680+ port->private_data = (void *)&uartlite_be;
54681 ret = uart_in32(ULITE_CONTROL, port);
54682 uart_out32(ULITE_CONTROL_RST_TX, ULITE_CONTROL, port);
54683 ret = uart_in32(ULITE_STATUS, port);
54684 /* Endianess detection */
54685 if ((ret & ULITE_STATUS_TXEMPTY) != ULITE_STATUS_TXEMPTY)
54686- port->private_data = &uartlite_le;
54687+ port->private_data = (void *)&uartlite_le;
54688
54689 return 0;
54690 }
54691diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54692index b799170..87dafd5 100644
54693--- a/drivers/tty/synclink.c
54694+++ b/drivers/tty/synclink.c
54695@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54696
54697 if (debug_level >= DEBUG_LEVEL_INFO)
54698 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54699- __FILE__,__LINE__, info->device_name, info->port.count);
54700+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54701
54702 if (tty_port_close_start(&info->port, tty, filp) == 0)
54703 goto cleanup;
54704@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54705 cleanup:
54706 if (debug_level >= DEBUG_LEVEL_INFO)
54707 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54708- tty->driver->name, info->port.count);
54709+ tty->driver->name, atomic_read(&info->port.count));
54710
54711 } /* end of mgsl_close() */
54712
54713@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54714
54715 mgsl_flush_buffer(tty);
54716 shutdown(info);
54717-
54718- info->port.count = 0;
54719+
54720+ atomic_set(&info->port.count, 0);
54721 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54722 info->port.tty = NULL;
54723
54724@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54725
54726 if (debug_level >= DEBUG_LEVEL_INFO)
54727 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54728- __FILE__,__LINE__, tty->driver->name, port->count );
54729+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54730
54731 spin_lock_irqsave(&info->irq_spinlock, flags);
54732- port->count--;
54733+ atomic_dec(&port->count);
54734 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54735 port->blocked_open++;
54736
54737@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54738
54739 if (debug_level >= DEBUG_LEVEL_INFO)
54740 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54741- __FILE__,__LINE__, tty->driver->name, port->count );
54742+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54743
54744 tty_unlock(tty);
54745 schedule();
54746@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54747
54748 /* FIXME: Racy on hangup during close wait */
54749 if (!tty_hung_up_p(filp))
54750- port->count++;
54751+ atomic_inc(&port->count);
54752 port->blocked_open--;
54753
54754 if (debug_level >= DEBUG_LEVEL_INFO)
54755 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54756- __FILE__,__LINE__, tty->driver->name, port->count );
54757+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54758
54759 if (!retval)
54760 port->flags |= ASYNC_NORMAL_ACTIVE;
54761@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54762
54763 if (debug_level >= DEBUG_LEVEL_INFO)
54764 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54765- __FILE__,__LINE__,tty->driver->name, info->port.count);
54766+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54767
54768 /* If port is closing, signal caller to try again */
54769 if (info->port.flags & ASYNC_CLOSING){
54770@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54771 spin_unlock_irqrestore(&info->netlock, flags);
54772 goto cleanup;
54773 }
54774- info->port.count++;
54775+ atomic_inc(&info->port.count);
54776 spin_unlock_irqrestore(&info->netlock, flags);
54777
54778- if (info->port.count == 1) {
54779+ if (atomic_read(&info->port.count) == 1) {
54780 /* 1st open on this device, init hardware */
54781 retval = startup(info);
54782 if (retval < 0)
54783@@ -3442,8 +3442,8 @@ cleanup:
54784 if (retval) {
54785 if (tty->count == 1)
54786 info->port.tty = NULL; /* tty layer will release tty struct */
54787- if(info->port.count)
54788- info->port.count--;
54789+ if (atomic_read(&info->port.count))
54790+ atomic_dec(&info->port.count);
54791 }
54792
54793 return retval;
54794@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54795 unsigned short new_crctype;
54796
54797 /* return error if TTY interface open */
54798- if (info->port.count)
54799+ if (atomic_read(&info->port.count))
54800 return -EBUSY;
54801
54802 switch (encoding)
54803@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54804
54805 /* arbitrate between network and tty opens */
54806 spin_lock_irqsave(&info->netlock, flags);
54807- if (info->port.count != 0 || info->netcount != 0) {
54808+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54809 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54810 spin_unlock_irqrestore(&info->netlock, flags);
54811 return -EBUSY;
54812@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54813 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54814
54815 /* return error if TTY interface open */
54816- if (info->port.count)
54817+ if (atomic_read(&info->port.count))
54818 return -EBUSY;
54819
54820 if (cmd != SIOCWANDEV)
54821diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54822index 0e8c39b..e0cb171 100644
54823--- a/drivers/tty/synclink_gt.c
54824+++ b/drivers/tty/synclink_gt.c
54825@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54826 tty->driver_data = info;
54827 info->port.tty = tty;
54828
54829- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54830+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54831
54832 /* If port is closing, signal caller to try again */
54833 if (info->port.flags & ASYNC_CLOSING){
54834@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54835 mutex_unlock(&info->port.mutex);
54836 goto cleanup;
54837 }
54838- info->port.count++;
54839+ atomic_inc(&info->port.count);
54840 spin_unlock_irqrestore(&info->netlock, flags);
54841
54842- if (info->port.count == 1) {
54843+ if (atomic_read(&info->port.count) == 1) {
54844 /* 1st open on this device, init hardware */
54845 retval = startup(info);
54846 if (retval < 0) {
54847@@ -715,8 +715,8 @@ cleanup:
54848 if (retval) {
54849 if (tty->count == 1)
54850 info->port.tty = NULL; /* tty layer will release tty struct */
54851- if(info->port.count)
54852- info->port.count--;
54853+ if(atomic_read(&info->port.count))
54854+ atomic_dec(&info->port.count);
54855 }
54856
54857 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54858@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54859
54860 if (sanity_check(info, tty->name, "close"))
54861 return;
54862- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54863+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54864
54865 if (tty_port_close_start(&info->port, tty, filp) == 0)
54866 goto cleanup;
54867@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54868 tty_port_close_end(&info->port, tty);
54869 info->port.tty = NULL;
54870 cleanup:
54871- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54872+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54873 }
54874
54875 static void hangup(struct tty_struct *tty)
54876@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54877 shutdown(info);
54878
54879 spin_lock_irqsave(&info->port.lock, flags);
54880- info->port.count = 0;
54881+ atomic_set(&info->port.count, 0);
54882 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54883 info->port.tty = NULL;
54884 spin_unlock_irqrestore(&info->port.lock, flags);
54885@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54886 unsigned short new_crctype;
54887
54888 /* return error if TTY interface open */
54889- if (info->port.count)
54890+ if (atomic_read(&info->port.count))
54891 return -EBUSY;
54892
54893 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54894@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54895
54896 /* arbitrate between network and tty opens */
54897 spin_lock_irqsave(&info->netlock, flags);
54898- if (info->port.count != 0 || info->netcount != 0) {
54899+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54900 DBGINFO(("%s hdlc_open busy\n", dev->name));
54901 spin_unlock_irqrestore(&info->netlock, flags);
54902 return -EBUSY;
54903@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54904 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54905
54906 /* return error if TTY interface open */
54907- if (info->port.count)
54908+ if (atomic_read(&info->port.count))
54909 return -EBUSY;
54910
54911 if (cmd != SIOCWANDEV)
54912@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54913 if (port == NULL)
54914 continue;
54915 spin_lock(&port->lock);
54916- if ((port->port.count || port->netcount) &&
54917+ if ((atomic_read(&port->port.count) || port->netcount) &&
54918 port->pending_bh && !port->bh_running &&
54919 !port->bh_requested) {
54920 DBGISR(("%s bh queued\n", port->device_name));
54921@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54922 add_wait_queue(&port->open_wait, &wait);
54923
54924 spin_lock_irqsave(&info->lock, flags);
54925- port->count--;
54926+ atomic_dec(&port->count);
54927 spin_unlock_irqrestore(&info->lock, flags);
54928 port->blocked_open++;
54929
54930@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54931 remove_wait_queue(&port->open_wait, &wait);
54932
54933 if (!tty_hung_up_p(filp))
54934- port->count++;
54935+ atomic_inc(&port->count);
54936 port->blocked_open--;
54937
54938 if (!retval)
54939diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
54940index c3f9091..abe4601 100644
54941--- a/drivers/tty/synclinkmp.c
54942+++ b/drivers/tty/synclinkmp.c
54943@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54944
54945 if (debug_level >= DEBUG_LEVEL_INFO)
54946 printk("%s(%d):%s open(), old ref count = %d\n",
54947- __FILE__,__LINE__,tty->driver->name, info->port.count);
54948+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54949
54950 /* If port is closing, signal caller to try again */
54951 if (info->port.flags & ASYNC_CLOSING){
54952@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54953 spin_unlock_irqrestore(&info->netlock, flags);
54954 goto cleanup;
54955 }
54956- info->port.count++;
54957+ atomic_inc(&info->port.count);
54958 spin_unlock_irqrestore(&info->netlock, flags);
54959
54960- if (info->port.count == 1) {
54961+ if (atomic_read(&info->port.count) == 1) {
54962 /* 1st open on this device, init hardware */
54963 retval = startup(info);
54964 if (retval < 0)
54965@@ -796,8 +796,8 @@ cleanup:
54966 if (retval) {
54967 if (tty->count == 1)
54968 info->port.tty = NULL; /* tty layer will release tty struct */
54969- if(info->port.count)
54970- info->port.count--;
54971+ if(atomic_read(&info->port.count))
54972+ atomic_dec(&info->port.count);
54973 }
54974
54975 return retval;
54976@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54977
54978 if (debug_level >= DEBUG_LEVEL_INFO)
54979 printk("%s(%d):%s close() entry, count=%d\n",
54980- __FILE__,__LINE__, info->device_name, info->port.count);
54981+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54982
54983 if (tty_port_close_start(&info->port, tty, filp) == 0)
54984 goto cleanup;
54985@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54986 cleanup:
54987 if (debug_level >= DEBUG_LEVEL_INFO)
54988 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
54989- tty->driver->name, info->port.count);
54990+ tty->driver->name, atomic_read(&info->port.count));
54991 }
54992
54993 /* Called by tty_hangup() when a hangup is signaled.
54994@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
54995 shutdown(info);
54996
54997 spin_lock_irqsave(&info->port.lock, flags);
54998- info->port.count = 0;
54999+ atomic_set(&info->port.count, 0);
55000 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55001 info->port.tty = NULL;
55002 spin_unlock_irqrestore(&info->port.lock, flags);
55003@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55004 unsigned short new_crctype;
55005
55006 /* return error if TTY interface open */
55007- if (info->port.count)
55008+ if (atomic_read(&info->port.count))
55009 return -EBUSY;
55010
55011 switch (encoding)
55012@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55013
55014 /* arbitrate between network and tty opens */
55015 spin_lock_irqsave(&info->netlock, flags);
55016- if (info->port.count != 0 || info->netcount != 0) {
55017+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55018 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55019 spin_unlock_irqrestore(&info->netlock, flags);
55020 return -EBUSY;
55021@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55022 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55023
55024 /* return error if TTY interface open */
55025- if (info->port.count)
55026+ if (atomic_read(&info->port.count))
55027 return -EBUSY;
55028
55029 if (cmd != SIOCWANDEV)
55030@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55031 * do not request bottom half processing if the
55032 * device is not open in a normal mode.
55033 */
55034- if ( port && (port->port.count || port->netcount) &&
55035+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55036 port->pending_bh && !port->bh_running &&
55037 !port->bh_requested ) {
55038 if ( debug_level >= DEBUG_LEVEL_ISR )
55039@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55040
55041 if (debug_level >= DEBUG_LEVEL_INFO)
55042 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55043- __FILE__,__LINE__, tty->driver->name, port->count );
55044+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55045
55046 spin_lock_irqsave(&info->lock, flags);
55047- port->count--;
55048+ atomic_dec(&port->count);
55049 spin_unlock_irqrestore(&info->lock, flags);
55050 port->blocked_open++;
55051
55052@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55053
55054 if (debug_level >= DEBUG_LEVEL_INFO)
55055 printk("%s(%d):%s block_til_ready() count=%d\n",
55056- __FILE__,__LINE__, tty->driver->name, port->count );
55057+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55058
55059 tty_unlock(tty);
55060 schedule();
55061@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55062 set_current_state(TASK_RUNNING);
55063 remove_wait_queue(&port->open_wait, &wait);
55064 if (!tty_hung_up_p(filp))
55065- port->count++;
55066+ atomic_inc(&port->count);
55067 port->blocked_open--;
55068
55069 if (debug_level >= DEBUG_LEVEL_INFO)
55070 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55071- __FILE__,__LINE__, tty->driver->name, port->count );
55072+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55073
55074 if (!retval)
55075 port->flags |= ASYNC_NORMAL_ACTIVE;
55076diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55077index 9ffdfcf..fd81170 100644
55078--- a/drivers/tty/sysrq.c
55079+++ b/drivers/tty/sysrq.c
55080@@ -1069,7 +1069,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55081 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55082 size_t count, loff_t *ppos)
55083 {
55084- if (count) {
55085+ if (count && capable(CAP_SYS_ADMIN)) {
55086 char c;
55087
55088 if (get_user(c, buf))
55089diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55090index e569546..fbce20c 100644
55091--- a/drivers/tty/tty_io.c
55092+++ b/drivers/tty/tty_io.c
55093@@ -3509,7 +3509,7 @@ EXPORT_SYMBOL(tty_devnum);
55094
55095 void tty_default_fops(struct file_operations *fops)
55096 {
55097- *fops = tty_fops;
55098+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55099 }
55100
55101 /*
55102diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55103index 3737f55..7cef448 100644
55104--- a/drivers/tty/tty_ldisc.c
55105+++ b/drivers/tty/tty_ldisc.c
55106@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55107 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55108 tty_ldiscs[disc] = new_ldisc;
55109 new_ldisc->num = disc;
55110- new_ldisc->refcount = 0;
55111+ atomic_set(&new_ldisc->refcount, 0);
55112 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55113
55114 return ret;
55115@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55116 return -EINVAL;
55117
55118 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55119- if (tty_ldiscs[disc]->refcount)
55120+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55121 ret = -EBUSY;
55122 else
55123 tty_ldiscs[disc] = NULL;
55124@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55125 if (ldops) {
55126 ret = ERR_PTR(-EAGAIN);
55127 if (try_module_get(ldops->owner)) {
55128- ldops->refcount++;
55129+ atomic_inc(&ldops->refcount);
55130 ret = ldops;
55131 }
55132 }
55133@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55134 unsigned long flags;
55135
55136 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55137- ldops->refcount--;
55138+ atomic_dec(&ldops->refcount);
55139 module_put(ldops->owner);
55140 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55141 }
55142diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55143index 40b31835..94d92ae 100644
55144--- a/drivers/tty/tty_port.c
55145+++ b/drivers/tty/tty_port.c
55146@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55147 unsigned long flags;
55148
55149 spin_lock_irqsave(&port->lock, flags);
55150- port->count = 0;
55151+ atomic_set(&port->count, 0);
55152 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55153 tty = port->tty;
55154 if (tty)
55155@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55156
55157 /* The port lock protects the port counts */
55158 spin_lock_irqsave(&port->lock, flags);
55159- port->count--;
55160+ atomic_dec(&port->count);
55161 port->blocked_open++;
55162 spin_unlock_irqrestore(&port->lock, flags);
55163
55164@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55165 we must not mess that up further */
55166 spin_lock_irqsave(&port->lock, flags);
55167 if (!tty_hung_up_p(filp))
55168- port->count++;
55169+ atomic_inc(&port->count);
55170 port->blocked_open--;
55171 if (retval == 0)
55172 port->flags |= ASYNC_NORMAL_ACTIVE;
55173@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55174 return 0;
55175
55176 spin_lock_irqsave(&port->lock, flags);
55177- if (tty->count == 1 && port->count != 1) {
55178+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55179 printk(KERN_WARNING
55180 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55181- port->count);
55182- port->count = 1;
55183+ atomic_read(&port->count));
55184+ atomic_set(&port->count, 1);
55185 }
55186- if (--port->count < 0) {
55187+ if (atomic_dec_return(&port->count) < 0) {
55188 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55189- port->count);
55190- port->count = 0;
55191+ atomic_read(&port->count));
55192+ atomic_set(&port->count, 0);
55193 }
55194
55195- if (port->count) {
55196+ if (atomic_read(&port->count)) {
55197 spin_unlock_irqrestore(&port->lock, flags);
55198 return 0;
55199 }
55200@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55201 struct file *filp)
55202 {
55203 spin_lock_irq(&port->lock);
55204- ++port->count;
55205+ atomic_inc(&port->count);
55206 spin_unlock_irq(&port->lock);
55207 tty_port_tty_set(port, tty);
55208
55209diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55210index 8a89f6e..50b32af 100644
55211--- a/drivers/tty/vt/keyboard.c
55212+++ b/drivers/tty/vt/keyboard.c
55213@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55214 kbd->kbdmode == VC_OFF) &&
55215 value != KVAL(K_SAK))
55216 return; /* SAK is allowed even in raw mode */
55217+
55218+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55219+ {
55220+ void *func = fn_handler[value];
55221+ if (func == fn_show_state || func == fn_show_ptregs ||
55222+ func == fn_show_mem)
55223+ return;
55224+ }
55225+#endif
55226+
55227 fn_handler[value](vc);
55228 }
55229
55230@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55231 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55232 return -EFAULT;
55233
55234- if (!capable(CAP_SYS_TTY_CONFIG))
55235- perm = 0;
55236-
55237 switch (cmd) {
55238 case KDGKBENT:
55239 /* Ensure another thread doesn't free it under us */
55240@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55241 spin_unlock_irqrestore(&kbd_event_lock, flags);
55242 return put_user(val, &user_kbe->kb_value);
55243 case KDSKBENT:
55244+ if (!capable(CAP_SYS_TTY_CONFIG))
55245+ perm = 0;
55246+
55247 if (!perm)
55248 return -EPERM;
55249 if (!i && v == K_NOSUCHMAP) {
55250@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55251 int i, j, k;
55252 int ret;
55253
55254- if (!capable(CAP_SYS_TTY_CONFIG))
55255- perm = 0;
55256-
55257 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55258 if (!kbs) {
55259 ret = -ENOMEM;
55260@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55261 kfree(kbs);
55262 return ((p && *p) ? -EOVERFLOW : 0);
55263 case KDSKBSENT:
55264+ if (!capable(CAP_SYS_TTY_CONFIG))
55265+ perm = 0;
55266+
55267 if (!perm) {
55268 ret = -EPERM;
55269 goto reterr;
55270diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55271index 65bf067..b3b2e13 100644
55272--- a/drivers/uio/uio.c
55273+++ b/drivers/uio/uio.c
55274@@ -25,6 +25,7 @@
55275 #include <linux/kobject.h>
55276 #include <linux/cdev.h>
55277 #include <linux/uio_driver.h>
55278+#include <asm/local.h>
55279
55280 #define UIO_MAX_DEVICES (1U << MINORBITS)
55281
55282@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55283 struct device_attribute *attr, char *buf)
55284 {
55285 struct uio_device *idev = dev_get_drvdata(dev);
55286- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55287+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55288 }
55289 static DEVICE_ATTR_RO(event);
55290
55291@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55292 {
55293 struct uio_device *idev = info->uio_dev;
55294
55295- atomic_inc(&idev->event);
55296+ atomic_inc_unchecked(&idev->event);
55297 wake_up_interruptible(&idev->wait);
55298 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55299 }
55300@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55301 }
55302
55303 listener->dev = idev;
55304- listener->event_count = atomic_read(&idev->event);
55305+ listener->event_count = atomic_read_unchecked(&idev->event);
55306 filep->private_data = listener;
55307
55308 if (idev->info->open) {
55309@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55310 return -EIO;
55311
55312 poll_wait(filep, &idev->wait, wait);
55313- if (listener->event_count != atomic_read(&idev->event))
55314+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55315 return POLLIN | POLLRDNORM;
55316 return 0;
55317 }
55318@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55319 do {
55320 set_current_state(TASK_INTERRUPTIBLE);
55321
55322- event_count = atomic_read(&idev->event);
55323+ event_count = atomic_read_unchecked(&idev->event);
55324 if (event_count != listener->event_count) {
55325 if (copy_to_user(buf, &event_count, count))
55326 retval = -EFAULT;
55327@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55328 static int uio_find_mem_index(struct vm_area_struct *vma)
55329 {
55330 struct uio_device *idev = vma->vm_private_data;
55331+ unsigned long size;
55332
55333 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55334- if (idev->info->mem[vma->vm_pgoff].size == 0)
55335+ size = idev->info->mem[vma->vm_pgoff].size;
55336+ if (size == 0)
55337+ return -1;
55338+ if (vma->vm_end - vma->vm_start > size)
55339 return -1;
55340 return (int)vma->vm_pgoff;
55341 }
55342@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55343 idev->owner = owner;
55344 idev->info = info;
55345 init_waitqueue_head(&idev->wait);
55346- atomic_set(&idev->event, 0);
55347+ atomic_set_unchecked(&idev->event, 0);
55348
55349 ret = uio_get_minor(idev);
55350 if (ret)
55351diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55352index 813d4d3..a71934f 100644
55353--- a/drivers/usb/atm/cxacru.c
55354+++ b/drivers/usb/atm/cxacru.c
55355@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55356 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55357 if (ret < 2)
55358 return -EINVAL;
55359- if (index < 0 || index > 0x7f)
55360+ if (index > 0x7f)
55361 return -EINVAL;
55362 pos += tmp;
55363
55364diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55365index dada014..1d0d517 100644
55366--- a/drivers/usb/atm/usbatm.c
55367+++ b/drivers/usb/atm/usbatm.c
55368@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55369 if (printk_ratelimit())
55370 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55371 __func__, vpi, vci);
55372- atomic_inc(&vcc->stats->rx_err);
55373+ atomic_inc_unchecked(&vcc->stats->rx_err);
55374 return;
55375 }
55376
55377@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55378 if (length > ATM_MAX_AAL5_PDU) {
55379 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55380 __func__, length, vcc);
55381- atomic_inc(&vcc->stats->rx_err);
55382+ atomic_inc_unchecked(&vcc->stats->rx_err);
55383 goto out;
55384 }
55385
55386@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55387 if (sarb->len < pdu_length) {
55388 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55389 __func__, pdu_length, sarb->len, vcc);
55390- atomic_inc(&vcc->stats->rx_err);
55391+ atomic_inc_unchecked(&vcc->stats->rx_err);
55392 goto out;
55393 }
55394
55395 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55396 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55397 __func__, vcc);
55398- atomic_inc(&vcc->stats->rx_err);
55399+ atomic_inc_unchecked(&vcc->stats->rx_err);
55400 goto out;
55401 }
55402
55403@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55404 if (printk_ratelimit())
55405 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55406 __func__, length);
55407- atomic_inc(&vcc->stats->rx_drop);
55408+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55409 goto out;
55410 }
55411
55412@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55413
55414 vcc->push(vcc, skb);
55415
55416- atomic_inc(&vcc->stats->rx);
55417+ atomic_inc_unchecked(&vcc->stats->rx);
55418 out:
55419 skb_trim(sarb, 0);
55420 }
55421@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55422 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55423
55424 usbatm_pop(vcc, skb);
55425- atomic_inc(&vcc->stats->tx);
55426+ atomic_inc_unchecked(&vcc->stats->tx);
55427
55428 skb = skb_dequeue(&instance->sndqueue);
55429 }
55430@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55431 if (!left--)
55432 return sprintf(page,
55433 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55434- atomic_read(&atm_dev->stats.aal5.tx),
55435- atomic_read(&atm_dev->stats.aal5.tx_err),
55436- atomic_read(&atm_dev->stats.aal5.rx),
55437- atomic_read(&atm_dev->stats.aal5.rx_err),
55438- atomic_read(&atm_dev->stats.aal5.rx_drop));
55439+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55440+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55441+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55442+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55443+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55444
55445 if (!left--) {
55446 if (instance->disconnected)
55447diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55448index 2a3bbdf..91d72cf 100644
55449--- a/drivers/usb/core/devices.c
55450+++ b/drivers/usb/core/devices.c
55451@@ -126,7 +126,7 @@ static const char format_endpt[] =
55452 * time it gets called.
55453 */
55454 static struct device_connect_event {
55455- atomic_t count;
55456+ atomic_unchecked_t count;
55457 wait_queue_head_t wait;
55458 } device_event = {
55459 .count = ATOMIC_INIT(1),
55460@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55461
55462 void usbfs_conn_disc_event(void)
55463 {
55464- atomic_add(2, &device_event.count);
55465+ atomic_add_unchecked(2, &device_event.count);
55466 wake_up(&device_event.wait);
55467 }
55468
55469@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55470
55471 poll_wait(file, &device_event.wait, wait);
55472
55473- event_count = atomic_read(&device_event.count);
55474+ event_count = atomic_read_unchecked(&device_event.count);
55475 if (file->f_version != event_count) {
55476 file->f_version = event_count;
55477 return POLLIN | POLLRDNORM;
55478diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55479index 986abde..80e8279 100644
55480--- a/drivers/usb/core/devio.c
55481+++ b/drivers/usb/core/devio.c
55482@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55483 struct usb_dev_state *ps = file->private_data;
55484 struct usb_device *dev = ps->dev;
55485 ssize_t ret = 0;
55486- unsigned len;
55487+ size_t len;
55488 loff_t pos;
55489 int i;
55490
55491@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55492 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55493 struct usb_config_descriptor *config =
55494 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55495- unsigned int length = le16_to_cpu(config->wTotalLength);
55496+ size_t length = le16_to_cpu(config->wTotalLength);
55497
55498 if (*ppos < pos + length) {
55499
55500 /* The descriptor may claim to be longer than it
55501 * really is. Here is the actual allocated length. */
55502- unsigned alloclen =
55503+ size_t alloclen =
55504 le16_to_cpu(dev->config[i].desc.wTotalLength);
55505
55506- len = length - (*ppos - pos);
55507+ len = length + pos - *ppos;
55508 if (len > nbytes)
55509 len = nbytes;
55510
55511 /* Simply don't write (skip over) unallocated parts */
55512 if (alloclen > (*ppos - pos)) {
55513- alloclen -= (*ppos - pos);
55514+ alloclen = alloclen + pos - *ppos;
55515 if (copy_to_user(buf,
55516 dev->rawdescriptors[i] + (*ppos - pos),
55517 min(len, alloclen))) {
55518diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55519index 1c1385e..18400ff 100644
55520--- a/drivers/usb/core/hcd.c
55521+++ b/drivers/usb/core/hcd.c
55522@@ -1554,7 +1554,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55523 */
55524 usb_get_urb(urb);
55525 atomic_inc(&urb->use_count);
55526- atomic_inc(&urb->dev->urbnum);
55527+ atomic_inc_unchecked(&urb->dev->urbnum);
55528 usbmon_urb_submit(&hcd->self, urb);
55529
55530 /* NOTE requirements on root-hub callers (usbfs and the hub
55531@@ -1581,7 +1581,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55532 urb->hcpriv = NULL;
55533 INIT_LIST_HEAD(&urb->urb_list);
55534 atomic_dec(&urb->use_count);
55535- atomic_dec(&urb->dev->urbnum);
55536+ atomic_dec_unchecked(&urb->dev->urbnum);
55537 if (atomic_read(&urb->reject))
55538 wake_up(&usb_kill_urb_queue);
55539 usb_put_urb(urb);
55540diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55541index 1e9a8c9..b4248b7 100644
55542--- a/drivers/usb/core/hub.c
55543+++ b/drivers/usb/core/hub.c
55544@@ -26,6 +26,7 @@
55545 #include <linux/mutex.h>
55546 #include <linux/random.h>
55547 #include <linux/pm_qos.h>
55548+#include <linux/grsecurity.h>
55549
55550 #include <asm/uaccess.h>
55551 #include <asm/byteorder.h>
55552@@ -4649,6 +4650,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55553 goto done;
55554 return;
55555 }
55556+
55557+ if (gr_handle_new_usb())
55558+ goto done;
55559+
55560 if (hub_is_superspeed(hub->hdev))
55561 unit_load = 150;
55562 else
55563diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55564index f368d20..0c30ac5 100644
55565--- a/drivers/usb/core/message.c
55566+++ b/drivers/usb/core/message.c
55567@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55568 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55569 * error number.
55570 */
55571-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55572+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55573 __u8 requesttype, __u16 value, __u16 index, void *data,
55574 __u16 size, int timeout)
55575 {
55576@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55577 * If successful, 0. Otherwise a negative error number. The number of actual
55578 * bytes transferred will be stored in the @actual_length parameter.
55579 */
55580-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55581+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55582 void *data, int len, int *actual_length, int timeout)
55583 {
55584 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55585@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55586 * bytes transferred will be stored in the @actual_length parameter.
55587 *
55588 */
55589-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55590+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55591 void *data, int len, int *actual_length, int timeout)
55592 {
55593 struct urb *urb;
55594diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55595index d269738..7340cd7 100644
55596--- a/drivers/usb/core/sysfs.c
55597+++ b/drivers/usb/core/sysfs.c
55598@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55599 struct usb_device *udev;
55600
55601 udev = to_usb_device(dev);
55602- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55603+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55604 }
55605 static DEVICE_ATTR_RO(urbnum);
55606
55607diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55608index 8d5b2f4..3896940 100644
55609--- a/drivers/usb/core/usb.c
55610+++ b/drivers/usb/core/usb.c
55611@@ -447,7 +447,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55612 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55613 dev->state = USB_STATE_ATTACHED;
55614 dev->lpm_disable_count = 1;
55615- atomic_set(&dev->urbnum, 0);
55616+ atomic_set_unchecked(&dev->urbnum, 0);
55617
55618 INIT_LIST_HEAD(&dev->ep0.urb_list);
55619 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55620diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55621index 8cfc319..4868255 100644
55622--- a/drivers/usb/early/ehci-dbgp.c
55623+++ b/drivers/usb/early/ehci-dbgp.c
55624@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55625
55626 #ifdef CONFIG_KGDB
55627 static struct kgdb_io kgdbdbgp_io_ops;
55628-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55629+static struct kgdb_io kgdbdbgp_io_ops_console;
55630+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55631 #else
55632 #define dbgp_kgdb_mode (0)
55633 #endif
55634@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55635 .write_char = kgdbdbgp_write_char,
55636 };
55637
55638+static struct kgdb_io kgdbdbgp_io_ops_console = {
55639+ .name = "kgdbdbgp",
55640+ .read_char = kgdbdbgp_read_char,
55641+ .write_char = kgdbdbgp_write_char,
55642+ .is_console = 1
55643+};
55644+
55645 static int kgdbdbgp_wait_time;
55646
55647 static int __init kgdbdbgp_parse_config(char *str)
55648@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55649 ptr++;
55650 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55651 }
55652- kgdb_register_io_module(&kgdbdbgp_io_ops);
55653- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55654+ if (early_dbgp_console.index != -1)
55655+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55656+ else
55657+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55658
55659 return 0;
55660 }
55661diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
55662index 0495c94..289e201 100644
55663--- a/drivers/usb/gadget/configfs.c
55664+++ b/drivers/usb/gadget/configfs.c
55665@@ -571,7 +571,7 @@ static struct config_group *function_make(
55666 if (IS_ERR(fi))
55667 return ERR_CAST(fi);
55668
55669- ret = config_item_set_name(&fi->group.cg_item, name);
55670+ ret = config_item_set_name(&fi->group.cg_item, "%s", name);
55671 if (ret) {
55672 usb_put_function_instance(fi);
55673 return ERR_PTR(ret);
55674diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55675index 7856b33..8b7fe09 100644
55676--- a/drivers/usb/gadget/function/f_uac1.c
55677+++ b/drivers/usb/gadget/function/f_uac1.c
55678@@ -14,6 +14,7 @@
55679 #include <linux/module.h>
55680 #include <linux/device.h>
55681 #include <linux/atomic.h>
55682+#include <linux/module.h>
55683
55684 #include "u_uac1.h"
55685
55686diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55687index 7ee05793..2e31e99 100644
55688--- a/drivers/usb/gadget/function/u_serial.c
55689+++ b/drivers/usb/gadget/function/u_serial.c
55690@@ -732,9 +732,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55691 spin_lock_irq(&port->port_lock);
55692
55693 /* already open? Great. */
55694- if (port->port.count) {
55695+ if (atomic_read(&port->port.count)) {
55696 status = 0;
55697- port->port.count++;
55698+ atomic_inc(&port->port.count);
55699
55700 /* currently opening/closing? wait ... */
55701 } else if (port->openclose) {
55702@@ -793,7 +793,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55703 tty->driver_data = port;
55704 port->port.tty = tty;
55705
55706- port->port.count = 1;
55707+ atomic_set(&port->port.count, 1);
55708 port->openclose = false;
55709
55710 /* if connected, start the I/O stream */
55711@@ -835,11 +835,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55712
55713 spin_lock_irq(&port->port_lock);
55714
55715- if (port->port.count != 1) {
55716- if (port->port.count == 0)
55717+ if (atomic_read(&port->port.count) != 1) {
55718+ if (atomic_read(&port->port.count) == 0)
55719 WARN_ON(1);
55720 else
55721- --port->port.count;
55722+ atomic_dec(&port->port.count);
55723 goto exit;
55724 }
55725
55726@@ -849,7 +849,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55727 * and sleep if necessary
55728 */
55729 port->openclose = true;
55730- port->port.count = 0;
55731+ atomic_set(&port->port.count, 0);
55732
55733 gser = port->port_usb;
55734 if (gser && gser->disconnect)
55735@@ -1065,7 +1065,7 @@ static int gs_closed(struct gs_port *port)
55736 int cond;
55737
55738 spin_lock_irq(&port->port_lock);
55739- cond = (port->port.count == 0) && !port->openclose;
55740+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55741 spin_unlock_irq(&port->port_lock);
55742 return cond;
55743 }
55744@@ -1208,7 +1208,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55745 /* if it's already open, start I/O ... and notify the serial
55746 * protocol about open/close status (connect/disconnect).
55747 */
55748- if (port->port.count) {
55749+ if (atomic_read(&port->port.count)) {
55750 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55751 gs_start_io(port);
55752 if (gser->connect)
55753@@ -1255,7 +1255,7 @@ void gserial_disconnect(struct gserial *gser)
55754
55755 port->port_usb = NULL;
55756 gser->ioport = NULL;
55757- if (port->port.count > 0 || port->openclose) {
55758+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55759 wake_up_interruptible(&port->drain_wait);
55760 if (port->port.tty)
55761 tty_hangup(port->port.tty);
55762@@ -1271,7 +1271,7 @@ void gserial_disconnect(struct gserial *gser)
55763
55764 /* finally, free any unused/unusable I/O buffers */
55765 spin_lock_irqsave(&port->port_lock, flags);
55766- if (port->port.count == 0 && !port->openclose)
55767+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55768 gs_buf_free(&port->port_write_buf);
55769 gs_free_requests(gser->out, &port->read_pool, NULL);
55770 gs_free_requests(gser->out, &port->read_queue, NULL);
55771diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55772index c78c841..48fd281 100644
55773--- a/drivers/usb/gadget/function/u_uac1.c
55774+++ b/drivers/usb/gadget/function/u_uac1.c
55775@@ -17,6 +17,7 @@
55776 #include <linux/ctype.h>
55777 #include <linux/random.h>
55778 #include <linux/syscalls.h>
55779+#include <linux/module.h>
55780
55781 #include "u_uac1.h"
55782
55783diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55784index 6920844..480bb7e 100644
55785--- a/drivers/usb/host/ehci-hub.c
55786+++ b/drivers/usb/host/ehci-hub.c
55787@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55788 urb->transfer_flags = URB_DIR_IN;
55789 usb_get_urb(urb);
55790 atomic_inc(&urb->use_count);
55791- atomic_inc(&urb->dev->urbnum);
55792+ atomic_inc_unchecked(&urb->dev->urbnum);
55793 urb->setup_dma = dma_map_single(
55794 hcd->self.controller,
55795 urb->setup_packet,
55796@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55797 urb->status = -EINPROGRESS;
55798 usb_get_urb(urb);
55799 atomic_inc(&urb->use_count);
55800- atomic_inc(&urb->dev->urbnum);
55801+ atomic_inc_unchecked(&urb->dev->urbnum);
55802 retval = submit_single_step_set_feature(hcd, urb, 0);
55803 if (!retval && !wait_for_completion_timeout(&done,
55804 msecs_to_jiffies(2000))) {
55805diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55806index 1db0626..4948782 100644
55807--- a/drivers/usb/host/hwa-hc.c
55808+++ b/drivers/usb/host/hwa-hc.c
55809@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55810 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55811 struct wahc *wa = &hwahc->wa;
55812 struct device *dev = &wa->usb_iface->dev;
55813- u8 mas_le[UWB_NUM_MAS/8];
55814+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55815+
55816+ if (mas_le == NULL)
55817+ return -ENOMEM;
55818
55819 /* Set the stream index */
55820 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55821@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55822 WUSB_REQ_SET_WUSB_MAS,
55823 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55824 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55825- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55826+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55827 if (result < 0)
55828 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55829 out:
55830+ kfree(mas_le);
55831+
55832 return result;
55833 }
55834
55835diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55836index a0a3827..d7ec10b 100644
55837--- a/drivers/usb/misc/appledisplay.c
55838+++ b/drivers/usb/misc/appledisplay.c
55839@@ -84,7 +84,7 @@ struct appledisplay {
55840 struct mutex sysfslock; /* concurrent read and write */
55841 };
55842
55843-static atomic_t count_displays = ATOMIC_INIT(0);
55844+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55845 static struct workqueue_struct *wq;
55846
55847 static void appledisplay_complete(struct urb *urb)
55848@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55849
55850 /* Register backlight device */
55851 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55852- atomic_inc_return(&count_displays) - 1);
55853+ atomic_inc_return_unchecked(&count_displays) - 1);
55854 memset(&props, 0, sizeof(struct backlight_properties));
55855 props.type = BACKLIGHT_RAW;
55856 props.max_brightness = 0xff;
55857diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55858index 3806e70..55c508b 100644
55859--- a/drivers/usb/serial/console.c
55860+++ b/drivers/usb/serial/console.c
55861@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55862
55863 info->port = port;
55864
55865- ++port->port.count;
55866+ atomic_inc(&port->port.count);
55867 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55868 if (serial->type->set_termios) {
55869 /*
55870@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55871 }
55872 /* Now that any required fake tty operations are completed restore
55873 * the tty port count */
55874- --port->port.count;
55875+ atomic_dec(&port->port.count);
55876 /* The console is special in terms of closing the device so
55877 * indicate this port is now acting as a system console. */
55878 port->port.console = 1;
55879@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55880 put_tty:
55881 tty_kref_put(tty);
55882 reset_open_count:
55883- port->port.count = 0;
55884+ atomic_set(&port->port.count, 0);
55885 usb_autopm_put_interface(serial->interface);
55886 error_get_interface:
55887 usb_serial_put(serial);
55888@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55889 static void usb_console_write(struct console *co,
55890 const char *buf, unsigned count)
55891 {
55892- static struct usbcons_info *info = &usbcons_info;
55893+ struct usbcons_info *info = &usbcons_info;
55894 struct usb_serial_port *port = info->port;
55895 struct usb_serial *serial;
55896 int retval = -ENODEV;
55897diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55898index 307e339..6aa97cb 100644
55899--- a/drivers/usb/storage/usb.h
55900+++ b/drivers/usb/storage/usb.h
55901@@ -63,7 +63,7 @@ struct us_unusual_dev {
55902 __u8 useProtocol;
55903 __u8 useTransport;
55904 int (*initFunction)(struct us_data *);
55905-};
55906+} __do_const;
55907
55908
55909 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55910diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55911index a863a98..d272795 100644
55912--- a/drivers/usb/usbip/vhci.h
55913+++ b/drivers/usb/usbip/vhci.h
55914@@ -83,7 +83,7 @@ struct vhci_hcd {
55915 unsigned resuming:1;
55916 unsigned long re_timeout;
55917
55918- atomic_t seqnum;
55919+ atomic_unchecked_t seqnum;
55920
55921 /*
55922 * NOTE:
55923diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55924index e9ef1ec..c3a0b04 100644
55925--- a/drivers/usb/usbip/vhci_hcd.c
55926+++ b/drivers/usb/usbip/vhci_hcd.c
55927@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55928
55929 spin_lock(&vdev->priv_lock);
55930
55931- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55932+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55933 if (priv->seqnum == 0xffff)
55934 dev_info(&urb->dev->dev, "seqnum max\n");
55935
55936@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55937 return -ENOMEM;
55938 }
55939
55940- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55941+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55942 if (unlink->seqnum == 0xffff)
55943 pr_info("seqnum max\n");
55944
55945@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
55946 vdev->rhport = rhport;
55947 }
55948
55949- atomic_set(&vhci->seqnum, 0);
55950+ atomic_set_unchecked(&vhci->seqnum, 0);
55951 spin_lock_init(&vhci->lock);
55952
55953 hcd->power_budget = 0; /* no limit */
55954diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
55955index 00e4a54..d676f85 100644
55956--- a/drivers/usb/usbip/vhci_rx.c
55957+++ b/drivers/usb/usbip/vhci_rx.c
55958@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
55959 if (!urb) {
55960 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
55961 pr_info("max seqnum %d\n",
55962- atomic_read(&the_controller->seqnum));
55963+ atomic_read_unchecked(&the_controller->seqnum));
55964 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
55965 return;
55966 }
55967diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
55968index edc7267..9f65ce2 100644
55969--- a/drivers/usb/wusbcore/wa-hc.h
55970+++ b/drivers/usb/wusbcore/wa-hc.h
55971@@ -240,7 +240,7 @@ struct wahc {
55972 spinlock_t xfer_list_lock;
55973 struct work_struct xfer_enqueue_work;
55974 struct work_struct xfer_error_work;
55975- atomic_t xfer_id_count;
55976+ atomic_unchecked_t xfer_id_count;
55977
55978 kernel_ulong_t quirks;
55979 };
55980@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
55981 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
55982 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
55983 wa->dto_in_use = 0;
55984- atomic_set(&wa->xfer_id_count, 1);
55985+ atomic_set_unchecked(&wa->xfer_id_count, 1);
55986 /* init the buf in URBs */
55987 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
55988 usb_init_urb(&(wa->buf_in_urbs[index]));
55989diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
55990index 69af4fd..da390d7 100644
55991--- a/drivers/usb/wusbcore/wa-xfer.c
55992+++ b/drivers/usb/wusbcore/wa-xfer.c
55993@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
55994 */
55995 static void wa_xfer_id_init(struct wa_xfer *xfer)
55996 {
55997- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
55998+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
55999 }
56000
56001 /* Return the xfer's ID. */
56002diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
56003index e1278fe..7fdeac4 100644
56004--- a/drivers/vfio/vfio.c
56005+++ b/drivers/vfio/vfio.c
56006@@ -517,7 +517,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
56007 return 0;
56008
56009 /* TODO Prevent device auto probing */
56010- WARN("Device %s added to live group %d!\n", dev_name(dev),
56011+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
56012 iommu_group_id(group->iommu_group));
56013
56014 return 0;
56015diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
56016index 3bb02c6..a01ff38 100644
56017--- a/drivers/vhost/vringh.c
56018+++ b/drivers/vhost/vringh.c
56019@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
56020 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56021 {
56022 __virtio16 v = 0;
56023- int rc = get_user(v, (__force __virtio16 __user *)p);
56024+ int rc = get_user(v, (__force_user __virtio16 *)p);
56025 *val = vringh16_to_cpu(vrh, v);
56026 return rc;
56027 }
56028@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56029 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56030 {
56031 __virtio16 v = cpu_to_vringh16(vrh, val);
56032- return put_user(v, (__force __virtio16 __user *)p);
56033+ return put_user(v, (__force_user __virtio16 *)p);
56034 }
56035
56036 static inline int copydesc_user(void *dst, const void *src, size_t len)
56037 {
56038- return copy_from_user(dst, (__force void __user *)src, len) ?
56039+ return copy_from_user(dst, (void __force_user *)src, len) ?
56040 -EFAULT : 0;
56041 }
56042
56043@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56044 const struct vring_used_elem *src,
56045 unsigned int num)
56046 {
56047- return copy_to_user((__force void __user *)dst, src,
56048+ return copy_to_user((void __force_user *)dst, src,
56049 sizeof(*dst) * num) ? -EFAULT : 0;
56050 }
56051
56052 static inline int xfer_from_user(void *src, void *dst, size_t len)
56053 {
56054- return copy_from_user(dst, (__force void __user *)src, len) ?
56055+ return copy_from_user(dst, (void __force_user *)src, len) ?
56056 -EFAULT : 0;
56057 }
56058
56059 static inline int xfer_to_user(void *dst, void *src, size_t len)
56060 {
56061- return copy_to_user((__force void __user *)dst, src, len) ?
56062+ return copy_to_user((void __force_user *)dst, src, len) ?
56063 -EFAULT : 0;
56064 }
56065
56066@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56067 vrh->last_used_idx = 0;
56068 vrh->vring.num = num;
56069 /* vring expects kernel addresses, but only used via accessors. */
56070- vrh->vring.desc = (__force struct vring_desc *)desc;
56071- vrh->vring.avail = (__force struct vring_avail *)avail;
56072- vrh->vring.used = (__force struct vring_used *)used;
56073+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56074+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56075+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56076 return 0;
56077 }
56078 EXPORT_SYMBOL(vringh_init_user);
56079@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56080
56081 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56082 {
56083- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56084+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56085 return 0;
56086 }
56087
56088diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56089index 84a110a..96312c3 100644
56090--- a/drivers/video/backlight/kb3886_bl.c
56091+++ b/drivers/video/backlight/kb3886_bl.c
56092@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56093 static unsigned long kb3886bl_flags;
56094 #define KB3886BL_SUSPENDED 0x01
56095
56096-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56097+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56098 {
56099 .ident = "Sahara Touch-iT",
56100 .matches = {
56101diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56102index 1b0b233..6f34c2c 100644
56103--- a/drivers/video/fbdev/arcfb.c
56104+++ b/drivers/video/fbdev/arcfb.c
56105@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56106 return -ENOSPC;
56107
56108 err = 0;
56109- if ((count + p) > fbmemlength) {
56110+ if (count > (fbmemlength - p)) {
56111 count = fbmemlength - p;
56112 err = -ENOSPC;
56113 }
56114diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56115index 0156954..c07d4e0 100644
56116--- a/drivers/video/fbdev/aty/aty128fb.c
56117+++ b/drivers/video/fbdev/aty/aty128fb.c
56118@@ -149,7 +149,7 @@ enum {
56119 };
56120
56121 /* Must match above enum */
56122-static char * const r128_family[] = {
56123+static const char * const r128_family[] = {
56124 "AGP",
56125 "PCI",
56126 "PRO AGP",
56127diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56128index 8789e48..698fe4c 100644
56129--- a/drivers/video/fbdev/aty/atyfb_base.c
56130+++ b/drivers/video/fbdev/aty/atyfb_base.c
56131@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56132 par->accel_flags = var->accel_flags; /* hack */
56133
56134 if (var->accel_flags) {
56135- info->fbops->fb_sync = atyfb_sync;
56136+ pax_open_kernel();
56137+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56138+ pax_close_kernel();
56139 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56140 } else {
56141- info->fbops->fb_sync = NULL;
56142+ pax_open_kernel();
56143+ *(void **)&info->fbops->fb_sync = NULL;
56144+ pax_close_kernel();
56145 info->flags |= FBINFO_HWACCEL_DISABLED;
56146 }
56147
56148diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56149index 2fa0317..4983f2a 100644
56150--- a/drivers/video/fbdev/aty/mach64_cursor.c
56151+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56152@@ -8,6 +8,7 @@
56153 #include "../core/fb_draw.h"
56154
56155 #include <asm/io.h>
56156+#include <asm/pgtable.h>
56157
56158 #ifdef __sparc__
56159 #include <asm/fbio.h>
56160@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56161 info->sprite.buf_align = 16; /* and 64 lines tall. */
56162 info->sprite.flags = FB_PIXMAP_IO;
56163
56164- info->fbops->fb_cursor = atyfb_cursor;
56165+ pax_open_kernel();
56166+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56167+ pax_close_kernel();
56168
56169 return 0;
56170 }
56171diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56172index d6cab1f..112f680 100644
56173--- a/drivers/video/fbdev/core/fb_defio.c
56174+++ b/drivers/video/fbdev/core/fb_defio.c
56175@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56176
56177 BUG_ON(!fbdefio);
56178 mutex_init(&fbdefio->lock);
56179- info->fbops->fb_mmap = fb_deferred_io_mmap;
56180+ pax_open_kernel();
56181+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56182+ pax_close_kernel();
56183 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56184 INIT_LIST_HEAD(&fbdefio->pagelist);
56185 if (fbdefio->delay == 0) /* set a default of 1 s */
56186@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56187 page->mapping = NULL;
56188 }
56189
56190- info->fbops->fb_mmap = NULL;
56191+ *(void **)&info->fbops->fb_mmap = NULL;
56192 mutex_destroy(&fbdefio->lock);
56193 }
56194 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56195diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56196index 0705d88..d9429bf 100644
56197--- a/drivers/video/fbdev/core/fbmem.c
56198+++ b/drivers/video/fbdev/core/fbmem.c
56199@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56200 __u32 data;
56201 int err;
56202
56203- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56204+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56205
56206 data = (__u32) (unsigned long) fix->smem_start;
56207 err |= put_user(data, &fix32->smem_start);
56208diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56209index 807ee22..7814cd6 100644
56210--- a/drivers/video/fbdev/hyperv_fb.c
56211+++ b/drivers/video/fbdev/hyperv_fb.c
56212@@ -240,7 +240,7 @@ static uint screen_fb_size;
56213 static inline int synthvid_send(struct hv_device *hdev,
56214 struct synthvid_msg *msg)
56215 {
56216- static atomic64_t request_id = ATOMIC64_INIT(0);
56217+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56218 int ret;
56219
56220 msg->pipe_hdr.type = PIPE_MSG_DATA;
56221@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56222
56223 ret = vmbus_sendpacket(hdev->channel, msg,
56224 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56225- atomic64_inc_return(&request_id),
56226+ atomic64_inc_return_unchecked(&request_id),
56227 VM_PKT_DATA_INBAND, 0);
56228
56229 if (ret)
56230diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56231index 7672d2e..b56437f 100644
56232--- a/drivers/video/fbdev/i810/i810_accel.c
56233+++ b/drivers/video/fbdev/i810/i810_accel.c
56234@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56235 }
56236 }
56237 printk("ringbuffer lockup!!!\n");
56238+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56239 i810_report_error(mmio);
56240 par->dev_flags |= LOCKUP;
56241 info->pixmap.scan_align = 1;
56242diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56243index a01147f..5d896f8 100644
56244--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56245+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56246@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56247
56248 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56249 struct matrox_switch matrox_mystique = {
56250- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56251+ .preinit = MGA1064_preinit,
56252+ .reset = MGA1064_reset,
56253+ .init = MGA1064_init,
56254+ .restore = MGA1064_restore,
56255 };
56256 EXPORT_SYMBOL(matrox_mystique);
56257 #endif
56258
56259 #ifdef CONFIG_FB_MATROX_G
56260 struct matrox_switch matrox_G100 = {
56261- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56262+ .preinit = MGAG100_preinit,
56263+ .reset = MGAG100_reset,
56264+ .init = MGAG100_init,
56265+ .restore = MGAG100_restore,
56266 };
56267 EXPORT_SYMBOL(matrox_G100);
56268 #endif
56269diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56270index 195ad7c..09743fc 100644
56271--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56272+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56273@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56274 }
56275
56276 struct matrox_switch matrox_millennium = {
56277- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56278+ .preinit = Ti3026_preinit,
56279+ .reset = Ti3026_reset,
56280+ .init = Ti3026_init,
56281+ .restore = Ti3026_restore
56282 };
56283 EXPORT_SYMBOL(matrox_millennium);
56284 #endif
56285diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56286index fe92eed..106e085 100644
56287--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56288+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56289@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56290 struct mb862xxfb_par *par = info->par;
56291
56292 if (info->var.bits_per_pixel == 32) {
56293- info->fbops->fb_fillrect = cfb_fillrect;
56294- info->fbops->fb_copyarea = cfb_copyarea;
56295- info->fbops->fb_imageblit = cfb_imageblit;
56296+ pax_open_kernel();
56297+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56298+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56299+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56300+ pax_close_kernel();
56301 } else {
56302 outreg(disp, GC_L0EM, 3);
56303- info->fbops->fb_fillrect = mb86290fb_fillrect;
56304- info->fbops->fb_copyarea = mb86290fb_copyarea;
56305- info->fbops->fb_imageblit = mb86290fb_imageblit;
56306+ pax_open_kernel();
56307+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56308+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56309+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56310+ pax_close_kernel();
56311 }
56312 outreg(draw, GDC_REG_DRAW_BASE, 0);
56313 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56314diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56315index 4273c6e..b413013 100644
56316--- a/drivers/video/fbdev/nvidia/nvidia.c
56317+++ b/drivers/video/fbdev/nvidia/nvidia.c
56318@@ -665,19 +665,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56319 info->fix.line_length = (info->var.xres_virtual *
56320 info->var.bits_per_pixel) >> 3;
56321 if (info->var.accel_flags) {
56322- info->fbops->fb_imageblit = nvidiafb_imageblit;
56323- info->fbops->fb_fillrect = nvidiafb_fillrect;
56324- info->fbops->fb_copyarea = nvidiafb_copyarea;
56325- info->fbops->fb_sync = nvidiafb_sync;
56326+ pax_open_kernel();
56327+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56328+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56329+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56330+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56331+ pax_close_kernel();
56332 info->pixmap.scan_align = 4;
56333 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56334 info->flags |= FBINFO_READS_FAST;
56335 NVResetGraphics(info);
56336 } else {
56337- info->fbops->fb_imageblit = cfb_imageblit;
56338- info->fbops->fb_fillrect = cfb_fillrect;
56339- info->fbops->fb_copyarea = cfb_copyarea;
56340- info->fbops->fb_sync = NULL;
56341+ pax_open_kernel();
56342+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56343+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56344+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56345+ *(void **)&info->fbops->fb_sync = NULL;
56346+ pax_close_kernel();
56347 info->pixmap.scan_align = 1;
56348 info->flags |= FBINFO_HWACCEL_DISABLED;
56349 info->flags &= ~FBINFO_READS_FAST;
56350@@ -1169,8 +1173,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56351 info->pixmap.size = 8 * 1024;
56352 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56353
56354- if (!hwcur)
56355- info->fbops->fb_cursor = NULL;
56356+ if (!hwcur) {
56357+ pax_open_kernel();
56358+ *(void **)&info->fbops->fb_cursor = NULL;
56359+ pax_close_kernel();
56360+ }
56361
56362 info->var.accel_flags = (!noaccel);
56363
56364diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56365index ef5b902..47cf7f5 100644
56366--- a/drivers/video/fbdev/omap2/dss/display.c
56367+++ b/drivers/video/fbdev/omap2/dss/display.c
56368@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56369 if (dssdev->name == NULL)
56370 dssdev->name = dssdev->alias;
56371
56372+ pax_open_kernel();
56373 if (drv && drv->get_resolution == NULL)
56374- drv->get_resolution = omapdss_default_get_resolution;
56375+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56376 if (drv && drv->get_recommended_bpp == NULL)
56377- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56378+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56379 if (drv && drv->get_timings == NULL)
56380- drv->get_timings = omapdss_default_get_timings;
56381+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56382+ pax_close_kernel();
56383
56384 mutex_lock(&panel_list_mutex);
56385 list_add_tail(&dssdev->panel_list, &panel_list);
56386diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56387index 83433cb..71e9b98 100644
56388--- a/drivers/video/fbdev/s1d13xxxfb.c
56389+++ b/drivers/video/fbdev/s1d13xxxfb.c
56390@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56391
56392 switch(prod_id) {
56393 case S1D13506_PROD_ID: /* activate acceleration */
56394- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56395- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56396+ pax_open_kernel();
56397+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56398+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56399+ pax_close_kernel();
56400 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56401 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56402 break;
56403diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56404index 82c0a8c..42499a1 100644
56405--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56406+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56407@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56408 }
56409
56410 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56411- lcdc_sys_write_index,
56412- lcdc_sys_write_data,
56413- lcdc_sys_read_data,
56414+ .write_index = lcdc_sys_write_index,
56415+ .write_data = lcdc_sys_write_data,
56416+ .read_data = lcdc_sys_read_data,
56417 };
56418
56419 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56420diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56421index 9279e5f..d5f5276 100644
56422--- a/drivers/video/fbdev/smscufx.c
56423+++ b/drivers/video/fbdev/smscufx.c
56424@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56425 fb_deferred_io_cleanup(info);
56426 kfree(info->fbdefio);
56427 info->fbdefio = NULL;
56428- info->fbops->fb_mmap = ufx_ops_mmap;
56429+ pax_open_kernel();
56430+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56431+ pax_close_kernel();
56432 }
56433
56434 pr_debug("released /dev/fb%d user=%d count=%d",
56435diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56436index ff2b873..626a8d5 100644
56437--- a/drivers/video/fbdev/udlfb.c
56438+++ b/drivers/video/fbdev/udlfb.c
56439@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56440 dlfb_urb_completion(urb);
56441
56442 error:
56443- atomic_add(bytes_sent, &dev->bytes_sent);
56444- atomic_add(bytes_identical, &dev->bytes_identical);
56445- atomic_add(width*height*2, &dev->bytes_rendered);
56446+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56447+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56448+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56449 end_cycles = get_cycles();
56450- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56451+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56452 >> 10)), /* Kcycles */
56453 &dev->cpu_kcycles_used);
56454
56455@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56456 dlfb_urb_completion(urb);
56457
56458 error:
56459- atomic_add(bytes_sent, &dev->bytes_sent);
56460- atomic_add(bytes_identical, &dev->bytes_identical);
56461- atomic_add(bytes_rendered, &dev->bytes_rendered);
56462+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56463+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56464+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56465 end_cycles = get_cycles();
56466- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56467+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56468 >> 10)), /* Kcycles */
56469 &dev->cpu_kcycles_used);
56470 }
56471@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56472 fb_deferred_io_cleanup(info);
56473 kfree(info->fbdefio);
56474 info->fbdefio = NULL;
56475- info->fbops->fb_mmap = dlfb_ops_mmap;
56476+ pax_open_kernel();
56477+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56478+ pax_close_kernel();
56479 }
56480
56481 pr_warn("released /dev/fb%d user=%d count=%d\n",
56482@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56483 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56484 struct dlfb_data *dev = fb_info->par;
56485 return snprintf(buf, PAGE_SIZE, "%u\n",
56486- atomic_read(&dev->bytes_rendered));
56487+ atomic_read_unchecked(&dev->bytes_rendered));
56488 }
56489
56490 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56491@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56492 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56493 struct dlfb_data *dev = fb_info->par;
56494 return snprintf(buf, PAGE_SIZE, "%u\n",
56495- atomic_read(&dev->bytes_identical));
56496+ atomic_read_unchecked(&dev->bytes_identical));
56497 }
56498
56499 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56500@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56501 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56502 struct dlfb_data *dev = fb_info->par;
56503 return snprintf(buf, PAGE_SIZE, "%u\n",
56504- atomic_read(&dev->bytes_sent));
56505+ atomic_read_unchecked(&dev->bytes_sent));
56506 }
56507
56508 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56509@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56510 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56511 struct dlfb_data *dev = fb_info->par;
56512 return snprintf(buf, PAGE_SIZE, "%u\n",
56513- atomic_read(&dev->cpu_kcycles_used));
56514+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56515 }
56516
56517 static ssize_t edid_show(
56518@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56519 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56520 struct dlfb_data *dev = fb_info->par;
56521
56522- atomic_set(&dev->bytes_rendered, 0);
56523- atomic_set(&dev->bytes_identical, 0);
56524- atomic_set(&dev->bytes_sent, 0);
56525- atomic_set(&dev->cpu_kcycles_used, 0);
56526+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56527+ atomic_set_unchecked(&dev->bytes_identical, 0);
56528+ atomic_set_unchecked(&dev->bytes_sent, 0);
56529+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56530
56531 return count;
56532 }
56533diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56534index d32d1c4..46722e6 100644
56535--- a/drivers/video/fbdev/uvesafb.c
56536+++ b/drivers/video/fbdev/uvesafb.c
56537@@ -19,6 +19,7 @@
56538 #include <linux/io.h>
56539 #include <linux/mutex.h>
56540 #include <linux/slab.h>
56541+#include <linux/moduleloader.h>
56542 #include <video/edid.h>
56543 #include <video/uvesafb.h>
56544 #ifdef CONFIG_X86
56545@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56546 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56547 par->pmi_setpal = par->ypan = 0;
56548 } else {
56549+
56550+#ifdef CONFIG_PAX_KERNEXEC
56551+#ifdef CONFIG_MODULES
56552+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56553+#endif
56554+ if (!par->pmi_code) {
56555+ par->pmi_setpal = par->ypan = 0;
56556+ return 0;
56557+ }
56558+#endif
56559+
56560 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56561 + task->t.regs.edi);
56562+
56563+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56564+ pax_open_kernel();
56565+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56566+ pax_close_kernel();
56567+
56568+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56569+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56570+#else
56571 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56572 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56573+#endif
56574+
56575 printk(KERN_INFO "uvesafb: protected mode interface info at "
56576 "%04x:%04x\n",
56577 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56578@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56579 par->ypan = ypan;
56580
56581 if (par->pmi_setpal || par->ypan) {
56582+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56583 if (__supported_pte_mask & _PAGE_NX) {
56584 par->pmi_setpal = par->ypan = 0;
56585 printk(KERN_WARNING "uvesafb: NX protection is active, "
56586 "better not use the PMI.\n");
56587- } else {
56588+ } else
56589+#endif
56590 uvesafb_vbe_getpmi(task, par);
56591- }
56592 }
56593 #else
56594 /* The protected mode interface is not available on non-x86. */
56595@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56596 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56597
56598 /* Disable blanking if the user requested so. */
56599- if (!blank)
56600- info->fbops->fb_blank = NULL;
56601+ if (!blank) {
56602+ pax_open_kernel();
56603+ *(void **)&info->fbops->fb_blank = NULL;
56604+ pax_close_kernel();
56605+ }
56606
56607 /*
56608 * Find out how much IO memory is required for the mode with
56609@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56610 info->flags = FBINFO_FLAG_DEFAULT |
56611 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56612
56613- if (!par->ypan)
56614- info->fbops->fb_pan_display = NULL;
56615+ if (!par->ypan) {
56616+ pax_open_kernel();
56617+ *(void **)&info->fbops->fb_pan_display = NULL;
56618+ pax_close_kernel();
56619+ }
56620 }
56621
56622 static void uvesafb_init_mtrr(struct fb_info *info)
56623@@ -1786,6 +1816,11 @@ out_mode:
56624 out:
56625 kfree(par->vbe_modes);
56626
56627+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56628+ if (par->pmi_code)
56629+ module_memfree_exec(par->pmi_code);
56630+#endif
56631+
56632 framebuffer_release(info);
56633 return err;
56634 }
56635@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56636 kfree(par->vbe_state_orig);
56637 kfree(par->vbe_state_saved);
56638
56639+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56640+ if (par->pmi_code)
56641+ module_memfree_exec(par->pmi_code);
56642+#endif
56643+
56644 framebuffer_release(info);
56645 }
56646 return 0;
56647diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56648index d79a0ac..2d0c3d4 100644
56649--- a/drivers/video/fbdev/vesafb.c
56650+++ b/drivers/video/fbdev/vesafb.c
56651@@ -9,6 +9,7 @@
56652 */
56653
56654 #include <linux/module.h>
56655+#include <linux/moduleloader.h>
56656 #include <linux/kernel.h>
56657 #include <linux/errno.h>
56658 #include <linux/string.h>
56659@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56660 static int vram_total; /* Set total amount of memory */
56661 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56662 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56663-static void (*pmi_start)(void) __read_mostly;
56664-static void (*pmi_pal) (void) __read_mostly;
56665+static void (*pmi_start)(void) __read_only;
56666+static void (*pmi_pal) (void) __read_only;
56667 static int depth __read_mostly;
56668 static int vga_compat __read_mostly;
56669 /* --------------------------------------------------------------------- */
56670@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56671 unsigned int size_remap;
56672 unsigned int size_total;
56673 char *option = NULL;
56674+ void *pmi_code = NULL;
56675
56676 /* ignore error return of fb_get_options */
56677 fb_get_options("vesafb", &option);
56678@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56679 size_remap = size_total;
56680 vesafb_fix.smem_len = size_remap;
56681
56682-#ifndef __i386__
56683- screen_info.vesapm_seg = 0;
56684-#endif
56685-
56686 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56687 printk(KERN_WARNING
56688 "vesafb: cannot reserve video memory at 0x%lx\n",
56689@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56690 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56691 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56692
56693+#ifdef __i386__
56694+
56695+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56696+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56697+ if (!pmi_code)
56698+#elif !defined(CONFIG_PAX_KERNEXEC)
56699+ if (0)
56700+#endif
56701+
56702+#endif
56703+ screen_info.vesapm_seg = 0;
56704+
56705 if (screen_info.vesapm_seg) {
56706- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56707- screen_info.vesapm_seg,screen_info.vesapm_off);
56708+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56709+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56710 }
56711
56712 if (screen_info.vesapm_seg < 0xc000)
56713@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56714
56715 if (ypan || pmi_setpal) {
56716 unsigned short *pmi_base;
56717+
56718 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56719- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56720- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56721+
56722+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56723+ pax_open_kernel();
56724+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56725+#else
56726+ pmi_code = pmi_base;
56727+#endif
56728+
56729+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56730+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56731+
56732+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56733+ pmi_start = ktva_ktla(pmi_start);
56734+ pmi_pal = ktva_ktla(pmi_pal);
56735+ pax_close_kernel();
56736+#endif
56737+
56738 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56739 if (pmi_base[3]) {
56740 printk(KERN_INFO "vesafb: pmi: ports = ");
56741@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56742 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56743 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56744
56745- if (!ypan)
56746- info->fbops->fb_pan_display = NULL;
56747+ if (!ypan) {
56748+ pax_open_kernel();
56749+ *(void **)&info->fbops->fb_pan_display = NULL;
56750+ pax_close_kernel();
56751+ }
56752
56753 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56754 err = -ENOMEM;
56755@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56756 fb_info(info, "%s frame buffer device\n", info->fix.id);
56757 return 0;
56758 err:
56759+
56760+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56761+ module_memfree_exec(pmi_code);
56762+#endif
56763+
56764 if (info->screen_base)
56765 iounmap(info->screen_base);
56766 framebuffer_release(info);
56767diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56768index 88714ae..16c2e11 100644
56769--- a/drivers/video/fbdev/via/via_clock.h
56770+++ b/drivers/video/fbdev/via/via_clock.h
56771@@ -56,7 +56,7 @@ struct via_clock {
56772
56773 void (*set_engine_pll_state)(u8 state);
56774 void (*set_engine_pll)(struct via_pll_config config);
56775-};
56776+} __no_const;
56777
56778
56779 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56780diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56781index 3c14e43..2630570 100644
56782--- a/drivers/video/logo/logo_linux_clut224.ppm
56783+++ b/drivers/video/logo/logo_linux_clut224.ppm
56784@@ -2,1603 +2,1123 @@ P3
56785 # Standard 224-color Linux logo
56786 80 80
56787 255
56788- 0 0 0 0 0 0 0 0 0 0 0 0
56789- 0 0 0 0 0 0 0 0 0 0 0 0
56790- 0 0 0 0 0 0 0 0 0 0 0 0
56791- 0 0 0 0 0 0 0 0 0 0 0 0
56792- 0 0 0 0 0 0 0 0 0 0 0 0
56793- 0 0 0 0 0 0 0 0 0 0 0 0
56794- 0 0 0 0 0 0 0 0 0 0 0 0
56795- 0 0 0 0 0 0 0 0 0 0 0 0
56796- 0 0 0 0 0 0 0 0 0 0 0 0
56797- 6 6 6 6 6 6 10 10 10 10 10 10
56798- 10 10 10 6 6 6 6 6 6 6 6 6
56799- 0 0 0 0 0 0 0 0 0 0 0 0
56800- 0 0 0 0 0 0 0 0 0 0 0 0
56801- 0 0 0 0 0 0 0 0 0 0 0 0
56802- 0 0 0 0 0 0 0 0 0 0 0 0
56803- 0 0 0 0 0 0 0 0 0 0 0 0
56804- 0 0 0 0 0 0 0 0 0 0 0 0
56805- 0 0 0 0 0 0 0 0 0 0 0 0
56806- 0 0 0 0 0 0 0 0 0 0 0 0
56807- 0 0 0 0 0 0 0 0 0 0 0 0
56808- 0 0 0 0 0 0 0 0 0 0 0 0
56809- 0 0 0 0 0 0 0 0 0 0 0 0
56810- 0 0 0 0 0 0 0 0 0 0 0 0
56811- 0 0 0 0 0 0 0 0 0 0 0 0
56812- 0 0 0 0 0 0 0 0 0 0 0 0
56813- 0 0 0 0 0 0 0 0 0 0 0 0
56814- 0 0 0 0 0 0 0 0 0 0 0 0
56815- 0 0 0 0 0 0 0 0 0 0 0 0
56816- 0 0 0 6 6 6 10 10 10 14 14 14
56817- 22 22 22 26 26 26 30 30 30 34 34 34
56818- 30 30 30 30 30 30 26 26 26 18 18 18
56819- 14 14 14 10 10 10 6 6 6 0 0 0
56820- 0 0 0 0 0 0 0 0 0 0 0 0
56821- 0 0 0 0 0 0 0 0 0 0 0 0
56822- 0 0 0 0 0 0 0 0 0 0 0 0
56823- 0 0 0 0 0 0 0 0 0 0 0 0
56824- 0 0 0 0 0 0 0 0 0 0 0 0
56825- 0 0 0 0 0 0 0 0 0 0 0 0
56826- 0 0 0 0 0 0 0 0 0 0 0 0
56827- 0 0 0 0 0 0 0 0 0 0 0 0
56828- 0 0 0 0 0 0 0 0 0 0 0 0
56829- 0 0 0 0 0 1 0 0 1 0 0 0
56830- 0 0 0 0 0 0 0 0 0 0 0 0
56831- 0 0 0 0 0 0 0 0 0 0 0 0
56832- 0 0 0 0 0 0 0 0 0 0 0 0
56833- 0 0 0 0 0 0 0 0 0 0 0 0
56834- 0 0 0 0 0 0 0 0 0 0 0 0
56835- 0 0 0 0 0 0 0 0 0 0 0 0
56836- 6 6 6 14 14 14 26 26 26 42 42 42
56837- 54 54 54 66 66 66 78 78 78 78 78 78
56838- 78 78 78 74 74 74 66 66 66 54 54 54
56839- 42 42 42 26 26 26 18 18 18 10 10 10
56840- 6 6 6 0 0 0 0 0 0 0 0 0
56841- 0 0 0 0 0 0 0 0 0 0 0 0
56842- 0 0 0 0 0 0 0 0 0 0 0 0
56843- 0 0 0 0 0 0 0 0 0 0 0 0
56844- 0 0 0 0 0 0 0 0 0 0 0 0
56845- 0 0 0 0 0 0 0 0 0 0 0 0
56846- 0 0 0 0 0 0 0 0 0 0 0 0
56847- 0 0 0 0 0 0 0 0 0 0 0 0
56848- 0 0 0 0 0 0 0 0 0 0 0 0
56849- 0 0 1 0 0 0 0 0 0 0 0 0
56850- 0 0 0 0 0 0 0 0 0 0 0 0
56851- 0 0 0 0 0 0 0 0 0 0 0 0
56852- 0 0 0 0 0 0 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 0 0 0 0 0 0 0 0 0 0 0 0
56855- 0 0 0 0 0 0 0 0 0 10 10 10
56856- 22 22 22 42 42 42 66 66 66 86 86 86
56857- 66 66 66 38 38 38 38 38 38 22 22 22
56858- 26 26 26 34 34 34 54 54 54 66 66 66
56859- 86 86 86 70 70 70 46 46 46 26 26 26
56860- 14 14 14 6 6 6 0 0 0 0 0 0
56861- 0 0 0 0 0 0 0 0 0 0 0 0
56862- 0 0 0 0 0 0 0 0 0 0 0 0
56863- 0 0 0 0 0 0 0 0 0 0 0 0
56864- 0 0 0 0 0 0 0 0 0 0 0 0
56865- 0 0 0 0 0 0 0 0 0 0 0 0
56866- 0 0 0 0 0 0 0 0 0 0 0 0
56867- 0 0 0 0 0 0 0 0 0 0 0 0
56868- 0 0 0 0 0 0 0 0 0 0 0 0
56869- 0 0 1 0 0 1 0 0 1 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 0 0 0 0 0 0 0 0 0
56872- 0 0 0 0 0 0 0 0 0 0 0 0
56873- 0 0 0 0 0 0 0 0 0 0 0 0
56874- 0 0 0 0 0 0 0 0 0 0 0 0
56875- 0 0 0 0 0 0 10 10 10 26 26 26
56876- 50 50 50 82 82 82 58 58 58 6 6 6
56877- 2 2 6 2 2 6 2 2 6 2 2 6
56878- 2 2 6 2 2 6 2 2 6 2 2 6
56879- 6 6 6 54 54 54 86 86 86 66 66 66
56880- 38 38 38 18 18 18 6 6 6 0 0 0
56881- 0 0 0 0 0 0 0 0 0 0 0 0
56882- 0 0 0 0 0 0 0 0 0 0 0 0
56883- 0 0 0 0 0 0 0 0 0 0 0 0
56884- 0 0 0 0 0 0 0 0 0 0 0 0
56885- 0 0 0 0 0 0 0 0 0 0 0 0
56886- 0 0 0 0 0 0 0 0 0 0 0 0
56887- 0 0 0 0 0 0 0 0 0 0 0 0
56888- 0 0 0 0 0 0 0 0 0 0 0 0
56889- 0 0 0 0 0 0 0 0 0 0 0 0
56890- 0 0 0 0 0 0 0 0 0 0 0 0
56891- 0 0 0 0 0 0 0 0 0 0 0 0
56892- 0 0 0 0 0 0 0 0 0 0 0 0
56893- 0 0 0 0 0 0 0 0 0 0 0 0
56894- 0 0 0 0 0 0 0 0 0 0 0 0
56895- 0 0 0 6 6 6 22 22 22 50 50 50
56896- 78 78 78 34 34 34 2 2 6 2 2 6
56897- 2 2 6 2 2 6 2 2 6 2 2 6
56898- 2 2 6 2 2 6 2 2 6 2 2 6
56899- 2 2 6 2 2 6 6 6 6 70 70 70
56900- 78 78 78 46 46 46 22 22 22 6 6 6
56901- 0 0 0 0 0 0 0 0 0 0 0 0
56902- 0 0 0 0 0 0 0 0 0 0 0 0
56903- 0 0 0 0 0 0 0 0 0 0 0 0
56904- 0 0 0 0 0 0 0 0 0 0 0 0
56905- 0 0 0 0 0 0 0 0 0 0 0 0
56906- 0 0 0 0 0 0 0 0 0 0 0 0
56907- 0 0 0 0 0 0 0 0 0 0 0 0
56908- 0 0 0 0 0 0 0 0 0 0 0 0
56909- 0 0 1 0 0 1 0 0 1 0 0 0
56910- 0 0 0 0 0 0 0 0 0 0 0 0
56911- 0 0 0 0 0 0 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 0 0 0 0 0 0 0 0 0 0 0 0
56915- 6 6 6 18 18 18 42 42 42 82 82 82
56916- 26 26 26 2 2 6 2 2 6 2 2 6
56917- 2 2 6 2 2 6 2 2 6 2 2 6
56918- 2 2 6 2 2 6 2 2 6 14 14 14
56919- 46 46 46 34 34 34 6 6 6 2 2 6
56920- 42 42 42 78 78 78 42 42 42 18 18 18
56921- 6 6 6 0 0 0 0 0 0 0 0 0
56922- 0 0 0 0 0 0 0 0 0 0 0 0
56923- 0 0 0 0 0 0 0 0 0 0 0 0
56924- 0 0 0 0 0 0 0 0 0 0 0 0
56925- 0 0 0 0 0 0 0 0 0 0 0 0
56926- 0 0 0 0 0 0 0 0 0 0 0 0
56927- 0 0 0 0 0 0 0 0 0 0 0 0
56928- 0 0 0 0 0 0 0 0 0 0 0 0
56929- 0 0 1 0 0 0 0 0 1 0 0 0
56930- 0 0 0 0 0 0 0 0 0 0 0 0
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 0 0 0 0 0 0 0 0 0
56935- 10 10 10 30 30 30 66 66 66 58 58 58
56936- 2 2 6 2 2 6 2 2 6 2 2 6
56937- 2 2 6 2 2 6 2 2 6 2 2 6
56938- 2 2 6 2 2 6 2 2 6 26 26 26
56939- 86 86 86 101 101 101 46 46 46 10 10 10
56940- 2 2 6 58 58 58 70 70 70 34 34 34
56941- 10 10 10 0 0 0 0 0 0 0 0 0
56942- 0 0 0 0 0 0 0 0 0 0 0 0
56943- 0 0 0 0 0 0 0 0 0 0 0 0
56944- 0 0 0 0 0 0 0 0 0 0 0 0
56945- 0 0 0 0 0 0 0 0 0 0 0 0
56946- 0 0 0 0 0 0 0 0 0 0 0 0
56947- 0 0 0 0 0 0 0 0 0 0 0 0
56948- 0 0 0 0 0 0 0 0 0 0 0 0
56949- 0 0 1 0 0 1 0 0 1 0 0 0
56950- 0 0 0 0 0 0 0 0 0 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 0 0 0 0 0 0 0 0 0 0 0 0
56955- 14 14 14 42 42 42 86 86 86 10 10 10
56956- 2 2 6 2 2 6 2 2 6 2 2 6
56957- 2 2 6 2 2 6 2 2 6 2 2 6
56958- 2 2 6 2 2 6 2 2 6 30 30 30
56959- 94 94 94 94 94 94 58 58 58 26 26 26
56960- 2 2 6 6 6 6 78 78 78 54 54 54
56961- 22 22 22 6 6 6 0 0 0 0 0 0
56962- 0 0 0 0 0 0 0 0 0 0 0 0
56963- 0 0 0 0 0 0 0 0 0 0 0 0
56964- 0 0 0 0 0 0 0 0 0 0 0 0
56965- 0 0 0 0 0 0 0 0 0 0 0 0
56966- 0 0 0 0 0 0 0 0 0 0 0 0
56967- 0 0 0 0 0 0 0 0 0 0 0 0
56968- 0 0 0 0 0 0 0 0 0 0 0 0
56969- 0 0 0 0 0 0 0 0 0 0 0 0
56970- 0 0 0 0 0 0 0 0 0 0 0 0
56971- 0 0 0 0 0 0 0 0 0 0 0 0
56972- 0 0 0 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 0 0 0
56974- 0 0 0 0 0 0 0 0 0 6 6 6
56975- 22 22 22 62 62 62 62 62 62 2 2 6
56976- 2 2 6 2 2 6 2 2 6 2 2 6
56977- 2 2 6 2 2 6 2 2 6 2 2 6
56978- 2 2 6 2 2 6 2 2 6 26 26 26
56979- 54 54 54 38 38 38 18 18 18 10 10 10
56980- 2 2 6 2 2 6 34 34 34 82 82 82
56981- 38 38 38 14 14 14 0 0 0 0 0 0
56982- 0 0 0 0 0 0 0 0 0 0 0 0
56983- 0 0 0 0 0 0 0 0 0 0 0 0
56984- 0 0 0 0 0 0 0 0 0 0 0 0
56985- 0 0 0 0 0 0 0 0 0 0 0 0
56986- 0 0 0 0 0 0 0 0 0 0 0 0
56987- 0 0 0 0 0 0 0 0 0 0 0 0
56988- 0 0 0 0 0 0 0 0 0 0 0 0
56989- 0 0 0 0 0 1 0 0 1 0 0 0
56990- 0 0 0 0 0 0 0 0 0 0 0 0
56991- 0 0 0 0 0 0 0 0 0 0 0 0
56992- 0 0 0 0 0 0 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 0 0 0
56994- 0 0 0 0 0 0 0 0 0 6 6 6
56995- 30 30 30 78 78 78 30 30 30 2 2 6
56996- 2 2 6 2 2 6 2 2 6 2 2 6
56997- 2 2 6 2 2 6 2 2 6 2 2 6
56998- 2 2 6 2 2 6 2 2 6 10 10 10
56999- 10 10 10 2 2 6 2 2 6 2 2 6
57000- 2 2 6 2 2 6 2 2 6 78 78 78
57001- 50 50 50 18 18 18 6 6 6 0 0 0
57002- 0 0 0 0 0 0 0 0 0 0 0 0
57003- 0 0 0 0 0 0 0 0 0 0 0 0
57004- 0 0 0 0 0 0 0 0 0 0 0 0
57005- 0 0 0 0 0 0 0 0 0 0 0 0
57006- 0 0 0 0 0 0 0 0 0 0 0 0
57007- 0 0 0 0 0 0 0 0 0 0 0 0
57008- 0 0 0 0 0 0 0 0 0 0 0 0
57009- 0 0 1 0 0 0 0 0 0 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 0 0 0
57014- 0 0 0 0 0 0 0 0 0 10 10 10
57015- 38 38 38 86 86 86 14 14 14 2 2 6
57016- 2 2 6 2 2 6 2 2 6 2 2 6
57017- 2 2 6 2 2 6 2 2 6 2 2 6
57018- 2 2 6 2 2 6 2 2 6 2 2 6
57019- 2 2 6 2 2 6 2 2 6 2 2 6
57020- 2 2 6 2 2 6 2 2 6 54 54 54
57021- 66 66 66 26 26 26 6 6 6 0 0 0
57022- 0 0 0 0 0 0 0 0 0 0 0 0
57023- 0 0 0 0 0 0 0 0 0 0 0 0
57024- 0 0 0 0 0 0 0 0 0 0 0 0
57025- 0 0 0 0 0 0 0 0 0 0 0 0
57026- 0 0 0 0 0 0 0 0 0 0 0 0
57027- 0 0 0 0 0 0 0 0 0 0 0 0
57028- 0 0 0 0 0 0 0 0 0 0 0 0
57029- 0 0 0 0 0 1 0 0 1 0 0 0
57030- 0 0 0 0 0 0 0 0 0 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 0 0 0
57034- 0 0 0 0 0 0 0 0 0 14 14 14
57035- 42 42 42 82 82 82 2 2 6 2 2 6
57036- 2 2 6 6 6 6 10 10 10 2 2 6
57037- 2 2 6 2 2 6 2 2 6 2 2 6
57038- 2 2 6 2 2 6 2 2 6 6 6 6
57039- 14 14 14 10 10 10 2 2 6 2 2 6
57040- 2 2 6 2 2 6 2 2 6 18 18 18
57041- 82 82 82 34 34 34 10 10 10 0 0 0
57042- 0 0 0 0 0 0 0 0 0 0 0 0
57043- 0 0 0 0 0 0 0 0 0 0 0 0
57044- 0 0 0 0 0 0 0 0 0 0 0 0
57045- 0 0 0 0 0 0 0 0 0 0 0 0
57046- 0 0 0 0 0 0 0 0 0 0 0 0
57047- 0 0 0 0 0 0 0 0 0 0 0 0
57048- 0 0 0 0 0 0 0 0 0 0 0 0
57049- 0 0 1 0 0 0 0 0 0 0 0 0
57050- 0 0 0 0 0 0 0 0 0 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 0 0 0
57054- 0 0 0 0 0 0 0 0 0 14 14 14
57055- 46 46 46 86 86 86 2 2 6 2 2 6
57056- 6 6 6 6 6 6 22 22 22 34 34 34
57057- 6 6 6 2 2 6 2 2 6 2 2 6
57058- 2 2 6 2 2 6 18 18 18 34 34 34
57059- 10 10 10 50 50 50 22 22 22 2 2 6
57060- 2 2 6 2 2 6 2 2 6 10 10 10
57061- 86 86 86 42 42 42 14 14 14 0 0 0
57062- 0 0 0 0 0 0 0 0 0 0 0 0
57063- 0 0 0 0 0 0 0 0 0 0 0 0
57064- 0 0 0 0 0 0 0 0 0 0 0 0
57065- 0 0 0 0 0 0 0 0 0 0 0 0
57066- 0 0 0 0 0 0 0 0 0 0 0 0
57067- 0 0 0 0 0 0 0 0 0 0 0 0
57068- 0 0 0 0 0 0 0 0 0 0 0 0
57069- 0 0 1 0 0 1 0 0 1 0 0 0
57070- 0 0 0 0 0 0 0 0 0 0 0 0
57071- 0 0 0 0 0 0 0 0 0 0 0 0
57072- 0 0 0 0 0 0 0 0 0 0 0 0
57073- 0 0 0 0 0 0 0 0 0 0 0 0
57074- 0 0 0 0 0 0 0 0 0 14 14 14
57075- 46 46 46 86 86 86 2 2 6 2 2 6
57076- 38 38 38 116 116 116 94 94 94 22 22 22
57077- 22 22 22 2 2 6 2 2 6 2 2 6
57078- 14 14 14 86 86 86 138 138 138 162 162 162
57079-154 154 154 38 38 38 26 26 26 6 6 6
57080- 2 2 6 2 2 6 2 2 6 2 2 6
57081- 86 86 86 46 46 46 14 14 14 0 0 0
57082- 0 0 0 0 0 0 0 0 0 0 0 0
57083- 0 0 0 0 0 0 0 0 0 0 0 0
57084- 0 0 0 0 0 0 0 0 0 0 0 0
57085- 0 0 0 0 0 0 0 0 0 0 0 0
57086- 0 0 0 0 0 0 0 0 0 0 0 0
57087- 0 0 0 0 0 0 0 0 0 0 0 0
57088- 0 0 0 0 0 0 0 0 0 0 0 0
57089- 0 0 0 0 0 0 0 0 0 0 0 0
57090- 0 0 0 0 0 0 0 0 0 0 0 0
57091- 0 0 0 0 0 0 0 0 0 0 0 0
57092- 0 0 0 0 0 0 0 0 0 0 0 0
57093- 0 0 0 0 0 0 0 0 0 0 0 0
57094- 0 0 0 0 0 0 0 0 0 14 14 14
57095- 46 46 46 86 86 86 2 2 6 14 14 14
57096-134 134 134 198 198 198 195 195 195 116 116 116
57097- 10 10 10 2 2 6 2 2 6 6 6 6
57098-101 98 89 187 187 187 210 210 210 218 218 218
57099-214 214 214 134 134 134 14 14 14 6 6 6
57100- 2 2 6 2 2 6 2 2 6 2 2 6
57101- 86 86 86 50 50 50 18 18 18 6 6 6
57102- 0 0 0 0 0 0 0 0 0 0 0 0
57103- 0 0 0 0 0 0 0 0 0 0 0 0
57104- 0 0 0 0 0 0 0 0 0 0 0 0
57105- 0 0 0 0 0 0 0 0 0 0 0 0
57106- 0 0 0 0 0 0 0 0 0 0 0 0
57107- 0 0 0 0 0 0 0 0 0 0 0 0
57108- 0 0 0 0 0 0 0 0 1 0 0 0
57109- 0 0 1 0 0 1 0 0 1 0 0 0
57110- 0 0 0 0 0 0 0 0 0 0 0 0
57111- 0 0 0 0 0 0 0 0 0 0 0 0
57112- 0 0 0 0 0 0 0 0 0 0 0 0
57113- 0 0 0 0 0 0 0 0 0 0 0 0
57114- 0 0 0 0 0 0 0 0 0 14 14 14
57115- 46 46 46 86 86 86 2 2 6 54 54 54
57116-218 218 218 195 195 195 226 226 226 246 246 246
57117- 58 58 58 2 2 6 2 2 6 30 30 30
57118-210 210 210 253 253 253 174 174 174 123 123 123
57119-221 221 221 234 234 234 74 74 74 2 2 6
57120- 2 2 6 2 2 6 2 2 6 2 2 6
57121- 70 70 70 58 58 58 22 22 22 6 6 6
57122- 0 0 0 0 0 0 0 0 0 0 0 0
57123- 0 0 0 0 0 0 0 0 0 0 0 0
57124- 0 0 0 0 0 0 0 0 0 0 0 0
57125- 0 0 0 0 0 0 0 0 0 0 0 0
57126- 0 0 0 0 0 0 0 0 0 0 0 0
57127- 0 0 0 0 0 0 0 0 0 0 0 0
57128- 0 0 0 0 0 0 0 0 0 0 0 0
57129- 0 0 0 0 0 0 0 0 0 0 0 0
57130- 0 0 0 0 0 0 0 0 0 0 0 0
57131- 0 0 0 0 0 0 0 0 0 0 0 0
57132- 0 0 0 0 0 0 0 0 0 0 0 0
57133- 0 0 0 0 0 0 0 0 0 0 0 0
57134- 0 0 0 0 0 0 0 0 0 14 14 14
57135- 46 46 46 82 82 82 2 2 6 106 106 106
57136-170 170 170 26 26 26 86 86 86 226 226 226
57137-123 123 123 10 10 10 14 14 14 46 46 46
57138-231 231 231 190 190 190 6 6 6 70 70 70
57139- 90 90 90 238 238 238 158 158 158 2 2 6
57140- 2 2 6 2 2 6 2 2 6 2 2 6
57141- 70 70 70 58 58 58 22 22 22 6 6 6
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 1 0 0 0
57149- 0 0 1 0 0 1 0 0 1 0 0 0
57150- 0 0 0 0 0 0 0 0 0 0 0 0
57151- 0 0 0 0 0 0 0 0 0 0 0 0
57152- 0 0 0 0 0 0 0 0 0 0 0 0
57153- 0 0 0 0 0 0 0 0 0 0 0 0
57154- 0 0 0 0 0 0 0 0 0 14 14 14
57155- 42 42 42 86 86 86 6 6 6 116 116 116
57156-106 106 106 6 6 6 70 70 70 149 149 149
57157-128 128 128 18 18 18 38 38 38 54 54 54
57158-221 221 221 106 106 106 2 2 6 14 14 14
57159- 46 46 46 190 190 190 198 198 198 2 2 6
57160- 2 2 6 2 2 6 2 2 6 2 2 6
57161- 74 74 74 62 62 62 22 22 22 6 6 6
57162- 0 0 0 0 0 0 0 0 0 0 0 0
57163- 0 0 0 0 0 0 0 0 0 0 0 0
57164- 0 0 0 0 0 0 0 0 0 0 0 0
57165- 0 0 0 0 0 0 0 0 0 0 0 0
57166- 0 0 0 0 0 0 0 0 0 0 0 0
57167- 0 0 0 0 0 0 0 0 0 0 0 0
57168- 0 0 0 0 0 0 0 0 1 0 0 0
57169- 0 0 1 0 0 0 0 0 1 0 0 0
57170- 0 0 0 0 0 0 0 0 0 0 0 0
57171- 0 0 0 0 0 0 0 0 0 0 0 0
57172- 0 0 0 0 0 0 0 0 0 0 0 0
57173- 0 0 0 0 0 0 0 0 0 0 0 0
57174- 0 0 0 0 0 0 0 0 0 14 14 14
57175- 42 42 42 94 94 94 14 14 14 101 101 101
57176-128 128 128 2 2 6 18 18 18 116 116 116
57177-118 98 46 121 92 8 121 92 8 98 78 10
57178-162 162 162 106 106 106 2 2 6 2 2 6
57179- 2 2 6 195 195 195 195 195 195 6 6 6
57180- 2 2 6 2 2 6 2 2 6 2 2 6
57181- 74 74 74 62 62 62 22 22 22 6 6 6
57182- 0 0 0 0 0 0 0 0 0 0 0 0
57183- 0 0 0 0 0 0 0 0 0 0 0 0
57184- 0 0 0 0 0 0 0 0 0 0 0 0
57185- 0 0 0 0 0 0 0 0 0 0 0 0
57186- 0 0 0 0 0 0 0 0 0 0 0 0
57187- 0 0 0 0 0 0 0 0 0 0 0 0
57188- 0 0 0 0 0 0 0 0 1 0 0 1
57189- 0 0 1 0 0 0 0 0 1 0 0 0
57190- 0 0 0 0 0 0 0 0 0 0 0 0
57191- 0 0 0 0 0 0 0 0 0 0 0 0
57192- 0 0 0 0 0 0 0 0 0 0 0 0
57193- 0 0 0 0 0 0 0 0 0 0 0 0
57194- 0 0 0 0 0 0 0 0 0 10 10 10
57195- 38 38 38 90 90 90 14 14 14 58 58 58
57196-210 210 210 26 26 26 54 38 6 154 114 10
57197-226 170 11 236 186 11 225 175 15 184 144 12
57198-215 174 15 175 146 61 37 26 9 2 2 6
57199- 70 70 70 246 246 246 138 138 138 2 2 6
57200- 2 2 6 2 2 6 2 2 6 2 2 6
57201- 70 70 70 66 66 66 26 26 26 6 6 6
57202- 0 0 0 0 0 0 0 0 0 0 0 0
57203- 0 0 0 0 0 0 0 0 0 0 0 0
57204- 0 0 0 0 0 0 0 0 0 0 0 0
57205- 0 0 0 0 0 0 0 0 0 0 0 0
57206- 0 0 0 0 0 0 0 0 0 0 0 0
57207- 0 0 0 0 0 0 0 0 0 0 0 0
57208- 0 0 0 0 0 0 0 0 0 0 0 0
57209- 0 0 0 0 0 0 0 0 0 0 0 0
57210- 0 0 0 0 0 0 0 0 0 0 0 0
57211- 0 0 0 0 0 0 0 0 0 0 0 0
57212- 0 0 0 0 0 0 0 0 0 0 0 0
57213- 0 0 0 0 0 0 0 0 0 0 0 0
57214- 0 0 0 0 0 0 0 0 0 10 10 10
57215- 38 38 38 86 86 86 14 14 14 10 10 10
57216-195 195 195 188 164 115 192 133 9 225 175 15
57217-239 182 13 234 190 10 232 195 16 232 200 30
57218-245 207 45 241 208 19 232 195 16 184 144 12
57219-218 194 134 211 206 186 42 42 42 2 2 6
57220- 2 2 6 2 2 6 2 2 6 2 2 6
57221- 50 50 50 74 74 74 30 30 30 6 6 6
57222- 0 0 0 0 0 0 0 0 0 0 0 0
57223- 0 0 0 0 0 0 0 0 0 0 0 0
57224- 0 0 0 0 0 0 0 0 0 0 0 0
57225- 0 0 0 0 0 0 0 0 0 0 0 0
57226- 0 0 0 0 0 0 0 0 0 0 0 0
57227- 0 0 0 0 0 0 0 0 0 0 0 0
57228- 0 0 0 0 0 0 0 0 0 0 0 0
57229- 0 0 0 0 0 0 0 0 0 0 0 0
57230- 0 0 0 0 0 0 0 0 0 0 0 0
57231- 0 0 0 0 0 0 0 0 0 0 0 0
57232- 0 0 0 0 0 0 0 0 0 0 0 0
57233- 0 0 0 0 0 0 0 0 0 0 0 0
57234- 0 0 0 0 0 0 0 0 0 10 10 10
57235- 34 34 34 86 86 86 14 14 14 2 2 6
57236-121 87 25 192 133 9 219 162 10 239 182 13
57237-236 186 11 232 195 16 241 208 19 244 214 54
57238-246 218 60 246 218 38 246 215 20 241 208 19
57239-241 208 19 226 184 13 121 87 25 2 2 6
57240- 2 2 6 2 2 6 2 2 6 2 2 6
57241- 50 50 50 82 82 82 34 34 34 10 10 10
57242- 0 0 0 0 0 0 0 0 0 0 0 0
57243- 0 0 0 0 0 0 0 0 0 0 0 0
57244- 0 0 0 0 0 0 0 0 0 0 0 0
57245- 0 0 0 0 0 0 0 0 0 0 0 0
57246- 0 0 0 0 0 0 0 0 0 0 0 0
57247- 0 0 0 0 0 0 0 0 0 0 0 0
57248- 0 0 0 0 0 0 0 0 0 0 0 0
57249- 0 0 0 0 0 0 0 0 0 0 0 0
57250- 0 0 0 0 0 0 0 0 0 0 0 0
57251- 0 0 0 0 0 0 0 0 0 0 0 0
57252- 0 0 0 0 0 0 0 0 0 0 0 0
57253- 0 0 0 0 0 0 0 0 0 0 0 0
57254- 0 0 0 0 0 0 0 0 0 10 10 10
57255- 34 34 34 82 82 82 30 30 30 61 42 6
57256-180 123 7 206 145 10 230 174 11 239 182 13
57257-234 190 10 238 202 15 241 208 19 246 218 74
57258-246 218 38 246 215 20 246 215 20 246 215 20
57259-226 184 13 215 174 15 184 144 12 6 6 6
57260- 2 2 6 2 2 6 2 2 6 2 2 6
57261- 26 26 26 94 94 94 42 42 42 14 14 14
57262- 0 0 0 0 0 0 0 0 0 0 0 0
57263- 0 0 0 0 0 0 0 0 0 0 0 0
57264- 0 0 0 0 0 0 0 0 0 0 0 0
57265- 0 0 0 0 0 0 0 0 0 0 0 0
57266- 0 0 0 0 0 0 0 0 0 0 0 0
57267- 0 0 0 0 0 0 0 0 0 0 0 0
57268- 0 0 0 0 0 0 0 0 0 0 0 0
57269- 0 0 0 0 0 0 0 0 0 0 0 0
57270- 0 0 0 0 0 0 0 0 0 0 0 0
57271- 0 0 0 0 0 0 0 0 0 0 0 0
57272- 0 0 0 0 0 0 0 0 0 0 0 0
57273- 0 0 0 0 0 0 0 0 0 0 0 0
57274- 0 0 0 0 0 0 0 0 0 10 10 10
57275- 30 30 30 78 78 78 50 50 50 104 69 6
57276-192 133 9 216 158 10 236 178 12 236 186 11
57277-232 195 16 241 208 19 244 214 54 245 215 43
57278-246 215 20 246 215 20 241 208 19 198 155 10
57279-200 144 11 216 158 10 156 118 10 2 2 6
57280- 2 2 6 2 2 6 2 2 6 2 2 6
57281- 6 6 6 90 90 90 54 54 54 18 18 18
57282- 6 6 6 0 0 0 0 0 0 0 0 0
57283- 0 0 0 0 0 0 0 0 0 0 0 0
57284- 0 0 0 0 0 0 0 0 0 0 0 0
57285- 0 0 0 0 0 0 0 0 0 0 0 0
57286- 0 0 0 0 0 0 0 0 0 0 0 0
57287- 0 0 0 0 0 0 0 0 0 0 0 0
57288- 0 0 0 0 0 0 0 0 0 0 0 0
57289- 0 0 0 0 0 0 0 0 0 0 0 0
57290- 0 0 0 0 0 0 0 0 0 0 0 0
57291- 0 0 0 0 0 0 0 0 0 0 0 0
57292- 0 0 0 0 0 0 0 0 0 0 0 0
57293- 0 0 0 0 0 0 0 0 0 0 0 0
57294- 0 0 0 0 0 0 0 0 0 10 10 10
57295- 30 30 30 78 78 78 46 46 46 22 22 22
57296-137 92 6 210 162 10 239 182 13 238 190 10
57297-238 202 15 241 208 19 246 215 20 246 215 20
57298-241 208 19 203 166 17 185 133 11 210 150 10
57299-216 158 10 210 150 10 102 78 10 2 2 6
57300- 6 6 6 54 54 54 14 14 14 2 2 6
57301- 2 2 6 62 62 62 74 74 74 30 30 30
57302- 10 10 10 0 0 0 0 0 0 0 0 0
57303- 0 0 0 0 0 0 0 0 0 0 0 0
57304- 0 0 0 0 0 0 0 0 0 0 0 0
57305- 0 0 0 0 0 0 0 0 0 0 0 0
57306- 0 0 0 0 0 0 0 0 0 0 0 0
57307- 0 0 0 0 0 0 0 0 0 0 0 0
57308- 0 0 0 0 0 0 0 0 0 0 0 0
57309- 0 0 0 0 0 0 0 0 0 0 0 0
57310- 0 0 0 0 0 0 0 0 0 0 0 0
57311- 0 0 0 0 0 0 0 0 0 0 0 0
57312- 0 0 0 0 0 0 0 0 0 0 0 0
57313- 0 0 0 0 0 0 0 0 0 0 0 0
57314- 0 0 0 0 0 0 0 0 0 10 10 10
57315- 34 34 34 78 78 78 50 50 50 6 6 6
57316- 94 70 30 139 102 15 190 146 13 226 184 13
57317-232 200 30 232 195 16 215 174 15 190 146 13
57318-168 122 10 192 133 9 210 150 10 213 154 11
57319-202 150 34 182 157 106 101 98 89 2 2 6
57320- 2 2 6 78 78 78 116 116 116 58 58 58
57321- 2 2 6 22 22 22 90 90 90 46 46 46
57322- 18 18 18 6 6 6 0 0 0 0 0 0
57323- 0 0 0 0 0 0 0 0 0 0 0 0
57324- 0 0 0 0 0 0 0 0 0 0 0 0
57325- 0 0 0 0 0 0 0 0 0 0 0 0
57326- 0 0 0 0 0 0 0 0 0 0 0 0
57327- 0 0 0 0 0 0 0 0 0 0 0 0
57328- 0 0 0 0 0 0 0 0 0 0 0 0
57329- 0 0 0 0 0 0 0 0 0 0 0 0
57330- 0 0 0 0 0 0 0 0 0 0 0 0
57331- 0 0 0 0 0 0 0 0 0 0 0 0
57332- 0 0 0 0 0 0 0 0 0 0 0 0
57333- 0 0 0 0 0 0 0 0 0 0 0 0
57334- 0 0 0 0 0 0 0 0 0 10 10 10
57335- 38 38 38 86 86 86 50 50 50 6 6 6
57336-128 128 128 174 154 114 156 107 11 168 122 10
57337-198 155 10 184 144 12 197 138 11 200 144 11
57338-206 145 10 206 145 10 197 138 11 188 164 115
57339-195 195 195 198 198 198 174 174 174 14 14 14
57340- 2 2 6 22 22 22 116 116 116 116 116 116
57341- 22 22 22 2 2 6 74 74 74 70 70 70
57342- 30 30 30 10 10 10 0 0 0 0 0 0
57343- 0 0 0 0 0 0 0 0 0 0 0 0
57344- 0 0 0 0 0 0 0 0 0 0 0 0
57345- 0 0 0 0 0 0 0 0 0 0 0 0
57346- 0 0 0 0 0 0 0 0 0 0 0 0
57347- 0 0 0 0 0 0 0 0 0 0 0 0
57348- 0 0 0 0 0 0 0 0 0 0 0 0
57349- 0 0 0 0 0 0 0 0 0 0 0 0
57350- 0 0 0 0 0 0 0 0 0 0 0 0
57351- 0 0 0 0 0 0 0 0 0 0 0 0
57352- 0 0 0 0 0 0 0 0 0 0 0 0
57353- 0 0 0 0 0 0 0 0 0 0 0 0
57354- 0 0 0 0 0 0 6 6 6 18 18 18
57355- 50 50 50 101 101 101 26 26 26 10 10 10
57356-138 138 138 190 190 190 174 154 114 156 107 11
57357-197 138 11 200 144 11 197 138 11 192 133 9
57358-180 123 7 190 142 34 190 178 144 187 187 187
57359-202 202 202 221 221 221 214 214 214 66 66 66
57360- 2 2 6 2 2 6 50 50 50 62 62 62
57361- 6 6 6 2 2 6 10 10 10 90 90 90
57362- 50 50 50 18 18 18 6 6 6 0 0 0
57363- 0 0 0 0 0 0 0 0 0 0 0 0
57364- 0 0 0 0 0 0 0 0 0 0 0 0
57365- 0 0 0 0 0 0 0 0 0 0 0 0
57366- 0 0 0 0 0 0 0 0 0 0 0 0
57367- 0 0 0 0 0 0 0 0 0 0 0 0
57368- 0 0 0 0 0 0 0 0 0 0 0 0
57369- 0 0 0 0 0 0 0 0 0 0 0 0
57370- 0 0 0 0 0 0 0 0 0 0 0 0
57371- 0 0 0 0 0 0 0 0 0 0 0 0
57372- 0 0 0 0 0 0 0 0 0 0 0 0
57373- 0 0 0 0 0 0 0 0 0 0 0 0
57374- 0 0 0 0 0 0 10 10 10 34 34 34
57375- 74 74 74 74 74 74 2 2 6 6 6 6
57376-144 144 144 198 198 198 190 190 190 178 166 146
57377-154 121 60 156 107 11 156 107 11 168 124 44
57378-174 154 114 187 187 187 190 190 190 210 210 210
57379-246 246 246 253 253 253 253 253 253 182 182 182
57380- 6 6 6 2 2 6 2 2 6 2 2 6
57381- 2 2 6 2 2 6 2 2 6 62 62 62
57382- 74 74 74 34 34 34 14 14 14 0 0 0
57383- 0 0 0 0 0 0 0 0 0 0 0 0
57384- 0 0 0 0 0 0 0 0 0 0 0 0
57385- 0 0 0 0 0 0 0 0 0 0 0 0
57386- 0 0 0 0 0 0 0 0 0 0 0 0
57387- 0 0 0 0 0 0 0 0 0 0 0 0
57388- 0 0 0 0 0 0 0 0 0 0 0 0
57389- 0 0 0 0 0 0 0 0 0 0 0 0
57390- 0 0 0 0 0 0 0 0 0 0 0 0
57391- 0 0 0 0 0 0 0 0 0 0 0 0
57392- 0 0 0 0 0 0 0 0 0 0 0 0
57393- 0 0 0 0 0 0 0 0 0 0 0 0
57394- 0 0 0 10 10 10 22 22 22 54 54 54
57395- 94 94 94 18 18 18 2 2 6 46 46 46
57396-234 234 234 221 221 221 190 190 190 190 190 190
57397-190 190 190 187 187 187 187 187 187 190 190 190
57398-190 190 190 195 195 195 214 214 214 242 242 242
57399-253 253 253 253 253 253 253 253 253 253 253 253
57400- 82 82 82 2 2 6 2 2 6 2 2 6
57401- 2 2 6 2 2 6 2 2 6 14 14 14
57402- 86 86 86 54 54 54 22 22 22 6 6 6
57403- 0 0 0 0 0 0 0 0 0 0 0 0
57404- 0 0 0 0 0 0 0 0 0 0 0 0
57405- 0 0 0 0 0 0 0 0 0 0 0 0
57406- 0 0 0 0 0 0 0 0 0 0 0 0
57407- 0 0 0 0 0 0 0 0 0 0 0 0
57408- 0 0 0 0 0 0 0 0 0 0 0 0
57409- 0 0 0 0 0 0 0 0 0 0 0 0
57410- 0 0 0 0 0 0 0 0 0 0 0 0
57411- 0 0 0 0 0 0 0 0 0 0 0 0
57412- 0 0 0 0 0 0 0 0 0 0 0 0
57413- 0 0 0 0 0 0 0 0 0 0 0 0
57414- 6 6 6 18 18 18 46 46 46 90 90 90
57415- 46 46 46 18 18 18 6 6 6 182 182 182
57416-253 253 253 246 246 246 206 206 206 190 190 190
57417-190 190 190 190 190 190 190 190 190 190 190 190
57418-206 206 206 231 231 231 250 250 250 253 253 253
57419-253 253 253 253 253 253 253 253 253 253 253 253
57420-202 202 202 14 14 14 2 2 6 2 2 6
57421- 2 2 6 2 2 6 2 2 6 2 2 6
57422- 42 42 42 86 86 86 42 42 42 18 18 18
57423- 6 6 6 0 0 0 0 0 0 0 0 0
57424- 0 0 0 0 0 0 0 0 0 0 0 0
57425- 0 0 0 0 0 0 0 0 0 0 0 0
57426- 0 0 0 0 0 0 0 0 0 0 0 0
57427- 0 0 0 0 0 0 0 0 0 0 0 0
57428- 0 0 0 0 0 0 0 0 0 0 0 0
57429- 0 0 0 0 0 0 0 0 0 0 0 0
57430- 0 0 0 0 0 0 0 0 0 0 0 0
57431- 0 0 0 0 0 0 0 0 0 0 0 0
57432- 0 0 0 0 0 0 0 0 0 0 0 0
57433- 0 0 0 0 0 0 0 0 0 6 6 6
57434- 14 14 14 38 38 38 74 74 74 66 66 66
57435- 2 2 6 6 6 6 90 90 90 250 250 250
57436-253 253 253 253 253 253 238 238 238 198 198 198
57437-190 190 190 190 190 190 195 195 195 221 221 221
57438-246 246 246 253 253 253 253 253 253 253 253 253
57439-253 253 253 253 253 253 253 253 253 253 253 253
57440-253 253 253 82 82 82 2 2 6 2 2 6
57441- 2 2 6 2 2 6 2 2 6 2 2 6
57442- 2 2 6 78 78 78 70 70 70 34 34 34
57443- 14 14 14 6 6 6 0 0 0 0 0 0
57444- 0 0 0 0 0 0 0 0 0 0 0 0
57445- 0 0 0 0 0 0 0 0 0 0 0 0
57446- 0 0 0 0 0 0 0 0 0 0 0 0
57447- 0 0 0 0 0 0 0 0 0 0 0 0
57448- 0 0 0 0 0 0 0 0 0 0 0 0
57449- 0 0 0 0 0 0 0 0 0 0 0 0
57450- 0 0 0 0 0 0 0 0 0 0 0 0
57451- 0 0 0 0 0 0 0 0 0 0 0 0
57452- 0 0 0 0 0 0 0 0 0 0 0 0
57453- 0 0 0 0 0 0 0 0 0 14 14 14
57454- 34 34 34 66 66 66 78 78 78 6 6 6
57455- 2 2 6 18 18 18 218 218 218 253 253 253
57456-253 253 253 253 253 253 253 253 253 246 246 246
57457-226 226 226 231 231 231 246 246 246 253 253 253
57458-253 253 253 253 253 253 253 253 253 253 253 253
57459-253 253 253 253 253 253 253 253 253 253 253 253
57460-253 253 253 178 178 178 2 2 6 2 2 6
57461- 2 2 6 2 2 6 2 2 6 2 2 6
57462- 2 2 6 18 18 18 90 90 90 62 62 62
57463- 30 30 30 10 10 10 0 0 0 0 0 0
57464- 0 0 0 0 0 0 0 0 0 0 0 0
57465- 0 0 0 0 0 0 0 0 0 0 0 0
57466- 0 0 0 0 0 0 0 0 0 0 0 0
57467- 0 0 0 0 0 0 0 0 0 0 0 0
57468- 0 0 0 0 0 0 0 0 0 0 0 0
57469- 0 0 0 0 0 0 0 0 0 0 0 0
57470- 0 0 0 0 0 0 0 0 0 0 0 0
57471- 0 0 0 0 0 0 0 0 0 0 0 0
57472- 0 0 0 0 0 0 0 0 0 0 0 0
57473- 0 0 0 0 0 0 10 10 10 26 26 26
57474- 58 58 58 90 90 90 18 18 18 2 2 6
57475- 2 2 6 110 110 110 253 253 253 253 253 253
57476-253 253 253 253 253 253 253 253 253 253 253 253
57477-250 250 250 253 253 253 253 253 253 253 253 253
57478-253 253 253 253 253 253 253 253 253 253 253 253
57479-253 253 253 253 253 253 253 253 253 253 253 253
57480-253 253 253 231 231 231 18 18 18 2 2 6
57481- 2 2 6 2 2 6 2 2 6 2 2 6
57482- 2 2 6 2 2 6 18 18 18 94 94 94
57483- 54 54 54 26 26 26 10 10 10 0 0 0
57484- 0 0 0 0 0 0 0 0 0 0 0 0
57485- 0 0 0 0 0 0 0 0 0 0 0 0
57486- 0 0 0 0 0 0 0 0 0 0 0 0
57487- 0 0 0 0 0 0 0 0 0 0 0 0
57488- 0 0 0 0 0 0 0 0 0 0 0 0
57489- 0 0 0 0 0 0 0 0 0 0 0 0
57490- 0 0 0 0 0 0 0 0 0 0 0 0
57491- 0 0 0 0 0 0 0 0 0 0 0 0
57492- 0 0 0 0 0 0 0 0 0 0 0 0
57493- 0 0 0 6 6 6 22 22 22 50 50 50
57494- 90 90 90 26 26 26 2 2 6 2 2 6
57495- 14 14 14 195 195 195 250 250 250 253 253 253
57496-253 253 253 253 253 253 253 253 253 253 253 253
57497-253 253 253 253 253 253 253 253 253 253 253 253
57498-253 253 253 253 253 253 253 253 253 253 253 253
57499-253 253 253 253 253 253 253 253 253 253 253 253
57500-250 250 250 242 242 242 54 54 54 2 2 6
57501- 2 2 6 2 2 6 2 2 6 2 2 6
57502- 2 2 6 2 2 6 2 2 6 38 38 38
57503- 86 86 86 50 50 50 22 22 22 6 6 6
57504- 0 0 0 0 0 0 0 0 0 0 0 0
57505- 0 0 0 0 0 0 0 0 0 0 0 0
57506- 0 0 0 0 0 0 0 0 0 0 0 0
57507- 0 0 0 0 0 0 0 0 0 0 0 0
57508- 0 0 0 0 0 0 0 0 0 0 0 0
57509- 0 0 0 0 0 0 0 0 0 0 0 0
57510- 0 0 0 0 0 0 0 0 0 0 0 0
57511- 0 0 0 0 0 0 0 0 0 0 0 0
57512- 0 0 0 0 0 0 0 0 0 0 0 0
57513- 6 6 6 14 14 14 38 38 38 82 82 82
57514- 34 34 34 2 2 6 2 2 6 2 2 6
57515- 42 42 42 195 195 195 246 246 246 253 253 253
57516-253 253 253 253 253 253 253 253 253 250 250 250
57517-242 242 242 242 242 242 250 250 250 253 253 253
57518-253 253 253 253 253 253 253 253 253 253 253 253
57519-253 253 253 250 250 250 246 246 246 238 238 238
57520-226 226 226 231 231 231 101 101 101 6 6 6
57521- 2 2 6 2 2 6 2 2 6 2 2 6
57522- 2 2 6 2 2 6 2 2 6 2 2 6
57523- 38 38 38 82 82 82 42 42 42 14 14 14
57524- 6 6 6 0 0 0 0 0 0 0 0 0
57525- 0 0 0 0 0 0 0 0 0 0 0 0
57526- 0 0 0 0 0 0 0 0 0 0 0 0
57527- 0 0 0 0 0 0 0 0 0 0 0 0
57528- 0 0 0 0 0 0 0 0 0 0 0 0
57529- 0 0 0 0 0 0 0 0 0 0 0 0
57530- 0 0 0 0 0 0 0 0 0 0 0 0
57531- 0 0 0 0 0 0 0 0 0 0 0 0
57532- 0 0 0 0 0 0 0 0 0 0 0 0
57533- 10 10 10 26 26 26 62 62 62 66 66 66
57534- 2 2 6 2 2 6 2 2 6 6 6 6
57535- 70 70 70 170 170 170 206 206 206 234 234 234
57536-246 246 246 250 250 250 250 250 250 238 238 238
57537-226 226 226 231 231 231 238 238 238 250 250 250
57538-250 250 250 250 250 250 246 246 246 231 231 231
57539-214 214 214 206 206 206 202 202 202 202 202 202
57540-198 198 198 202 202 202 182 182 182 18 18 18
57541- 2 2 6 2 2 6 2 2 6 2 2 6
57542- 2 2 6 2 2 6 2 2 6 2 2 6
57543- 2 2 6 62 62 62 66 66 66 30 30 30
57544- 10 10 10 0 0 0 0 0 0 0 0 0
57545- 0 0 0 0 0 0 0 0 0 0 0 0
57546- 0 0 0 0 0 0 0 0 0 0 0 0
57547- 0 0 0 0 0 0 0 0 0 0 0 0
57548- 0 0 0 0 0 0 0 0 0 0 0 0
57549- 0 0 0 0 0 0 0 0 0 0 0 0
57550- 0 0 0 0 0 0 0 0 0 0 0 0
57551- 0 0 0 0 0 0 0 0 0 0 0 0
57552- 0 0 0 0 0 0 0 0 0 0 0 0
57553- 14 14 14 42 42 42 82 82 82 18 18 18
57554- 2 2 6 2 2 6 2 2 6 10 10 10
57555- 94 94 94 182 182 182 218 218 218 242 242 242
57556-250 250 250 253 253 253 253 253 253 250 250 250
57557-234 234 234 253 253 253 253 253 253 253 253 253
57558-253 253 253 253 253 253 253 253 253 246 246 246
57559-238 238 238 226 226 226 210 210 210 202 202 202
57560-195 195 195 195 195 195 210 210 210 158 158 158
57561- 6 6 6 14 14 14 50 50 50 14 14 14
57562- 2 2 6 2 2 6 2 2 6 2 2 6
57563- 2 2 6 6 6 6 86 86 86 46 46 46
57564- 18 18 18 6 6 6 0 0 0 0 0 0
57565- 0 0 0 0 0 0 0 0 0 0 0 0
57566- 0 0 0 0 0 0 0 0 0 0 0 0
57567- 0 0 0 0 0 0 0 0 0 0 0 0
57568- 0 0 0 0 0 0 0 0 0 0 0 0
57569- 0 0 0 0 0 0 0 0 0 0 0 0
57570- 0 0 0 0 0 0 0 0 0 0 0 0
57571- 0 0 0 0 0 0 0 0 0 0 0 0
57572- 0 0 0 0 0 0 0 0 0 6 6 6
57573- 22 22 22 54 54 54 70 70 70 2 2 6
57574- 2 2 6 10 10 10 2 2 6 22 22 22
57575-166 166 166 231 231 231 250 250 250 253 253 253
57576-253 253 253 253 253 253 253 253 253 250 250 250
57577-242 242 242 253 253 253 253 253 253 253 253 253
57578-253 253 253 253 253 253 253 253 253 253 253 253
57579-253 253 253 253 253 253 253 253 253 246 246 246
57580-231 231 231 206 206 206 198 198 198 226 226 226
57581- 94 94 94 2 2 6 6 6 6 38 38 38
57582- 30 30 30 2 2 6 2 2 6 2 2 6
57583- 2 2 6 2 2 6 62 62 62 66 66 66
57584- 26 26 26 10 10 10 0 0 0 0 0 0
57585- 0 0 0 0 0 0 0 0 0 0 0 0
57586- 0 0 0 0 0 0 0 0 0 0 0 0
57587- 0 0 0 0 0 0 0 0 0 0 0 0
57588- 0 0 0 0 0 0 0 0 0 0 0 0
57589- 0 0 0 0 0 0 0 0 0 0 0 0
57590- 0 0 0 0 0 0 0 0 0 0 0 0
57591- 0 0 0 0 0 0 0 0 0 0 0 0
57592- 0 0 0 0 0 0 0 0 0 10 10 10
57593- 30 30 30 74 74 74 50 50 50 2 2 6
57594- 26 26 26 26 26 26 2 2 6 106 106 106
57595-238 238 238 253 253 253 253 253 253 253 253 253
57596-253 253 253 253 253 253 253 253 253 253 253 253
57597-253 253 253 253 253 253 253 253 253 253 253 253
57598-253 253 253 253 253 253 253 253 253 253 253 253
57599-253 253 253 253 253 253 253 253 253 253 253 253
57600-253 253 253 246 246 246 218 218 218 202 202 202
57601-210 210 210 14 14 14 2 2 6 2 2 6
57602- 30 30 30 22 22 22 2 2 6 2 2 6
57603- 2 2 6 2 2 6 18 18 18 86 86 86
57604- 42 42 42 14 14 14 0 0 0 0 0 0
57605- 0 0 0 0 0 0 0 0 0 0 0 0
57606- 0 0 0 0 0 0 0 0 0 0 0 0
57607- 0 0 0 0 0 0 0 0 0 0 0 0
57608- 0 0 0 0 0 0 0 0 0 0 0 0
57609- 0 0 0 0 0 0 0 0 0 0 0 0
57610- 0 0 0 0 0 0 0 0 0 0 0 0
57611- 0 0 0 0 0 0 0 0 0 0 0 0
57612- 0 0 0 0 0 0 0 0 0 14 14 14
57613- 42 42 42 90 90 90 22 22 22 2 2 6
57614- 42 42 42 2 2 6 18 18 18 218 218 218
57615-253 253 253 253 253 253 253 253 253 253 253 253
57616-253 253 253 253 253 253 253 253 253 253 253 253
57617-253 253 253 253 253 253 253 253 253 253 253 253
57618-253 253 253 253 253 253 253 253 253 253 253 253
57619-253 253 253 253 253 253 253 253 253 253 253 253
57620-253 253 253 253 253 253 250 250 250 221 221 221
57621-218 218 218 101 101 101 2 2 6 14 14 14
57622- 18 18 18 38 38 38 10 10 10 2 2 6
57623- 2 2 6 2 2 6 2 2 6 78 78 78
57624- 58 58 58 22 22 22 6 6 6 0 0 0
57625- 0 0 0 0 0 0 0 0 0 0 0 0
57626- 0 0 0 0 0 0 0 0 0 0 0 0
57627- 0 0 0 0 0 0 0 0 0 0 0 0
57628- 0 0 0 0 0 0 0 0 0 0 0 0
57629- 0 0 0 0 0 0 0 0 0 0 0 0
57630- 0 0 0 0 0 0 0 0 0 0 0 0
57631- 0 0 0 0 0 0 0 0 0 0 0 0
57632- 0 0 0 0 0 0 6 6 6 18 18 18
57633- 54 54 54 82 82 82 2 2 6 26 26 26
57634- 22 22 22 2 2 6 123 123 123 253 253 253
57635-253 253 253 253 253 253 253 253 253 253 253 253
57636-253 253 253 253 253 253 253 253 253 253 253 253
57637-253 253 253 253 253 253 253 253 253 253 253 253
57638-253 253 253 253 253 253 253 253 253 253 253 253
57639-253 253 253 253 253 253 253 253 253 253 253 253
57640-253 253 253 253 253 253 253 253 253 250 250 250
57641-238 238 238 198 198 198 6 6 6 38 38 38
57642- 58 58 58 26 26 26 38 38 38 2 2 6
57643- 2 2 6 2 2 6 2 2 6 46 46 46
57644- 78 78 78 30 30 30 10 10 10 0 0 0
57645- 0 0 0 0 0 0 0 0 0 0 0 0
57646- 0 0 0 0 0 0 0 0 0 0 0 0
57647- 0 0 0 0 0 0 0 0 0 0 0 0
57648- 0 0 0 0 0 0 0 0 0 0 0 0
57649- 0 0 0 0 0 0 0 0 0 0 0 0
57650- 0 0 0 0 0 0 0 0 0 0 0 0
57651- 0 0 0 0 0 0 0 0 0 0 0 0
57652- 0 0 0 0 0 0 10 10 10 30 30 30
57653- 74 74 74 58 58 58 2 2 6 42 42 42
57654- 2 2 6 22 22 22 231 231 231 253 253 253
57655-253 253 253 253 253 253 253 253 253 253 253 253
57656-253 253 253 253 253 253 253 253 253 250 250 250
57657-253 253 253 253 253 253 253 253 253 253 253 253
57658-253 253 253 253 253 253 253 253 253 253 253 253
57659-253 253 253 253 253 253 253 253 253 253 253 253
57660-253 253 253 253 253 253 253 253 253 253 253 253
57661-253 253 253 246 246 246 46 46 46 38 38 38
57662- 42 42 42 14 14 14 38 38 38 14 14 14
57663- 2 2 6 2 2 6 2 2 6 6 6 6
57664- 86 86 86 46 46 46 14 14 14 0 0 0
57665- 0 0 0 0 0 0 0 0 0 0 0 0
57666- 0 0 0 0 0 0 0 0 0 0 0 0
57667- 0 0 0 0 0 0 0 0 0 0 0 0
57668- 0 0 0 0 0 0 0 0 0 0 0 0
57669- 0 0 0 0 0 0 0 0 0 0 0 0
57670- 0 0 0 0 0 0 0 0 0 0 0 0
57671- 0 0 0 0 0 0 0 0 0 0 0 0
57672- 0 0 0 6 6 6 14 14 14 42 42 42
57673- 90 90 90 18 18 18 18 18 18 26 26 26
57674- 2 2 6 116 116 116 253 253 253 253 253 253
57675-253 253 253 253 253 253 253 253 253 253 253 253
57676-253 253 253 253 253 253 250 250 250 238 238 238
57677-253 253 253 253 253 253 253 253 253 253 253 253
57678-253 253 253 253 253 253 253 253 253 253 253 253
57679-253 253 253 253 253 253 253 253 253 253 253 253
57680-253 253 253 253 253 253 253 253 253 253 253 253
57681-253 253 253 253 253 253 94 94 94 6 6 6
57682- 2 2 6 2 2 6 10 10 10 34 34 34
57683- 2 2 6 2 2 6 2 2 6 2 2 6
57684- 74 74 74 58 58 58 22 22 22 6 6 6
57685- 0 0 0 0 0 0 0 0 0 0 0 0
57686- 0 0 0 0 0 0 0 0 0 0 0 0
57687- 0 0 0 0 0 0 0 0 0 0 0 0
57688- 0 0 0 0 0 0 0 0 0 0 0 0
57689- 0 0 0 0 0 0 0 0 0 0 0 0
57690- 0 0 0 0 0 0 0 0 0 0 0 0
57691- 0 0 0 0 0 0 0 0 0 0 0 0
57692- 0 0 0 10 10 10 26 26 26 66 66 66
57693- 82 82 82 2 2 6 38 38 38 6 6 6
57694- 14 14 14 210 210 210 253 253 253 253 253 253
57695-253 253 253 253 253 253 253 253 253 253 253 253
57696-253 253 253 253 253 253 246 246 246 242 242 242
57697-253 253 253 253 253 253 253 253 253 253 253 253
57698-253 253 253 253 253 253 253 253 253 253 253 253
57699-253 253 253 253 253 253 253 253 253 253 253 253
57700-253 253 253 253 253 253 253 253 253 253 253 253
57701-253 253 253 253 253 253 144 144 144 2 2 6
57702- 2 2 6 2 2 6 2 2 6 46 46 46
57703- 2 2 6 2 2 6 2 2 6 2 2 6
57704- 42 42 42 74 74 74 30 30 30 10 10 10
57705- 0 0 0 0 0 0 0 0 0 0 0 0
57706- 0 0 0 0 0 0 0 0 0 0 0 0
57707- 0 0 0 0 0 0 0 0 0 0 0 0
57708- 0 0 0 0 0 0 0 0 0 0 0 0
57709- 0 0 0 0 0 0 0 0 0 0 0 0
57710- 0 0 0 0 0 0 0 0 0 0 0 0
57711- 0 0 0 0 0 0 0 0 0 0 0 0
57712- 6 6 6 14 14 14 42 42 42 90 90 90
57713- 26 26 26 6 6 6 42 42 42 2 2 6
57714- 74 74 74 250 250 250 253 253 253 253 253 253
57715-253 253 253 253 253 253 253 253 253 253 253 253
57716-253 253 253 253 253 253 242 242 242 242 242 242
57717-253 253 253 253 253 253 253 253 253 253 253 253
57718-253 253 253 253 253 253 253 253 253 253 253 253
57719-253 253 253 253 253 253 253 253 253 253 253 253
57720-253 253 253 253 253 253 253 253 253 253 253 253
57721-253 253 253 253 253 253 182 182 182 2 2 6
57722- 2 2 6 2 2 6 2 2 6 46 46 46
57723- 2 2 6 2 2 6 2 2 6 2 2 6
57724- 10 10 10 86 86 86 38 38 38 10 10 10
57725- 0 0 0 0 0 0 0 0 0 0 0 0
57726- 0 0 0 0 0 0 0 0 0 0 0 0
57727- 0 0 0 0 0 0 0 0 0 0 0 0
57728- 0 0 0 0 0 0 0 0 0 0 0 0
57729- 0 0 0 0 0 0 0 0 0 0 0 0
57730- 0 0 0 0 0 0 0 0 0 0 0 0
57731- 0 0 0 0 0 0 0 0 0 0 0 0
57732- 10 10 10 26 26 26 66 66 66 82 82 82
57733- 2 2 6 22 22 22 18 18 18 2 2 6
57734-149 149 149 253 253 253 253 253 253 253 253 253
57735-253 253 253 253 253 253 253 253 253 253 253 253
57736-253 253 253 253 253 253 234 234 234 242 242 242
57737-253 253 253 253 253 253 253 253 253 253 253 253
57738-253 253 253 253 253 253 253 253 253 253 253 253
57739-253 253 253 253 253 253 253 253 253 253 253 253
57740-253 253 253 253 253 253 253 253 253 253 253 253
57741-253 253 253 253 253 253 206 206 206 2 2 6
57742- 2 2 6 2 2 6 2 2 6 38 38 38
57743- 2 2 6 2 2 6 2 2 6 2 2 6
57744- 6 6 6 86 86 86 46 46 46 14 14 14
57745- 0 0 0 0 0 0 0 0 0 0 0 0
57746- 0 0 0 0 0 0 0 0 0 0 0 0
57747- 0 0 0 0 0 0 0 0 0 0 0 0
57748- 0 0 0 0 0 0 0 0 0 0 0 0
57749- 0 0 0 0 0 0 0 0 0 0 0 0
57750- 0 0 0 0 0 0 0 0 0 0 0 0
57751- 0 0 0 0 0 0 0 0 0 6 6 6
57752- 18 18 18 46 46 46 86 86 86 18 18 18
57753- 2 2 6 34 34 34 10 10 10 6 6 6
57754-210 210 210 253 253 253 253 253 253 253 253 253
57755-253 253 253 253 253 253 253 253 253 253 253 253
57756-253 253 253 253 253 253 234 234 234 242 242 242
57757-253 253 253 253 253 253 253 253 253 253 253 253
57758-253 253 253 253 253 253 253 253 253 253 253 253
57759-253 253 253 253 253 253 253 253 253 253 253 253
57760-253 253 253 253 253 253 253 253 253 253 253 253
57761-253 253 253 253 253 253 221 221 221 6 6 6
57762- 2 2 6 2 2 6 6 6 6 30 30 30
57763- 2 2 6 2 2 6 2 2 6 2 2 6
57764- 2 2 6 82 82 82 54 54 54 18 18 18
57765- 6 6 6 0 0 0 0 0 0 0 0 0
57766- 0 0 0 0 0 0 0 0 0 0 0 0
57767- 0 0 0 0 0 0 0 0 0 0 0 0
57768- 0 0 0 0 0 0 0 0 0 0 0 0
57769- 0 0 0 0 0 0 0 0 0 0 0 0
57770- 0 0 0 0 0 0 0 0 0 0 0 0
57771- 0 0 0 0 0 0 0 0 0 10 10 10
57772- 26 26 26 66 66 66 62 62 62 2 2 6
57773- 2 2 6 38 38 38 10 10 10 26 26 26
57774-238 238 238 253 253 253 253 253 253 253 253 253
57775-253 253 253 253 253 253 253 253 253 253 253 253
57776-253 253 253 253 253 253 231 231 231 238 238 238
57777-253 253 253 253 253 253 253 253 253 253 253 253
57778-253 253 253 253 253 253 253 253 253 253 253 253
57779-253 253 253 253 253 253 253 253 253 253 253 253
57780-253 253 253 253 253 253 253 253 253 253 253 253
57781-253 253 253 253 253 253 231 231 231 6 6 6
57782- 2 2 6 2 2 6 10 10 10 30 30 30
57783- 2 2 6 2 2 6 2 2 6 2 2 6
57784- 2 2 6 66 66 66 58 58 58 22 22 22
57785- 6 6 6 0 0 0 0 0 0 0 0 0
57786- 0 0 0 0 0 0 0 0 0 0 0 0
57787- 0 0 0 0 0 0 0 0 0 0 0 0
57788- 0 0 0 0 0 0 0 0 0 0 0 0
57789- 0 0 0 0 0 0 0 0 0 0 0 0
57790- 0 0 0 0 0 0 0 0 0 0 0 0
57791- 0 0 0 0 0 0 0 0 0 10 10 10
57792- 38 38 38 78 78 78 6 6 6 2 2 6
57793- 2 2 6 46 46 46 14 14 14 42 42 42
57794-246 246 246 253 253 253 253 253 253 253 253 253
57795-253 253 253 253 253 253 253 253 253 253 253 253
57796-253 253 253 253 253 253 231 231 231 242 242 242
57797-253 253 253 253 253 253 253 253 253 253 253 253
57798-253 253 253 253 253 253 253 253 253 253 253 253
57799-253 253 253 253 253 253 253 253 253 253 253 253
57800-253 253 253 253 253 253 253 253 253 253 253 253
57801-253 253 253 253 253 253 234 234 234 10 10 10
57802- 2 2 6 2 2 6 22 22 22 14 14 14
57803- 2 2 6 2 2 6 2 2 6 2 2 6
57804- 2 2 6 66 66 66 62 62 62 22 22 22
57805- 6 6 6 0 0 0 0 0 0 0 0 0
57806- 0 0 0 0 0 0 0 0 0 0 0 0
57807- 0 0 0 0 0 0 0 0 0 0 0 0
57808- 0 0 0 0 0 0 0 0 0 0 0 0
57809- 0 0 0 0 0 0 0 0 0 0 0 0
57810- 0 0 0 0 0 0 0 0 0 0 0 0
57811- 0 0 0 0 0 0 6 6 6 18 18 18
57812- 50 50 50 74 74 74 2 2 6 2 2 6
57813- 14 14 14 70 70 70 34 34 34 62 62 62
57814-250 250 250 253 253 253 253 253 253 253 253 253
57815-253 253 253 253 253 253 253 253 253 253 253 253
57816-253 253 253 253 253 253 231 231 231 246 246 246
57817-253 253 253 253 253 253 253 253 253 253 253 253
57818-253 253 253 253 253 253 253 253 253 253 253 253
57819-253 253 253 253 253 253 253 253 253 253 253 253
57820-253 253 253 253 253 253 253 253 253 253 253 253
57821-253 253 253 253 253 253 234 234 234 14 14 14
57822- 2 2 6 2 2 6 30 30 30 2 2 6
57823- 2 2 6 2 2 6 2 2 6 2 2 6
57824- 2 2 6 66 66 66 62 62 62 22 22 22
57825- 6 6 6 0 0 0 0 0 0 0 0 0
57826- 0 0 0 0 0 0 0 0 0 0 0 0
57827- 0 0 0 0 0 0 0 0 0 0 0 0
57828- 0 0 0 0 0 0 0 0 0 0 0 0
57829- 0 0 0 0 0 0 0 0 0 0 0 0
57830- 0 0 0 0 0 0 0 0 0 0 0 0
57831- 0 0 0 0 0 0 6 6 6 18 18 18
57832- 54 54 54 62 62 62 2 2 6 2 2 6
57833- 2 2 6 30 30 30 46 46 46 70 70 70
57834-250 250 250 253 253 253 253 253 253 253 253 253
57835-253 253 253 253 253 253 253 253 253 253 253 253
57836-253 253 253 253 253 253 231 231 231 246 246 246
57837-253 253 253 253 253 253 253 253 253 253 253 253
57838-253 253 253 253 253 253 253 253 253 253 253 253
57839-253 253 253 253 253 253 253 253 253 253 253 253
57840-253 253 253 253 253 253 253 253 253 253 253 253
57841-253 253 253 253 253 253 226 226 226 10 10 10
57842- 2 2 6 6 6 6 30 30 30 2 2 6
57843- 2 2 6 2 2 6 2 2 6 2 2 6
57844- 2 2 6 66 66 66 58 58 58 22 22 22
57845- 6 6 6 0 0 0 0 0 0 0 0 0
57846- 0 0 0 0 0 0 0 0 0 0 0 0
57847- 0 0 0 0 0 0 0 0 0 0 0 0
57848- 0 0 0 0 0 0 0 0 0 0 0 0
57849- 0 0 0 0 0 0 0 0 0 0 0 0
57850- 0 0 0 0 0 0 0 0 0 0 0 0
57851- 0 0 0 0 0 0 6 6 6 22 22 22
57852- 58 58 58 62 62 62 2 2 6 2 2 6
57853- 2 2 6 2 2 6 30 30 30 78 78 78
57854-250 250 250 253 253 253 253 253 253 253 253 253
57855-253 253 253 253 253 253 253 253 253 253 253 253
57856-253 253 253 253 253 253 231 231 231 246 246 246
57857-253 253 253 253 253 253 253 253 253 253 253 253
57858-253 253 253 253 253 253 253 253 253 253 253 253
57859-253 253 253 253 253 253 253 253 253 253 253 253
57860-253 253 253 253 253 253 253 253 253 253 253 253
57861-253 253 253 253 253 253 206 206 206 2 2 6
57862- 22 22 22 34 34 34 18 14 6 22 22 22
57863- 26 26 26 18 18 18 6 6 6 2 2 6
57864- 2 2 6 82 82 82 54 54 54 18 18 18
57865- 6 6 6 0 0 0 0 0 0 0 0 0
57866- 0 0 0 0 0 0 0 0 0 0 0 0
57867- 0 0 0 0 0 0 0 0 0 0 0 0
57868- 0 0 0 0 0 0 0 0 0 0 0 0
57869- 0 0 0 0 0 0 0 0 0 0 0 0
57870- 0 0 0 0 0 0 0 0 0 0 0 0
57871- 0 0 0 0 0 0 6 6 6 26 26 26
57872- 62 62 62 106 106 106 74 54 14 185 133 11
57873-210 162 10 121 92 8 6 6 6 62 62 62
57874-238 238 238 253 253 253 253 253 253 253 253 253
57875-253 253 253 253 253 253 253 253 253 253 253 253
57876-253 253 253 253 253 253 231 231 231 246 246 246
57877-253 253 253 253 253 253 253 253 253 253 253 253
57878-253 253 253 253 253 253 253 253 253 253 253 253
57879-253 253 253 253 253 253 253 253 253 253 253 253
57880-253 253 253 253 253 253 253 253 253 253 253 253
57881-253 253 253 253 253 253 158 158 158 18 18 18
57882- 14 14 14 2 2 6 2 2 6 2 2 6
57883- 6 6 6 18 18 18 66 66 66 38 38 38
57884- 6 6 6 94 94 94 50 50 50 18 18 18
57885- 6 6 6 0 0 0 0 0 0 0 0 0
57886- 0 0 0 0 0 0 0 0 0 0 0 0
57887- 0 0 0 0 0 0 0 0 0 0 0 0
57888- 0 0 0 0 0 0 0 0 0 0 0 0
57889- 0 0 0 0 0 0 0 0 0 0 0 0
57890- 0 0 0 0 0 0 0 0 0 6 6 6
57891- 10 10 10 10 10 10 18 18 18 38 38 38
57892- 78 78 78 142 134 106 216 158 10 242 186 14
57893-246 190 14 246 190 14 156 118 10 10 10 10
57894- 90 90 90 238 238 238 253 253 253 253 253 253
57895-253 253 253 253 253 253 253 253 253 253 253 253
57896-253 253 253 253 253 253 231 231 231 250 250 250
57897-253 253 253 253 253 253 253 253 253 253 253 253
57898-253 253 253 253 253 253 253 253 253 253 253 253
57899-253 253 253 253 253 253 253 253 253 253 253 253
57900-253 253 253 253 253 253 253 253 253 246 230 190
57901-238 204 91 238 204 91 181 142 44 37 26 9
57902- 2 2 6 2 2 6 2 2 6 2 2 6
57903- 2 2 6 2 2 6 38 38 38 46 46 46
57904- 26 26 26 106 106 106 54 54 54 18 18 18
57905- 6 6 6 0 0 0 0 0 0 0 0 0
57906- 0 0 0 0 0 0 0 0 0 0 0 0
57907- 0 0 0 0 0 0 0 0 0 0 0 0
57908- 0 0 0 0 0 0 0 0 0 0 0 0
57909- 0 0 0 0 0 0 0 0 0 0 0 0
57910- 0 0 0 6 6 6 14 14 14 22 22 22
57911- 30 30 30 38 38 38 50 50 50 70 70 70
57912-106 106 106 190 142 34 226 170 11 242 186 14
57913-246 190 14 246 190 14 246 190 14 154 114 10
57914- 6 6 6 74 74 74 226 226 226 253 253 253
57915-253 253 253 253 253 253 253 253 253 253 253 253
57916-253 253 253 253 253 253 231 231 231 250 250 250
57917-253 253 253 253 253 253 253 253 253 253 253 253
57918-253 253 253 253 253 253 253 253 253 253 253 253
57919-253 253 253 253 253 253 253 253 253 253 253 253
57920-253 253 253 253 253 253 253 253 253 228 184 62
57921-241 196 14 241 208 19 232 195 16 38 30 10
57922- 2 2 6 2 2 6 2 2 6 2 2 6
57923- 2 2 6 6 6 6 30 30 30 26 26 26
57924-203 166 17 154 142 90 66 66 66 26 26 26
57925- 6 6 6 0 0 0 0 0 0 0 0 0
57926- 0 0 0 0 0 0 0 0 0 0 0 0
57927- 0 0 0 0 0 0 0 0 0 0 0 0
57928- 0 0 0 0 0 0 0 0 0 0 0 0
57929- 0 0 0 0 0 0 0 0 0 0 0 0
57930- 6 6 6 18 18 18 38 38 38 58 58 58
57931- 78 78 78 86 86 86 101 101 101 123 123 123
57932-175 146 61 210 150 10 234 174 13 246 186 14
57933-246 190 14 246 190 14 246 190 14 238 190 10
57934-102 78 10 2 2 6 46 46 46 198 198 198
57935-253 253 253 253 253 253 253 253 253 253 253 253
57936-253 253 253 253 253 253 234 234 234 242 242 242
57937-253 253 253 253 253 253 253 253 253 253 253 253
57938-253 253 253 253 253 253 253 253 253 253 253 253
57939-253 253 253 253 253 253 253 253 253 253 253 253
57940-253 253 253 253 253 253 253 253 253 224 178 62
57941-242 186 14 241 196 14 210 166 10 22 18 6
57942- 2 2 6 2 2 6 2 2 6 2 2 6
57943- 2 2 6 2 2 6 6 6 6 121 92 8
57944-238 202 15 232 195 16 82 82 82 34 34 34
57945- 10 10 10 0 0 0 0 0 0 0 0 0
57946- 0 0 0 0 0 0 0 0 0 0 0 0
57947- 0 0 0 0 0 0 0 0 0 0 0 0
57948- 0 0 0 0 0 0 0 0 0 0 0 0
57949- 0 0 0 0 0 0 0 0 0 0 0 0
57950- 14 14 14 38 38 38 70 70 70 154 122 46
57951-190 142 34 200 144 11 197 138 11 197 138 11
57952-213 154 11 226 170 11 242 186 14 246 190 14
57953-246 190 14 246 190 14 246 190 14 246 190 14
57954-225 175 15 46 32 6 2 2 6 22 22 22
57955-158 158 158 250 250 250 253 253 253 253 253 253
57956-253 253 253 253 253 253 253 253 253 253 253 253
57957-253 253 253 253 253 253 253 253 253 253 253 253
57958-253 253 253 253 253 253 253 253 253 253 253 253
57959-253 253 253 253 253 253 253 253 253 253 253 253
57960-253 253 253 250 250 250 242 242 242 224 178 62
57961-239 182 13 236 186 11 213 154 11 46 32 6
57962- 2 2 6 2 2 6 2 2 6 2 2 6
57963- 2 2 6 2 2 6 61 42 6 225 175 15
57964-238 190 10 236 186 11 112 100 78 42 42 42
57965- 14 14 14 0 0 0 0 0 0 0 0 0
57966- 0 0 0 0 0 0 0 0 0 0 0 0
57967- 0 0 0 0 0 0 0 0 0 0 0 0
57968- 0 0 0 0 0 0 0 0 0 0 0 0
57969- 0 0 0 0 0 0 0 0 0 6 6 6
57970- 22 22 22 54 54 54 154 122 46 213 154 11
57971-226 170 11 230 174 11 226 170 11 226 170 11
57972-236 178 12 242 186 14 246 190 14 246 190 14
57973-246 190 14 246 190 14 246 190 14 246 190 14
57974-241 196 14 184 144 12 10 10 10 2 2 6
57975- 6 6 6 116 116 116 242 242 242 253 253 253
57976-253 253 253 253 253 253 253 253 253 253 253 253
57977-253 253 253 253 253 253 253 253 253 253 253 253
57978-253 253 253 253 253 253 253 253 253 253 253 253
57979-253 253 253 253 253 253 253 253 253 253 253 253
57980-253 253 253 231 231 231 198 198 198 214 170 54
57981-236 178 12 236 178 12 210 150 10 137 92 6
57982- 18 14 6 2 2 6 2 2 6 2 2 6
57983- 6 6 6 70 47 6 200 144 11 236 178 12
57984-239 182 13 239 182 13 124 112 88 58 58 58
57985- 22 22 22 6 6 6 0 0 0 0 0 0
57986- 0 0 0 0 0 0 0 0 0 0 0 0
57987- 0 0 0 0 0 0 0 0 0 0 0 0
57988- 0 0 0 0 0 0 0 0 0 0 0 0
57989- 0 0 0 0 0 0 0 0 0 10 10 10
57990- 30 30 30 70 70 70 180 133 36 226 170 11
57991-239 182 13 242 186 14 242 186 14 246 186 14
57992-246 190 14 246 190 14 246 190 14 246 190 14
57993-246 190 14 246 190 14 246 190 14 246 190 14
57994-246 190 14 232 195 16 98 70 6 2 2 6
57995- 2 2 6 2 2 6 66 66 66 221 221 221
57996-253 253 253 253 253 253 253 253 253 253 253 253
57997-253 253 253 253 253 253 253 253 253 253 253 253
57998-253 253 253 253 253 253 253 253 253 253 253 253
57999-253 253 253 253 253 253 253 253 253 253 253 253
58000-253 253 253 206 206 206 198 198 198 214 166 58
58001-230 174 11 230 174 11 216 158 10 192 133 9
58002-163 110 8 116 81 8 102 78 10 116 81 8
58003-167 114 7 197 138 11 226 170 11 239 182 13
58004-242 186 14 242 186 14 162 146 94 78 78 78
58005- 34 34 34 14 14 14 6 6 6 0 0 0
58006- 0 0 0 0 0 0 0 0 0 0 0 0
58007- 0 0 0 0 0 0 0 0 0 0 0 0
58008- 0 0 0 0 0 0 0 0 0 0 0 0
58009- 0 0 0 0 0 0 0 0 0 6 6 6
58010- 30 30 30 78 78 78 190 142 34 226 170 11
58011-239 182 13 246 190 14 246 190 14 246 190 14
58012-246 190 14 246 190 14 246 190 14 246 190 14
58013-246 190 14 246 190 14 246 190 14 246 190 14
58014-246 190 14 241 196 14 203 166 17 22 18 6
58015- 2 2 6 2 2 6 2 2 6 38 38 38
58016-218 218 218 253 253 253 253 253 253 253 253 253
58017-253 253 253 253 253 253 253 253 253 253 253 253
58018-253 253 253 253 253 253 253 253 253 253 253 253
58019-253 253 253 253 253 253 253 253 253 253 253 253
58020-250 250 250 206 206 206 198 198 198 202 162 69
58021-226 170 11 236 178 12 224 166 10 210 150 10
58022-200 144 11 197 138 11 192 133 9 197 138 11
58023-210 150 10 226 170 11 242 186 14 246 190 14
58024-246 190 14 246 186 14 225 175 15 124 112 88
58025- 62 62 62 30 30 30 14 14 14 6 6 6
58026- 0 0 0 0 0 0 0 0 0 0 0 0
58027- 0 0 0 0 0 0 0 0 0 0 0 0
58028- 0 0 0 0 0 0 0 0 0 0 0 0
58029- 0 0 0 0 0 0 0 0 0 10 10 10
58030- 30 30 30 78 78 78 174 135 50 224 166 10
58031-239 182 13 246 190 14 246 190 14 246 190 14
58032-246 190 14 246 190 14 246 190 14 246 190 14
58033-246 190 14 246 190 14 246 190 14 246 190 14
58034-246 190 14 246 190 14 241 196 14 139 102 15
58035- 2 2 6 2 2 6 2 2 6 2 2 6
58036- 78 78 78 250 250 250 253 253 253 253 253 253
58037-253 253 253 253 253 253 253 253 253 253 253 253
58038-253 253 253 253 253 253 253 253 253 253 253 253
58039-253 253 253 253 253 253 253 253 253 253 253 253
58040-250 250 250 214 214 214 198 198 198 190 150 46
58041-219 162 10 236 178 12 234 174 13 224 166 10
58042-216 158 10 213 154 11 213 154 11 216 158 10
58043-226 170 11 239 182 13 246 190 14 246 190 14
58044-246 190 14 246 190 14 242 186 14 206 162 42
58045-101 101 101 58 58 58 30 30 30 14 14 14
58046- 6 6 6 0 0 0 0 0 0 0 0 0
58047- 0 0 0 0 0 0 0 0 0 0 0 0
58048- 0 0 0 0 0 0 0 0 0 0 0 0
58049- 0 0 0 0 0 0 0 0 0 10 10 10
58050- 30 30 30 74 74 74 174 135 50 216 158 10
58051-236 178 12 246 190 14 246 190 14 246 190 14
58052-246 190 14 246 190 14 246 190 14 246 190 14
58053-246 190 14 246 190 14 246 190 14 246 190 14
58054-246 190 14 246 190 14 241 196 14 226 184 13
58055- 61 42 6 2 2 6 2 2 6 2 2 6
58056- 22 22 22 238 238 238 253 253 253 253 253 253
58057-253 253 253 253 253 253 253 253 253 253 253 253
58058-253 253 253 253 253 253 253 253 253 253 253 253
58059-253 253 253 253 253 253 253 253 253 253 253 253
58060-253 253 253 226 226 226 187 187 187 180 133 36
58061-216 158 10 236 178 12 239 182 13 236 178 12
58062-230 174 11 226 170 11 226 170 11 230 174 11
58063-236 178 12 242 186 14 246 190 14 246 190 14
58064-246 190 14 246 190 14 246 186 14 239 182 13
58065-206 162 42 106 106 106 66 66 66 34 34 34
58066- 14 14 14 6 6 6 0 0 0 0 0 0
58067- 0 0 0 0 0 0 0 0 0 0 0 0
58068- 0 0 0 0 0 0 0 0 0 0 0 0
58069- 0 0 0 0 0 0 0 0 0 6 6 6
58070- 26 26 26 70 70 70 163 133 67 213 154 11
58071-236 178 12 246 190 14 246 190 14 246 190 14
58072-246 190 14 246 190 14 246 190 14 246 190 14
58073-246 190 14 246 190 14 246 190 14 246 190 14
58074-246 190 14 246 190 14 246 190 14 241 196 14
58075-190 146 13 18 14 6 2 2 6 2 2 6
58076- 46 46 46 246 246 246 253 253 253 253 253 253
58077-253 253 253 253 253 253 253 253 253 253 253 253
58078-253 253 253 253 253 253 253 253 253 253 253 253
58079-253 253 253 253 253 253 253 253 253 253 253 253
58080-253 253 253 221 221 221 86 86 86 156 107 11
58081-216 158 10 236 178 12 242 186 14 246 186 14
58082-242 186 14 239 182 13 239 182 13 242 186 14
58083-242 186 14 246 186 14 246 190 14 246 190 14
58084-246 190 14 246 190 14 246 190 14 246 190 14
58085-242 186 14 225 175 15 142 122 72 66 66 66
58086- 30 30 30 10 10 10 0 0 0 0 0 0
58087- 0 0 0 0 0 0 0 0 0 0 0 0
58088- 0 0 0 0 0 0 0 0 0 0 0 0
58089- 0 0 0 0 0 0 0 0 0 6 6 6
58090- 26 26 26 70 70 70 163 133 67 210 150 10
58091-236 178 12 246 190 14 246 190 14 246 190 14
58092-246 190 14 246 190 14 246 190 14 246 190 14
58093-246 190 14 246 190 14 246 190 14 246 190 14
58094-246 190 14 246 190 14 246 190 14 246 190 14
58095-232 195 16 121 92 8 34 34 34 106 106 106
58096-221 221 221 253 253 253 253 253 253 253 253 253
58097-253 253 253 253 253 253 253 253 253 253 253 253
58098-253 253 253 253 253 253 253 253 253 253 253 253
58099-253 253 253 253 253 253 253 253 253 253 253 253
58100-242 242 242 82 82 82 18 14 6 163 110 8
58101-216 158 10 236 178 12 242 186 14 246 190 14
58102-246 190 14 246 190 14 246 190 14 246 190 14
58103-246 190 14 246 190 14 246 190 14 246 190 14
58104-246 190 14 246 190 14 246 190 14 246 190 14
58105-246 190 14 246 190 14 242 186 14 163 133 67
58106- 46 46 46 18 18 18 6 6 6 0 0 0
58107- 0 0 0 0 0 0 0 0 0 0 0 0
58108- 0 0 0 0 0 0 0 0 0 0 0 0
58109- 0 0 0 0 0 0 0 0 0 10 10 10
58110- 30 30 30 78 78 78 163 133 67 210 150 10
58111-236 178 12 246 186 14 246 190 14 246 190 14
58112-246 190 14 246 190 14 246 190 14 246 190 14
58113-246 190 14 246 190 14 246 190 14 246 190 14
58114-246 190 14 246 190 14 246 190 14 246 190 14
58115-241 196 14 215 174 15 190 178 144 253 253 253
58116-253 253 253 253 253 253 253 253 253 253 253 253
58117-253 253 253 253 253 253 253 253 253 253 253 253
58118-253 253 253 253 253 253 253 253 253 253 253 253
58119-253 253 253 253 253 253 253 253 253 218 218 218
58120- 58 58 58 2 2 6 22 18 6 167 114 7
58121-216 158 10 236 178 12 246 186 14 246 190 14
58122-246 190 14 246 190 14 246 190 14 246 190 14
58123-246 190 14 246 190 14 246 190 14 246 190 14
58124-246 190 14 246 190 14 246 190 14 246 190 14
58125-246 190 14 246 186 14 242 186 14 190 150 46
58126- 54 54 54 22 22 22 6 6 6 0 0 0
58127- 0 0 0 0 0 0 0 0 0 0 0 0
58128- 0 0 0 0 0 0 0 0 0 0 0 0
58129- 0 0 0 0 0 0 0 0 0 14 14 14
58130- 38 38 38 86 86 86 180 133 36 213 154 11
58131-236 178 12 246 186 14 246 190 14 246 190 14
58132-246 190 14 246 190 14 246 190 14 246 190 14
58133-246 190 14 246 190 14 246 190 14 246 190 14
58134-246 190 14 246 190 14 246 190 14 246 190 14
58135-246 190 14 232 195 16 190 146 13 214 214 214
58136-253 253 253 253 253 253 253 253 253 253 253 253
58137-253 253 253 253 253 253 253 253 253 253 253 253
58138-253 253 253 253 253 253 253 253 253 253 253 253
58139-253 253 253 250 250 250 170 170 170 26 26 26
58140- 2 2 6 2 2 6 37 26 9 163 110 8
58141-219 162 10 239 182 13 246 186 14 246 190 14
58142-246 190 14 246 190 14 246 190 14 246 190 14
58143-246 190 14 246 190 14 246 190 14 246 190 14
58144-246 190 14 246 190 14 246 190 14 246 190 14
58145-246 186 14 236 178 12 224 166 10 142 122 72
58146- 46 46 46 18 18 18 6 6 6 0 0 0
58147- 0 0 0 0 0 0 0 0 0 0 0 0
58148- 0 0 0 0 0 0 0 0 0 0 0 0
58149- 0 0 0 0 0 0 6 6 6 18 18 18
58150- 50 50 50 109 106 95 192 133 9 224 166 10
58151-242 186 14 246 190 14 246 190 14 246 190 14
58152-246 190 14 246 190 14 246 190 14 246 190 14
58153-246 190 14 246 190 14 246 190 14 246 190 14
58154-246 190 14 246 190 14 246 190 14 246 190 14
58155-242 186 14 226 184 13 210 162 10 142 110 46
58156-226 226 226 253 253 253 253 253 253 253 253 253
58157-253 253 253 253 253 253 253 253 253 253 253 253
58158-253 253 253 253 253 253 253 253 253 253 253 253
58159-198 198 198 66 66 66 2 2 6 2 2 6
58160- 2 2 6 2 2 6 50 34 6 156 107 11
58161-219 162 10 239 182 13 246 186 14 246 190 14
58162-246 190 14 246 190 14 246 190 14 246 190 14
58163-246 190 14 246 190 14 246 190 14 246 190 14
58164-246 190 14 246 190 14 246 190 14 242 186 14
58165-234 174 13 213 154 11 154 122 46 66 66 66
58166- 30 30 30 10 10 10 0 0 0 0 0 0
58167- 0 0 0 0 0 0 0 0 0 0 0 0
58168- 0 0 0 0 0 0 0 0 0 0 0 0
58169- 0 0 0 0 0 0 6 6 6 22 22 22
58170- 58 58 58 154 121 60 206 145 10 234 174 13
58171-242 186 14 246 186 14 246 190 14 246 190 14
58172-246 190 14 246 190 14 246 190 14 246 190 14
58173-246 190 14 246 190 14 246 190 14 246 190 14
58174-246 190 14 246 190 14 246 190 14 246 190 14
58175-246 186 14 236 178 12 210 162 10 163 110 8
58176- 61 42 6 138 138 138 218 218 218 250 250 250
58177-253 253 253 253 253 253 253 253 253 250 250 250
58178-242 242 242 210 210 210 144 144 144 66 66 66
58179- 6 6 6 2 2 6 2 2 6 2 2 6
58180- 2 2 6 2 2 6 61 42 6 163 110 8
58181-216 158 10 236 178 12 246 190 14 246 190 14
58182-246 190 14 246 190 14 246 190 14 246 190 14
58183-246 190 14 246 190 14 246 190 14 246 190 14
58184-246 190 14 239 182 13 230 174 11 216 158 10
58185-190 142 34 124 112 88 70 70 70 38 38 38
58186- 18 18 18 6 6 6 0 0 0 0 0 0
58187- 0 0 0 0 0 0 0 0 0 0 0 0
58188- 0 0 0 0 0 0 0 0 0 0 0 0
58189- 0 0 0 0 0 0 6 6 6 22 22 22
58190- 62 62 62 168 124 44 206 145 10 224 166 10
58191-236 178 12 239 182 13 242 186 14 242 186 14
58192-246 186 14 246 190 14 246 190 14 246 190 14
58193-246 190 14 246 190 14 246 190 14 246 190 14
58194-246 190 14 246 190 14 246 190 14 246 190 14
58195-246 190 14 236 178 12 216 158 10 175 118 6
58196- 80 54 7 2 2 6 6 6 6 30 30 30
58197- 54 54 54 62 62 62 50 50 50 38 38 38
58198- 14 14 14 2 2 6 2 2 6 2 2 6
58199- 2 2 6 2 2 6 2 2 6 2 2 6
58200- 2 2 6 6 6 6 80 54 7 167 114 7
58201-213 154 11 236 178 12 246 190 14 246 190 14
58202-246 190 14 246 190 14 246 190 14 246 190 14
58203-246 190 14 242 186 14 239 182 13 239 182 13
58204-230 174 11 210 150 10 174 135 50 124 112 88
58205- 82 82 82 54 54 54 34 34 34 18 18 18
58206- 6 6 6 0 0 0 0 0 0 0 0 0
58207- 0 0 0 0 0 0 0 0 0 0 0 0
58208- 0 0 0 0 0 0 0 0 0 0 0 0
58209- 0 0 0 0 0 0 6 6 6 18 18 18
58210- 50 50 50 158 118 36 192 133 9 200 144 11
58211-216 158 10 219 162 10 224 166 10 226 170 11
58212-230 174 11 236 178 12 239 182 13 239 182 13
58213-242 186 14 246 186 14 246 190 14 246 190 14
58214-246 190 14 246 190 14 246 190 14 246 190 14
58215-246 186 14 230 174 11 210 150 10 163 110 8
58216-104 69 6 10 10 10 2 2 6 2 2 6
58217- 2 2 6 2 2 6 2 2 6 2 2 6
58218- 2 2 6 2 2 6 2 2 6 2 2 6
58219- 2 2 6 2 2 6 2 2 6 2 2 6
58220- 2 2 6 6 6 6 91 60 6 167 114 7
58221-206 145 10 230 174 11 242 186 14 246 190 14
58222-246 190 14 246 190 14 246 186 14 242 186 14
58223-239 182 13 230 174 11 224 166 10 213 154 11
58224-180 133 36 124 112 88 86 86 86 58 58 58
58225- 38 38 38 22 22 22 10 10 10 6 6 6
58226- 0 0 0 0 0 0 0 0 0 0 0 0
58227- 0 0 0 0 0 0 0 0 0 0 0 0
58228- 0 0 0 0 0 0 0 0 0 0 0 0
58229- 0 0 0 0 0 0 0 0 0 14 14 14
58230- 34 34 34 70 70 70 138 110 50 158 118 36
58231-167 114 7 180 123 7 192 133 9 197 138 11
58232-200 144 11 206 145 10 213 154 11 219 162 10
58233-224 166 10 230 174 11 239 182 13 242 186 14
58234-246 186 14 246 186 14 246 186 14 246 186 14
58235-239 182 13 216 158 10 185 133 11 152 99 6
58236-104 69 6 18 14 6 2 2 6 2 2 6
58237- 2 2 6 2 2 6 2 2 6 2 2 6
58238- 2 2 6 2 2 6 2 2 6 2 2 6
58239- 2 2 6 2 2 6 2 2 6 2 2 6
58240- 2 2 6 6 6 6 80 54 7 152 99 6
58241-192 133 9 219 162 10 236 178 12 239 182 13
58242-246 186 14 242 186 14 239 182 13 236 178 12
58243-224 166 10 206 145 10 192 133 9 154 121 60
58244- 94 94 94 62 62 62 42 42 42 22 22 22
58245- 14 14 14 6 6 6 0 0 0 0 0 0
58246- 0 0 0 0 0 0 0 0 0 0 0 0
58247- 0 0 0 0 0 0 0 0 0 0 0 0
58248- 0 0 0 0 0 0 0 0 0 0 0 0
58249- 0 0 0 0 0 0 0 0 0 6 6 6
58250- 18 18 18 34 34 34 58 58 58 78 78 78
58251-101 98 89 124 112 88 142 110 46 156 107 11
58252-163 110 8 167 114 7 175 118 6 180 123 7
58253-185 133 11 197 138 11 210 150 10 219 162 10
58254-226 170 11 236 178 12 236 178 12 234 174 13
58255-219 162 10 197 138 11 163 110 8 130 83 6
58256- 91 60 6 10 10 10 2 2 6 2 2 6
58257- 18 18 18 38 38 38 38 38 38 38 38 38
58258- 38 38 38 38 38 38 38 38 38 38 38 38
58259- 38 38 38 38 38 38 26 26 26 2 2 6
58260- 2 2 6 6 6 6 70 47 6 137 92 6
58261-175 118 6 200 144 11 219 162 10 230 174 11
58262-234 174 13 230 174 11 219 162 10 210 150 10
58263-192 133 9 163 110 8 124 112 88 82 82 82
58264- 50 50 50 30 30 30 14 14 14 6 6 6
58265- 0 0 0 0 0 0 0 0 0 0 0 0
58266- 0 0 0 0 0 0 0 0 0 0 0 0
58267- 0 0 0 0 0 0 0 0 0 0 0 0
58268- 0 0 0 0 0 0 0 0 0 0 0 0
58269- 0 0 0 0 0 0 0 0 0 0 0 0
58270- 6 6 6 14 14 14 22 22 22 34 34 34
58271- 42 42 42 58 58 58 74 74 74 86 86 86
58272-101 98 89 122 102 70 130 98 46 121 87 25
58273-137 92 6 152 99 6 163 110 8 180 123 7
58274-185 133 11 197 138 11 206 145 10 200 144 11
58275-180 123 7 156 107 11 130 83 6 104 69 6
58276- 50 34 6 54 54 54 110 110 110 101 98 89
58277- 86 86 86 82 82 82 78 78 78 78 78 78
58278- 78 78 78 78 78 78 78 78 78 78 78 78
58279- 78 78 78 82 82 82 86 86 86 94 94 94
58280-106 106 106 101 101 101 86 66 34 124 80 6
58281-156 107 11 180 123 7 192 133 9 200 144 11
58282-206 145 10 200 144 11 192 133 9 175 118 6
58283-139 102 15 109 106 95 70 70 70 42 42 42
58284- 22 22 22 10 10 10 0 0 0 0 0 0
58285- 0 0 0 0 0 0 0 0 0 0 0 0
58286- 0 0 0 0 0 0 0 0 0 0 0 0
58287- 0 0 0 0 0 0 0 0 0 0 0 0
58288- 0 0 0 0 0 0 0 0 0 0 0 0
58289- 0 0 0 0 0 0 0 0 0 0 0 0
58290- 0 0 0 0 0 0 6 6 6 10 10 10
58291- 14 14 14 22 22 22 30 30 30 38 38 38
58292- 50 50 50 62 62 62 74 74 74 90 90 90
58293-101 98 89 112 100 78 121 87 25 124 80 6
58294-137 92 6 152 99 6 152 99 6 152 99 6
58295-138 86 6 124 80 6 98 70 6 86 66 30
58296-101 98 89 82 82 82 58 58 58 46 46 46
58297- 38 38 38 34 34 34 34 34 34 34 34 34
58298- 34 34 34 34 34 34 34 34 34 34 34 34
58299- 34 34 34 34 34 34 38 38 38 42 42 42
58300- 54 54 54 82 82 82 94 86 76 91 60 6
58301-134 86 6 156 107 11 167 114 7 175 118 6
58302-175 118 6 167 114 7 152 99 6 121 87 25
58303-101 98 89 62 62 62 34 34 34 18 18 18
58304- 6 6 6 0 0 0 0 0 0 0 0 0
58305- 0 0 0 0 0 0 0 0 0 0 0 0
58306- 0 0 0 0 0 0 0 0 0 0 0 0
58307- 0 0 0 0 0 0 0 0 0 0 0 0
58308- 0 0 0 0 0 0 0 0 0 0 0 0
58309- 0 0 0 0 0 0 0 0 0 0 0 0
58310- 0 0 0 0 0 0 0 0 0 0 0 0
58311- 0 0 0 6 6 6 6 6 6 10 10 10
58312- 18 18 18 22 22 22 30 30 30 42 42 42
58313- 50 50 50 66 66 66 86 86 86 101 98 89
58314-106 86 58 98 70 6 104 69 6 104 69 6
58315-104 69 6 91 60 6 82 62 34 90 90 90
58316- 62 62 62 38 38 38 22 22 22 14 14 14
58317- 10 10 10 10 10 10 10 10 10 10 10 10
58318- 10 10 10 10 10 10 6 6 6 10 10 10
58319- 10 10 10 10 10 10 10 10 10 14 14 14
58320- 22 22 22 42 42 42 70 70 70 89 81 66
58321- 80 54 7 104 69 6 124 80 6 137 92 6
58322-134 86 6 116 81 8 100 82 52 86 86 86
58323- 58 58 58 30 30 30 14 14 14 6 6 6
58324- 0 0 0 0 0 0 0 0 0 0 0 0
58325- 0 0 0 0 0 0 0 0 0 0 0 0
58326- 0 0 0 0 0 0 0 0 0 0 0 0
58327- 0 0 0 0 0 0 0 0 0 0 0 0
58328- 0 0 0 0 0 0 0 0 0 0 0 0
58329- 0 0 0 0 0 0 0 0 0 0 0 0
58330- 0 0 0 0 0 0 0 0 0 0 0 0
58331- 0 0 0 0 0 0 0 0 0 0 0 0
58332- 0 0 0 6 6 6 10 10 10 14 14 14
58333- 18 18 18 26 26 26 38 38 38 54 54 54
58334- 70 70 70 86 86 86 94 86 76 89 81 66
58335- 89 81 66 86 86 86 74 74 74 50 50 50
58336- 30 30 30 14 14 14 6 6 6 0 0 0
58337- 0 0 0 0 0 0 0 0 0 0 0 0
58338- 0 0 0 0 0 0 0 0 0 0 0 0
58339- 0 0 0 0 0 0 0 0 0 0 0 0
58340- 6 6 6 18 18 18 34 34 34 58 58 58
58341- 82 82 82 89 81 66 89 81 66 89 81 66
58342- 94 86 66 94 86 76 74 74 74 50 50 50
58343- 26 26 26 14 14 14 6 6 6 0 0 0
58344- 0 0 0 0 0 0 0 0 0 0 0 0
58345- 0 0 0 0 0 0 0 0 0 0 0 0
58346- 0 0 0 0 0 0 0 0 0 0 0 0
58347- 0 0 0 0 0 0 0 0 0 0 0 0
58348- 0 0 0 0 0 0 0 0 0 0 0 0
58349- 0 0 0 0 0 0 0 0 0 0 0 0
58350- 0 0 0 0 0 0 0 0 0 0 0 0
58351- 0 0 0 0 0 0 0 0 0 0 0 0
58352- 0 0 0 0 0 0 0 0 0 0 0 0
58353- 6 6 6 6 6 6 14 14 14 18 18 18
58354- 30 30 30 38 38 38 46 46 46 54 54 54
58355- 50 50 50 42 42 42 30 30 30 18 18 18
58356- 10 10 10 0 0 0 0 0 0 0 0 0
58357- 0 0 0 0 0 0 0 0 0 0 0 0
58358- 0 0 0 0 0 0 0 0 0 0 0 0
58359- 0 0 0 0 0 0 0 0 0 0 0 0
58360- 0 0 0 6 6 6 14 14 14 26 26 26
58361- 38 38 38 50 50 50 58 58 58 58 58 58
58362- 54 54 54 42 42 42 30 30 30 18 18 18
58363- 10 10 10 0 0 0 0 0 0 0 0 0
58364- 0 0 0 0 0 0 0 0 0 0 0 0
58365- 0 0 0 0 0 0 0 0 0 0 0 0
58366- 0 0 0 0 0 0 0 0 0 0 0 0
58367- 0 0 0 0 0 0 0 0 0 0 0 0
58368- 0 0 0 0 0 0 0 0 0 0 0 0
58369- 0 0 0 0 0 0 0 0 0 0 0 0
58370- 0 0 0 0 0 0 0 0 0 0 0 0
58371- 0 0 0 0 0 0 0 0 0 0 0 0
58372- 0 0 0 0 0 0 0 0 0 0 0 0
58373- 0 0 0 0 0 0 0 0 0 6 6 6
58374- 6 6 6 10 10 10 14 14 14 18 18 18
58375- 18 18 18 14 14 14 10 10 10 6 6 6
58376- 0 0 0 0 0 0 0 0 0 0 0 0
58377- 0 0 0 0 0 0 0 0 0 0 0 0
58378- 0 0 0 0 0 0 0 0 0 0 0 0
58379- 0 0 0 0 0 0 0 0 0 0 0 0
58380- 0 0 0 0 0 0 0 0 0 6 6 6
58381- 14 14 14 18 18 18 22 22 22 22 22 22
58382- 18 18 18 14 14 14 10 10 10 6 6 6
58383- 0 0 0 0 0 0 0 0 0 0 0 0
58384- 0 0 0 0 0 0 0 0 0 0 0 0
58385- 0 0 0 0 0 0 0 0 0 0 0 0
58386- 0 0 0 0 0 0 0 0 0 0 0 0
58387- 0 0 0 0 0 0 0 0 0 0 0 0
58388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58395+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58399+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58401+4 4 4 4 4 4
58402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58409+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58415+4 4 4 4 4 4
58416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58429+4 4 4 4 4 4
58430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58443+4 4 4 4 4 4
58444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58457+4 4 4 4 4 4
58458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58471+4 4 4 4 4 4
58472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58476+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58477+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58481+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58482+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58483+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58485+4 4 4 4 4 4
58486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58490+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58491+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58492+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58495+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58496+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58497+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58498+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58499+4 4 4 4 4 4
58500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58504+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58505+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58506+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58509+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58510+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58511+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58512+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58513+4 4 4 4 4 4
58514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58517+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58518+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58519+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58520+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58522+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58523+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58524+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58525+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58526+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58527+4 4 4 4 4 4
58528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58531+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58532+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58533+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58534+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58535+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58536+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58537+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58538+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58539+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58540+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58541+4 4 4 4 4 4
58542+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58545+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58546+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58547+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58548+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58549+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58550+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58551+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58552+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58553+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58554+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58555+4 4 4 4 4 4
58556+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58558+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58559+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58560+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58561+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58562+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58563+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58564+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58565+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58566+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58567+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58568+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58569+4 4 4 4 4 4
58570+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58572+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58573+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58574+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58575+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58576+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58577+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58578+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58579+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58580+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58581+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58582+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58583+4 4 4 4 4 4
58584+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58586+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58587+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58588+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58589+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58590+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58591+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58592+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58593+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58594+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58595+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58596+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58597+4 4 4 4 4 4
58598+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58600+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58601+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58602+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58603+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58604+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58605+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58606+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58607+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58608+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58609+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58610+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58611+4 4 4 4 4 4
58612+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58613+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58614+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58615+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58616+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58617+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58618+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58619+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58620+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58621+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58622+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58623+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58624+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58625+4 4 4 4 4 4
58626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58627+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58628+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58629+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58630+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58631+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58632+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58633+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58634+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58635+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58636+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58637+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58638+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58639+0 0 0 4 4 4
58640+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58641+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58642+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58643+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58644+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58645+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58646+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58647+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58648+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58649+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58650+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58651+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58652+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58653+2 0 0 0 0 0
58654+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58655+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58656+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58657+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58658+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58659+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58660+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58661+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58662+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58663+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58664+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58665+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58666+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58667+37 38 37 0 0 0
58668+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58669+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58670+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58671+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58672+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58673+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58674+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58675+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58676+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58677+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58678+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58679+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58680+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58681+85 115 134 4 0 0
58682+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58683+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58684+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58685+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58686+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58687+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58688+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58689+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58690+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58691+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58692+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58693+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58694+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58695+60 73 81 4 0 0
58696+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58697+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58698+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58699+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58700+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58701+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58702+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58703+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58704+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58705+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58706+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58707+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58708+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58709+16 19 21 4 0 0
58710+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58711+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58712+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58713+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58714+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58715+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58716+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58717+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58718+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58719+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58720+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58721+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58722+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58723+4 0 0 4 3 3
58724+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58725+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58726+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58728+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58729+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58730+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58731+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58732+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58733+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58734+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58735+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58736+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58737+3 2 2 4 4 4
58738+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58739+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58740+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58741+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58742+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58743+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58744+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58745+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58746+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58747+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58748+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58749+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58750+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58751+4 4 4 4 4 4
58752+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58753+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58754+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58755+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58756+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58757+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58758+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58759+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58760+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58761+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58762+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58763+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58764+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58765+4 4 4 4 4 4
58766+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58767+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58768+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58769+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58770+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58771+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58772+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58773+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58774+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58775+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58776+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58777+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58778+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58779+5 5 5 5 5 5
58780+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58781+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58782+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58783+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58784+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58785+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58786+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58787+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58788+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58789+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58790+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58791+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58792+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58793+5 5 5 4 4 4
58794+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58795+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58796+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58797+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58798+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58799+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58800+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58801+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58802+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58803+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58804+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58805+4 0 0 4 0 0 5 5 5 5 5 5 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
58808+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58809+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58810+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58811+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58812+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58813+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58814+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58815+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58816+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58817+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58818+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58819+3 3 3 5 5 5 6 6 6 4 4 4 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
58822+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58823+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58824+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58825+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58826+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58827+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58828+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58829+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58830+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58831+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58832+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58835+4 4 4 4 4 4
58836+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58837+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58838+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58839+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58840+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58841+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58842+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58843+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58844+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58845+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58846+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58849+4 4 4 4 4 4
58850+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58851+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58852+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58853+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58854+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58855+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58856+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58857+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58858+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58859+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58860+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58862+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58863+4 4 4 4 4 4
58864+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58865+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58866+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58867+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58868+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58869+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58870+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58871+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58872+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58873+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58874+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58875+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58876+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58877+4 4 4 4 4 4
58878+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58879+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58880+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58881+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58882+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58883+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58884+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58885+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58886+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58887+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58888+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58889+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58890+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58891+4 4 4 4 4 4
58892+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58893+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58894+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58895+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58896+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58897+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58898+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58899+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58900+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58901+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58902+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58903+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58904+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58905+4 4 4 4 4 4
58906+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58907+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58908+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58909+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58910+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58911+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58912+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58913+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58914+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58915+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58916+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58917+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58918+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58919+4 4 4 4 4 4
58920+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58921+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58922+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58923+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58924+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58925+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58926+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58927+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58928+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58929+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58930+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58931+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58932+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58933+4 4 4 4 4 4
58934+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58935+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58936+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58937+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58938+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58939+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58940+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58941+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58942+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58943+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58944+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58945+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58946+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58947+4 4 4 4 4 4
58948+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58949+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
58950+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58951+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
58952+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
58953+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
58954+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
58955+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
58956+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58957+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58958+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58960+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58961+4 4 4 4 4 4
58962+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58963+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
58964+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58965+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
58966+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58967+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
58968+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
58969+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
58970+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58971+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58972+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58973+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58974+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58975+4 4 4 4 4 4
58976+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
58977+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
58978+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58979+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
58980+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
58981+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
58982+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
58983+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
58984+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58985+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58986+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58988+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58989+4 4 4 4 4 4
58990+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
58991+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
58992+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58993+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
58994+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
58995+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
58996+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
58997+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
58998+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58999+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59000+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59002+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59003+4 4 4 4 4 4
59004+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59005+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
59006+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59007+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
59008+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
59009+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
59010+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
59011+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
59012+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59013+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59014+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59015+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59016+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59017+4 4 4 4 4 4
59018+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
59019+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
59020+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59021+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59022+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59023+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59024+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59025+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59026+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59027+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59028+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59029+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59030+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59031+4 4 4 4 4 4
59032+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59033+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59034+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59035+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59036+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59037+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59038+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59039+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59040+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59041+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59042+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59044+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59045+4 4 4 4 4 4
59046+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59047+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59048+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59049+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59050+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59051+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59052+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59053+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59054+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59055+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59056+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59058+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59059+4 4 4 4 4 4
59060+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59061+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59062+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59063+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59064+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59065+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59066+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59067+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59068+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59069+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59070+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59072+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59073+4 4 4 4 4 4
59074+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59075+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59076+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59077+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59078+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59079+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59080+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59081+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59082+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59083+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59084+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59086+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59087+4 4 4 4 4 4
59088+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59089+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59090+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59091+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59092+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59093+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59094+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59095+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59096+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59097+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59098+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59100+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59101+4 4 4 4 4 4
59102+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59103+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59104+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59105+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59106+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59107+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59108+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59109+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59110+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59111+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59112+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59113+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59114+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59115+4 4 4 4 4 4
59116+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59117+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59118+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59119+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59120+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59121+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59122+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59123+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59124+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59125+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59126+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59127+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59128+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59129+4 4 4 4 4 4
59130+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59131+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59132+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59133+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59134+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59135+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59136+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59137+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59138+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59139+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59140+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59141+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59142+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59143+4 4 4 4 4 4
59144+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59145+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59146+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59147+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59148+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59149+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59150+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59151+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59152+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59153+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59154+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59155+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59156+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59157+4 4 4 4 4 4
59158+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59159+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59160+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59161+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59162+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59163+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59164+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59165+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59166+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59167+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59168+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59169+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59170+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59171+4 4 4 4 4 4
59172+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59173+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59174+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59175+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59176+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59177+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59178+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59179+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59180+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59181+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59182+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59183+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59184+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59185+4 4 4 4 4 4
59186+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59187+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59188+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59189+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59190+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59191+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59192+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59193+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59194+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59195+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59196+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59197+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59198+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59199+4 4 4 4 4 4
59200+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59201+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59202+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59203+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59204+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59205+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59206+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59207+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59208+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59209+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59210+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59211+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59212+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59213+4 4 4 4 4 4
59214+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59215+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59216+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59217+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59218+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59219+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59220+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59221+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59222+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59223+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59224+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59225+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59226+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59227+4 4 4 4 4 4
59228+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59229+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59230+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59231+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59232+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59233+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59234+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59235+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59236+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59237+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59238+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59239+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59240+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59241+4 4 4 4 4 4
59242+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59243+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59244+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59245+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59246+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59247+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59248+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59249+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59250+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59251+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59252+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59253+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59254+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59255+4 4 4 4 4 4
59256+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59257+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59258+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59259+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59260+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59261+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59262+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59263+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59264+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
59265+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59266+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59267+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59268+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59269+4 4 4 4 4 4
59270+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59271+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59272+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59273+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59274+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59275+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59276+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59277+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59278+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
59279+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59280+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59281+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59282+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59283+4 4 4 4 4 4
59284+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59285+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59286+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59287+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59288+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59289+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59290+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59291+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59292+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59293+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59294+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59295+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59296+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59297+4 4 4 4 4 4
59298+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59299+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59300+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59301+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59302+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59303+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59304+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59305+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
59306+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59307+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59308+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59310+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59311+4 4 4 4 4 4
59312+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59313+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59314+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59315+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59316+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59317+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59318+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59319+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59320+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59321+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59322+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59324+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59325+4 4 4 4 4 4
59326+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59327+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59328+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59329+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59330+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59331+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59332+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59333+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
59334+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59335+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59336+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59338+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59339+4 4 4 4 4 4
59340+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59341+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59342+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59343+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59344+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59345+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59346+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59347+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
59348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59349+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59353+4 4 4 4 4 4
59354+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59355+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59356+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59357+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59358+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59359+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59360+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59361+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59363+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59367+4 4 4 4 4 4
59368+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59370+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59371+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59372+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59373+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59374+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59375+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59380+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59381+4 4 4 4 4 4
59382+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59385+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59386+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59387+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59388+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59395+4 4 4 4 4 4
59396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59399+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59400+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59401+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59402+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59409+4 4 4 4 4 4
59410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59413+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59414+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59415+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59416+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59423+4 4 4 4 4 4
59424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59427+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59428+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59429+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59430+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59437+4 4 4 4 4 4
59438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59442+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59443+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59444+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59451+4 4 4 4 4 4
59452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59456+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59457+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59458+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59465+4 4 4 4 4 4
59466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59470+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59471+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59472+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59479+4 4 4 4 4 4
59480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59484+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59485+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59493+4 4 4 4 4 4
59494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59498+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59499+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59507+4 4 4 4 4 4
59508diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59509index 3838795..0d48d61 100644
59510--- a/drivers/xen/events/events_base.c
59511+++ b/drivers/xen/events/events_base.c
59512@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59513 restore_pirqs();
59514 }
59515
59516-static struct irq_chip xen_dynamic_chip __read_mostly = {
59517+static struct irq_chip xen_dynamic_chip = {
59518 .name = "xen-dyn",
59519
59520 .irq_disable = disable_dynirq,
59521@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59522 .irq_retrigger = retrigger_dynirq,
59523 };
59524
59525-static struct irq_chip xen_pirq_chip __read_mostly = {
59526+static struct irq_chip xen_pirq_chip = {
59527 .name = "xen-pirq",
59528
59529 .irq_startup = startup_pirq,
59530@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59531 .irq_retrigger = retrigger_dynirq,
59532 };
59533
59534-static struct irq_chip xen_percpu_chip __read_mostly = {
59535+static struct irq_chip xen_percpu_chip = {
59536 .name = "xen-percpu",
59537
59538 .irq_disable = disable_dynirq,
59539diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
59540index 00f40f0..e3c0b15 100644
59541--- a/drivers/xen/evtchn.c
59542+++ b/drivers/xen/evtchn.c
59543@@ -201,8 +201,8 @@ static ssize_t evtchn_read(struct file *file, char __user *buf,
59544
59545 /* Byte lengths of two chunks. Chunk split (if any) is at ring wrap. */
59546 if (((c ^ p) & EVTCHN_RING_SIZE) != 0) {
59547- bytes1 = (EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c)) *
59548- sizeof(evtchn_port_t);
59549+ bytes1 = EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c);
59550+ bytes1 *= sizeof(evtchn_port_t);
59551 bytes2 = EVTCHN_RING_MASK(p) * sizeof(evtchn_port_t);
59552 } else {
59553 bytes1 = (p - c) * sizeof(evtchn_port_t);
59554diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59555index fef20db..d28b1ab 100644
59556--- a/drivers/xen/xenfs/xenstored.c
59557+++ b/drivers/xen/xenfs/xenstored.c
59558@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59559 static int xsd_kva_open(struct inode *inode, struct file *file)
59560 {
59561 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59562+#ifdef CONFIG_GRKERNSEC_HIDESYM
59563+ NULL);
59564+#else
59565 xen_store_interface);
59566+#endif
59567+
59568 if (!file->private_data)
59569 return -ENOMEM;
59570 return 0;
59571diff --git a/firmware/Makefile b/firmware/Makefile
59572index e297e1b..aeb0982 100644
59573--- a/firmware/Makefile
59574+++ b/firmware/Makefile
59575@@ -35,9 +35,11 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59576 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59577 bnx2x/bnx2x-e2-6.2.9.0.fw
59578 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59579+ bnx2/bnx2-mips-09-6.2.1b.fw \
59580 bnx2/bnx2-rv2p-09-6.0.17.fw \
59581 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59582 bnx2/bnx2-mips-06-6.2.1.fw \
59583+ bnx2/bnx2-mips-06-6.2.3.fw \
59584 bnx2/bnx2-rv2p-06-6.0.15.fw
59585 fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
59586 fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
59587diff --git a/firmware/WHENCE b/firmware/WHENCE
59588index 0c4d96d..b17700f 100644
59589--- a/firmware/WHENCE
59590+++ b/firmware/WHENCE
59591@@ -653,21 +653,23 @@ Found in hex form in kernel source.
59592 Driver: BNX2 - Broadcom NetXtremeII
59593
59594 File: bnx2/bnx2-mips-06-6.2.1.fw
59595+File: bnx2/bnx2-mips-06-6.2.3.fw
59596 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59597 File: bnx2/bnx2-mips-09-6.2.1a.fw
59598+File: bnx2/bnx2-mips-09-6.2.1b.fw
59599 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59600 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59601
59602 Licence:
59603-
59604- This file contains firmware data derived from proprietary unpublished
59605- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59606-
59607- Permission is hereby granted for the distribution of this firmware data
59608- in hexadecimal or equivalent format, provided this copyright notice is
59609- accompanying it.
59610-
59611-Found in hex form in kernel source.
59612+
59613+ This file contains firmware data derived from proprietary unpublished
59614+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59615+
59616+ Permission is hereby granted for the distribution of this firmware data
59617+ in hexadecimal or equivalent format, provided this copyright notice is
59618+ accompanying it.
59619+
59620+Found in hex form in kernel source.
59621
59622 --------------------------------------------------------------------------
59623
59624diff --git a/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59625new file mode 100644
59626index 0000000..da72bf1
59627--- /dev/null
59628+++ b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59629@@ -0,0 +1,5804 @@
59630+:10000000080001180800000000004A68000000C84D
59631+:1000100000000000000000000000000008004A6826
59632+:100020000000001400004B30080000A00800000091
59633+:100030000000569400004B44080058200000008443
59634+:100040000000A1D808005694000001580000A25CEE
59635+:100050000800321008000000000072F00000A3B495
59636+:10006000000000000000000000000000080072F026
59637+:1000700000000024000116A40800049008000400F9
59638+:10008000000017D4000116C80000000000000000A6
59639+:100090000000000000000000000000000000000060
59640+:1000A000080000A80800000000003BFC00012E9C96
59641+:1000B0000000000000000000000000000000000040
59642+:1000C00000000000000000000A00004600000000E0
59643+:1000D000000000000000000D636F6D362E322E33DD
59644+:1000E0000000000006020302000000000000000300
59645+:1000F000000000C800000032000000030000000003
59646+:1001000000000000000000000000000000000000EF
59647+:1001100000000010000001360000EA600000000549
59648+:1001200000000000000000000000000000000008C7
59649+:1001300000000000000000000000000000000000BF
59650+:1001400000000000000000000000000000000000AF
59651+:10015000000000000000000000000000000000009F
59652+:10016000000000020000000000000000000000008D
59653+:10017000000000000000000000000000000000007F
59654+:10018000000000000000000000000010000000005F
59655+:10019000000000000000000000000000000000005F
59656+:1001A000000000000000000000000000000000004F
59657+:1001B000000000000000000000000000000000003F
59658+:1001C000000000000000000000000000000000002F
59659+:1001D000000000000000000000000000000000001F
59660+:1001E0000000000010000003000000000000000DEF
59661+:1001F0000000000D3C02080024424AA03C03080015
59662+:1002000024634B9CAC4000000043202B1480FFFD76
59663+:10021000244200043C1D080037BD7FFC03A0F021F0
59664+:100220003C100800261001183C1C0800279C4AA01E
59665+:100230000E000168000000000000000D27470100CB
59666+:1002400090E3000B2402001A94E5000814620028D1
59667+:10025000000020218CE200003C0308008C63004475
59668+:1002600094E60014000211C20002104030A4000203
59669+:10027000005A10212463000130A50004A446008028
59670+:100280003C010800AC23004410A000190004202BFE
59671+:100290008F4202B804410008240400013C02080017
59672+:1002A0008C420060244200013C010800AC22006046
59673+:1002B00003E00008008010218CE2002094E3001687
59674+:1002C00000002021AF4202808CE20004A743028498
59675+:1002D000AF4202883C021000AF4202B83C02080064
59676+:1002E0008C42005C244200013C010800AC22005C0E
59677+:1002F00003E00008008010212747010090E3000B75
59678+:100300002402000394E50008146200280000202164
59679+:100310008CE200003C0308008C63004494E6001467
59680+:10032000000211C20002104030A40002005A102145
59681+:100330002463000130A50004A44600803C010800AD
59682+:10034000AC23004410A000190004202B8F4202B8F7
59683+:1003500004410008240400013C0208008C420060B3
59684+:10036000244200013C010800AC22006003E00008C8
59685+:10037000008010218CE2002094E300160000202170
59686+:10038000AF4202808CE20004A7430284AF4202889D
59687+:100390003C021000AF4202B83C0208008C42005CF4
59688+:1003A000244200013C010800AC22005C03E000088C
59689+:1003B000008010218F4301002402010050620003DD
59690+:1003C000000311C20000000D000311C20002104022
59691+:1003D000005A1021A440008003E000080000102112
59692+:1003E0009362000003E00008AF80000003E0000813
59693+:1003F0000000102103E00008000010212402010089
59694+:1004000014820008000000003C0208008C4200FC3E
59695+:10041000244200013C010800AC2200FC0A0000DD7F
59696+:1004200030A200203C0208008C42008424420001DB
59697+:100430003C010800AC22008430A2002010400008DB
59698+:1004400030A300103C0208008C4201082442000145
59699+:100450003C010800AC22010803E000080000000095
59700+:1004600010600008000000003C0208008C420104FB
59701+:10047000244200013C010800AC22010403E0000812
59702+:10048000000000003C0208008C42010024420001F0
59703+:100490003C010800AC22010003E00008000000005D
59704+:1004A00027BDFFE8AFBF0010274401009483000878
59705+:1004B000306200041040001B306600028F4202B818
59706+:1004C00004410008240500013C0208008C42006041
59707+:1004D000244200013C010800AC2200600A0001290E
59708+:1004E0008FBF00108C82002094830016000028210A
59709+:1004F000AF4202808C820004A7430284AF4202888C
59710+:100500003C021000AF4202B83C0208008C42005C82
59711+:10051000244200013C010800AC22005C0A000129D1
59712+:100520008FBF001010C00006006028218F4401001A
59713+:100530000E0000CD000000000A0001282405000183
59714+:100540008F8200088F4301045043000700002821D8
59715+:100550008F4401000E0000CD000000008F42010416
59716+:10056000AF820008000028218FBF001000A01021DA
59717+:1005700003E0000827BD001827BDFFE8AFBF001447
59718+:10058000AFB00010974201083043700024022000F1
59719+:100590001062000B286220011440002F000010217F
59720+:1005A00024024000106200250000000024026000C8
59721+:1005B00010620026000010210A0001658FBF0014A0
59722+:1005C00027500100920200091040001A2403000184
59723+:1005D0003C0208008C420020104000160000182148
59724+:1005E0000E00049300000000960300083C0608007B
59725+:1005F00094C64B5E8E0400188F8200209605000C76
59726+:1006000000031C0000661825AC440000AC45000443
59727+:1006100024040001AC400008AC40000CAC400010C9
59728+:10062000AC400014AC4000180E0004B8AC43001CF1
59729+:10063000000018210A000164006010210E0003254B
59730+:10064000000000000A000164000010210E000EE905
59731+:1006500000000000000010218FBF00148FB00010B8
59732+:1006600003E0000827BD001827BDFFE0AFB2001867
59733+:100670003C036010AFBF001CAFB10014AFB000105E
59734+:100680008C6450002402FF7F3C1A800000822024EA
59735+:100690003484380C24020037AC6450003C1208004B
59736+:1006A00026524AD8AF42000824020C80AF420024F0
59737+:1006B0003C1B80083C06080024C60324024010218D
59738+:1006C0002404001D2484FFFFAC4600000481FFFDCC
59739+:1006D000244200043C020800244204B03C0108000B
59740+:1006E000AC224AE03C020800244202303C010800EF
59741+:1006F000AC224AE43C020800244201743C03080096
59742+:100700002463032C3C040800248403D83C0508001F
59743+:1007100024A538F03C010800AC224B403C02080004
59744+:10072000244202EC3C010800AC264B243C010800AA
59745+:10073000AC254B343C010800AC234B3C3C01080089
59746+:10074000AC244B443C010800AC224B483C0108005F
59747+:10075000AC234ADC3C010800AC204AE83C0108001C
59748+:10076000AC204AEC3C010800AC204AF03C010800F7
59749+:10077000AC204AF43C010800AC204AF83C010800D7
59750+:10078000AC204AFC3C010800AC204B003C010800B6
59751+:10079000AC244B043C010800AC204B083C01080091
59752+:1007A000AC204B0C3C010800AC204B103C01080075
59753+:1007B000AC204B143C010800AC204B183C01080055
59754+:1007C000AC264B1C3C010800AC264B203C01080029
59755+:1007D000AC254B303C010800AC234B380E000623FF
59756+:1007E000000000003C028000344200708C42000097
59757+:1007F000AF8200143C0308008C6300208F82000449
59758+:10080000104300043C0280000E00045BAF83000430
59759+:100810003C028000344600703C0308008C6300A05A
59760+:100820003C0208008C4200A4104300048F84001492
59761+:100830003C010800AC2300A4A743009E8CCA000022
59762+:100840003C0308008C6300BC3C0208008C4200B8EA
59763+:100850000144202300641821000040210064202B63
59764+:1008600000481021004410213C010800AC2300BCCA
59765+:100870003C010800AC2200B88F5100003222000772
59766+:100880001040FFDCAF8A00148CC600003C05080055
59767+:100890008CA500BC3C0408008C8400B800CA30233E
59768+:1008A00000A628210000102100A6302B0082202164
59769+:1008B00000862021322700013C010800AC2500BC45
59770+:1008C0003C010800AC2400B810E0001F32220002F6
59771+:1008D0008F420100AF4200208F420104AF4200A8C6
59772+:1008E0009342010B0E0000C6305000FF2E02001E86
59773+:1008F00054400004001010800E0000C90A000213CA
59774+:1009000000000000005210218C4200000040F80955
59775+:1009100000000000104000053C0240008F4301042D
59776+:100920003C026020AC4300143C024000AF4201385E
59777+:100930003C0208008C420034244200013C010800C3
59778+:10094000AC220034322200021040000E3222000499
59779+:100950008F4201400E0000C6AF4200200E000295FB
59780+:10096000000000003C024000AF4201783C02080059
59781+:100970008C420038244200013C010800AC220038BF
59782+:10098000322200041040FF983C0280008F42018018
59783+:100990000E0000C6AF4200208F43018024020F00EA
59784+:1009A00014620005000000008F420188A742009CED
59785+:1009B0000A0002483C0240009362000024030050F9
59786+:1009C000304200FF144300083C0240000E00027B4E
59787+:1009D00000000000544000043C0240000E000D7571
59788+:1009E000000000003C024000AF4201B83C02080099
59789+:1009F0008C42003C244200013C010800AC22003C37
59790+:100A00000A0001C83C0280003C0290003442000110
59791+:100A100000822025AF4400208F4200200440FFFECA
59792+:100A20000000000003E00008000000003C0280001D
59793+:100A3000344200010082202503E00008AF4400207A
59794+:100A400027BDFFE0AFB10014AFB0001000808821D7
59795+:100A5000AFBF00180E00025030B000FF9362007D5F
59796+:100A60000220202102028025A370007D8F70007477
59797+:100A70003C0280000E000259020280241600000988
59798+:100A80008FBF00188F4201F80440FFFE24020002CD
59799+:100A9000AF5101C0A34201C43C021000AF4201F8B3
59800+:100AA0008FBF00188FB100148FB0001003E0000852
59801+:100AB00027BD002027BDFFE8AFBF0010974201848B
59802+:100AC0008F440188304202001040000500002821B8
59803+:100AD0000E000FAA000000000A00028D240500018C
59804+:100AE0003C02FF0004800005008218243C02040040
59805+:100AF000506200019362003E240500018FBF001088
59806+:100B000000A0102103E0000827BD0018A360002208
59807+:100B10008F4401400A00025E2405000127BDFFE862
59808+:100B2000AFBF0014AFB0001093620000304400FF6C
59809+:100B300038830020388200300003182B0002102B6D
59810+:100B40000062182410600003240200501482008008
59811+:100B50008FBF001493620005304200011040007CFA
59812+:100B60008FBF0014934201482443FFFF2C6200050D
59813+:100B7000104000788FB00010000310803C03080084
59814+:100B800024634A68004310218C42000000400008A2
59815+:100B9000000000000E0002508F4401408F70000CD6
59816+:100BA0008F4201441602000224020001AF62000CD1
59817+:100BB0000E0002598F4401408F420144145000043A
59818+:100BC0008FBF00148FB000100A000F2027BD00183F
59819+:100BD0008F62000C0A0003040000000097620010FE
59820+:100BE0008F4301443042FFFF1462001A00000000EE
59821+:100BF00024020001A76200108F4202380443001053
59822+:100C00008F4201403C02003F3446F0003C0560004A
59823+:100C10003C04FFC08CA22BBC0044182400461024C6
59824+:100C20000002130200031D82106200390000000060
59825+:100C30008F4202380440FFF7000000008F4201405D
59826+:100C4000AF4202003C021000AF4202380A00032209
59827+:100C50008FBF0014976200100A0003040000000018
59828+:100C60000E0002508F440140976200128F430144EE
59829+:100C70003050FFFF1603000224020001A762001299
59830+:100C80000E0002598F4401408F42014416020004B5
59831+:100C90008FBF00148FB000100A00029127BD00180A
59832+:100CA000976200120A00030400000000976200141B
59833+:100CB0008F4301443042FFFF14620006240200010A
59834+:100CC0008FBF00148FB00010A76200140A00124AF0
59835+:100CD00027BD0018976200141440001D8FBF001438
59836+:100CE0000A00031C00000000976200168F430144B5
59837+:100CF0003042FFFF1462000B240200018FBF00147A
59838+:100D00008FB00010A76200160A000B1227BD001852
59839+:100D10009742007824420004A76200100A000322D0
59840+:100D20008FBF001497620016240300013042FFFFBA
59841+:100D3000144300078FBF00143C0208008C4200706F
59842+:100D4000244200013C010800AC2200708FBF001457
59843+:100D50008FB0001003E0000827BD001827BDFFE892
59844+:100D6000AFBF0014AFB000108F50010093620000BD
59845+:100D700093430109304400FF2402001F106200A5C4
59846+:100D80002862002010400018240200382862000A5F
59847+:100D90001040000C2402000B286200081040002CB8
59848+:100DA00000000000046000E52862000214400028F2
59849+:100DB00024020006106200268FBF00140A00041FE0
59850+:100DC0008FB000101062005E2862000B144000DC3F
59851+:100DD0008FBF00142402000E106200738FB0001049
59852+:100DE0000A00041F00000000106200C028620039E1
59853+:100DF0001040000A2402008024020036106200CA5B
59854+:100E000028620037104000B424020035106200C18F
59855+:100E10008FBF00140A00041F8FB000101062002B57
59856+:100E20002862008110400006240200C82402003914
59857+:100E3000106200B48FBF00140A00041F8FB00010AE
59858+:100E4000106200998FBF00140A00041F8FB00010B9
59859+:100E50003C0208008C420020104000B98FBF0014F3
59860+:100E60000E000493000000008F4201008F830020D9
59861+:100E70009745010C97460108AC6200008F420104BF
59862+:100E80003C04080094844B5E00052C00AC62000416
59863+:100E90008F4201180006340000C43025AC620008FF
59864+:100EA0008F42011C24040001AC62000C9342010A31
59865+:100EB00000A22825AC650010AC600014AC600018DE
59866+:100EC000AC66001C0A0003F58FBF00143C0208004A
59867+:100ED0008C4200201040009A8FBF00140E00049333
59868+:100EE00000000000974401083C03080094634B5E37
59869+:100EF0009745010C000422029746010E8F820020C4
59870+:100F0000000426000083202500052C003C030080FF
59871+:100F100000A6282500832025AC400000AC4000043A
59872+:100F2000AC400008AC40000CAC450010AC400014D4
59873+:100F3000AC400018AC44001C0A0003F42404000177
59874+:100F40009742010C14400015000000009362000558
59875+:100F50003042001014400011000000000E0002504A
59876+:100F6000020020219362000502002021344200107B
59877+:100F70000E000259A36200059362000024030020C2
59878+:100F8000304200FF1043006D020020218FBF00148B
59879+:100F90008FB000100A000FC027BD00180000000D20
59880+:100FA0000A00041E8FBF00143C0208008C4200207F
59881+:100FB000104000638FBF00140E0004930000000077
59882+:100FC0008F4201048F8300209744010C3C050800E8
59883+:100FD00094A54B5EAC6200009762002C00042400D4
59884+:100FE0003042FFFF008220253C02400E00A228254F
59885+:100FF000AC640004AC600008AC60000CAC60001095
59886+:10100000AC600014AC600018AC65001C0A0003F46E
59887+:10101000240400010E00025002002021A7600008F5
59888+:101020000E00025902002021020020210E00025E63
59889+:10103000240500013C0208008C42002010400040C2
59890+:101040008FBF00140E000493000000009742010CB3
59891+:101050008F8300203C05080094A54B5E000214001D
59892+:10106000AC700000AC620004AC6000088F64004CFF
59893+:101070003C02401F00A22825AC64000C8F62005087
59894+:1010800024040001AC6200108F620054AC620014B2
59895+:10109000AC600018AC65001C8FBF00148FB000104E
59896+:1010A0000A0004B827BD0018240200205082002541
59897+:1010B0008FB000100E000F0A020020211040002007
59898+:1010C0008FBF0014020020218FB0001000002821E3
59899+:1010D0000A00025E27BD0018020020218FBF001405
59900+:1010E0008FB000100A00058027BD00189745010C3D
59901+:1010F000020020218FBF00148FB000100A0005A04D
59902+:1011000027BD0018020020218FB000100A0005C57D
59903+:1011100027BD00189345010D020020218FB000105B
59904+:101120000A00060F27BD0018020020218FBF0014FF
59905+:101130008FB000100A0005EB27BD00188FBF001408
59906+:101140008FB0001003E0000827BD00188F4202781E
59907+:101150000440FFFE2402000234840080AF440240B9
59908+:10116000A34202443C02100003E00008AF420278B0
59909+:101170003C04080094844B6A3C0208008C424B7487
59910+:101180003083FFFF000318C000431021AF42003C32
59911+:101190003C0208008C424B70AF4200383C020050C9
59912+:1011A00034420008AF4200300000000000000000A0
59913+:1011B000000000008F420000304200201040FFFD80
59914+:1011C000000000008F4204003C010800AC224B608C
59915+:1011D0008F4204043C010800AC224B643C02002016
59916+:1011E000AF420030000000003C02080094424B680F
59917+:1011F0003C03080094634B6C3C05080094A54B6EBF
59918+:1012000024840001004310213083FFFF3C010800CB
59919+:10121000A4224B683C010800A4244B6A1465000317
59920+:10122000000000003C010800A4204B6A03E0000815
59921+:10123000000000003C05000A27BDFFE80345282107
59922+:101240003C04080024844B50AFBF00100E00051D65
59923+:101250002406000A3C02080094424B523C0308005A
59924+:1012600094634B6E3042000F244200030043180485
59925+:1012700024027FFF0043102B10400002AF83001CAC
59926+:101280000000000D0E00042A000000003C020800CF
59927+:1012900094424B5A8FBF001027BD001803E000088E
59928+:1012A000A74200A23C02000A034210219443000618
59929+:1012B0003C02080094424B5A3C010800A4234B56C0
59930+:1012C000004310238F83001C00021400000214034B
59931+:1012D0000043102B03E000083842000127BDFFE85F
59932+:1012E000AFBF00103C02000A0342102194420006E6
59933+:1012F0003C010800A4224B560E00047700000000B9
59934+:101300005440FFF93C02000A8FBF001003E00008C0
59935+:1013100027BD001827BDFFE8AFBF00100E000477FF
59936+:101320000000000010400003000000000E000485D3
59937+:10133000000000003C0208008C424B608FBF001090
59938+:1013400027430400AF4200383C0208008C424B6443
59939+:1013500027BD0018AF830020AF42003C3C020005CF
59940+:10136000AF42003003E00008AF8000188F82001801
59941+:101370003C0300060002114000431025AF4200303C
59942+:101380000000000000000000000000008F4200008C
59943+:10139000304200101040FFFD27420400AF820020C1
59944+:1013A00003E00008AF8000183C0608008CC64B64C0
59945+:1013B0008F8500188F8300203C02080094424B5A0E
59946+:1013C00027BDFFE024A50001246300202442000182
59947+:1013D00024C70020AFB10014AFB00010AFBF001899
59948+:1013E000AF850018AF8300203C010800A4224B5AAF
59949+:1013F000309000FF3C010800AC274B6404C100089A
59950+:101400000000882104E00006000000003C02080003
59951+:101410008C424B60244200013C010800AC224B602E
59952+:101420003C02080094424B5A3C03080094634B680A
59953+:101430000010202B004310262C42000100441025F0
59954+:10144000144000048F830018240200101462000F5F
59955+:10145000000000000E0004A9241100013C03080054
59956+:1014600094634B5A3C02080094424B681462000398
59957+:10147000000000000E00042A000000001600000317
59958+:10148000000000000E000493000000003C03080070
59959+:1014900094634B5E3C02080094424B5C2463000161
59960+:1014A0003064FFFF3C010800A4234B5E148200035C
59961+:1014B000000000003C010800A4204B5E1200000662
59962+:1014C000000000003C02080094424B5AA74200A2D0
59963+:1014D0000A00050B022010210E0004770000000016
59964+:1014E00010400004022010210E00048500000000BE
59965+:1014F000022010218FBF00188FB100148FB0001090
59966+:1015000003E0000827BD00203084FFFF30A5FFFF67
59967+:101510000000182110800007000000003082000148
59968+:101520001040000200042042006518210A00051343
59969+:101530000005284003E000080060102110C00006EC
59970+:1015400024C6FFFF8CA2000024A50004AC8200008A
59971+:101550000A00051D2484000403E0000800000000C8
59972+:1015600010A0000824A3FFFFAC86000000000000CC
59973+:10157000000000002402FFFF2463FFFF1462FFFA53
59974+:101580002484000403E0000800000000240200019D
59975+:10159000AF62000CA7620010A7620012A7620014DD
59976+:1015A00003E00008A76200163082007F034210218A
59977+:1015B0003C08000E004818213C0208008C42002024
59978+:1015C00027BDFFD82407FF80AFB3001CAFB20018BF
59979+:1015D000AFB10014AFB00010AFBF00200080802179
59980+:1015E00030B100FF0087202430D200FF1040002FD0
59981+:1015F00000009821AF44002C9062000024030050AA
59982+:10160000304200FF1443000E000000003C020800BE
59983+:101610008C4200E00202102100471024AF42002C4F
59984+:101620003C0208008C4200E0020210213042007FA0
59985+:101630000342102100481021944200D43053FFFF90
59986+:101640000E000493000000003C02080094424B5E30
59987+:101650008F8300200011340000C2302500122C00BE
59988+:101660003C02400000C2302534A50001AC700000EF
59989+:101670008FBF0020AC6000048FB20018AC7300086C
59990+:101680008FB10014AC60000C8FB3001CAC6500106F
59991+:101690008FB00010AC60001424040001AC6000188E
59992+:1016A00027BD00280A0004B8AC66001C8FBF0020CC
59993+:1016B0008FB3001C8FB200188FB100148FB00010D0
59994+:1016C00003E0000827BD00289343010F2402001007
59995+:1016D0001062000E2865001110A0000724020012FD
59996+:1016E000240200082405003A1062000600003021A0
59997+:1016F00003E0000800000000240500351462FFFC30
59998+:10170000000030210A000538000000008F420074FC
59999+:1017100024420FA003E00008AF62000C27BDFFE8E1
60000+:10172000AFBF00100E00025E240500018FBF001045
60001+:1017300024020001A762001227BD00182402000144
60002+:1017400003E00008A360002227BDFFE0AFB1001452
60003+:10175000AFB00010AFBF001830B1FFFF0E00025055
60004+:10176000008080219362003F24030004304200FF88
60005+:101770001443000C02002021122000082402000A59
60006+:101780000E00053100000000936200052403FFFEF7
60007+:1017900000431024A362000524020012A362003F4C
60008+:1017A000020020210E000259A360008116200003D0
60009+:1017B000020020210E0005950000000002002021FB
60010+:1017C000322600FF8FBF00188FB100148FB00010B9
60011+:1017D000240500380A00053827BD002027BDFFE09A
60012+:1017E000AFBF001CAFB20018AFB10014AFB0001013
60013+:1017F0000E000250008080210E0005310000000024
60014+:101800009362003F24120018305100FF123200038F
60015+:101810000200202124020012A362003F936200050F
60016+:101820002403FFFE004310240E000259A3620005AA
60017+:10183000020020212405002016320007000030217C
60018+:101840008FBF001C8FB200188FB100148FB0001032
60019+:101850000A00025E27BD00208FBF001C8FB2001857
60020+:101860008FB100148FB00010240500390A0005382C
60021+:1018700027BD002027BDFFE8AFB00010AFBF0014A8
60022+:101880009742010C2405003600808021144000108E
60023+:10189000304600FF0E00025000000000240200123B
60024+:1018A000A362003F93620005344200100E00053130
60025+:1018B000A36200050E00025902002021020020212F
60026+:1018C0000E00025E240500200A000604000000004D
60027+:1018D0000E000538000000000E000250020020211A
60028+:1018E000936200232403FF9F020020210043102461
60029+:1018F0008FBF00148FB00010A36200230A000259AA
60030+:1019000027BD001827BDFFE0AFBF0018AFB100141E
60031+:10191000AFB0001030B100FF0E00025000808021F7
60032+:10192000240200120E000531A362003F0E0002598E
60033+:101930000200202102002021022030218FBF001848
60034+:101940008FB100148FB00010240500350A0005384F
60035+:1019500027BD0020A380002C03E00008A380002DF9
60036+:101960008F4202780440FFFE8F820034AF42024073
60037+:1019700024020002A34202443C02100003E00008DB
60038+:10198000AF4202783C0360008C6254003042000891
60039+:101990001440FFFD000000008C625408AF82000C70
60040+:1019A00024020052AC605408AC645430AC6254342D
60041+:1019B0002402000803E00008AC6254003C0260000E
60042+:1019C0008C42540030420008104000053C03600087
60043+:1019D0008C625400304200081440FFFD00000000FB
60044+:1019E0008F83000C3C02600003E00008AC43540805
60045+:1019F00090A3000024020005008040213063003FD6
60046+:101A000000004821146200050000502190A2001C33
60047+:101A100094A3001E304900FF306AFFFFAD00000CA8
60048+:101A2000AD000010AD000024950200148D05001CCF
60049+:101A30008D0400183042FFFF0049102300021100FE
60050+:101A4000000237C3004038210086202300A2102B5B
60051+:101A50000082202300A72823AD05001CAD04001838
60052+:101A6000A5090014A5090020A50A001603E0000836
60053+:101A7000A50A00228F4201F80440FFFE2402000262
60054+:101A8000AF4401C0A34201C43C02100003E00008BF
60055+:101A9000AF4201F83C0208008C4200B427BDFFE8C9
60056+:101AA000AFBF001424420001AFB000103C01080099
60057+:101AB000AC2200B48F4300243C02001F30AA00FF78
60058+:101AC0003442FF8030D800FF006280240080F8217B
60059+:101AD00030EF00FF1158003B01405821240CFF80DB
60060+:101AE0003C19000A3163007F000310C00003194055
60061+:101AF000006218213C0208008C4200DC25680001CD
60062+:101B0000310D007F03E21021004310213043007F9C
60063+:101B100003431821004C102400794821AF420024CF
60064+:101B20008D220024016C1824006C7026AD22000C5C
60065+:101B30008D220024310800FFAD22001095220014F0
60066+:101B4000952300208D27001C3042FFFF3063FFFFEC
60067+:101B50008D2600180043102300021100000227C345
60068+:101B60000040282100C4302300E2102B00C23023A3
60069+:101B700000E53823AD27001CAD2600189522002073
60070+:101B8000A522001495220022154B000AA52200165A
60071+:101B90008D2300248D220008254600013145008058
60072+:101BA0001462000430C4007F108F000238AA008045
60073+:101BB00000C0502151AF000131C800FF1518FFC906
60074+:101BC000010058218F8400343082007F03421821A5
60075+:101BD0003C02000A006218212402FF8000822024B7
60076+:101BE000AF440024A06A0079A06A00838C62005090
60077+:101BF0008F840034AC6200708C6500743C027FFFFF
60078+:101C00003442FFFF00A228240E00066BAC6500746E
60079+:101C1000AF5000248FBF00148FB0001003E0000805
60080+:101C200027BD001827BDFFC0AFBE0038AFB70034D6
60081+:101C3000AFB5002CAFB20020AFB1001CAFB00018A0
60082+:101C4000AFBF003CAFB60030AFB40028AFB3002444
60083+:101C50008F4500248F4600288F43002C3C02001F34
60084+:101C60003442FF800062182400C230240080A82182
60085+:101C7000AFA3001400A2F0240E00062FAFA60010A0
60086+:101C80003C0208008C4200E02410FF8003608821A1
60087+:101C900002A2102100501024AF4200243C02080090
60088+:101CA0008C4200E002A210213042007F0342182142
60089+:101CB0003C02000A00629021924200D293630084A9
60090+:101CC000305700FF306300FF24020001106200342F
60091+:101CD000036020212402000214620036000000008C
60092+:101CE0000E001216024028219223008392220083C4
60093+:101CF0003063007F3042007F000210C000031940B3
60094+:101D0000006218213C0208008C4200DC02A2102173
60095+:101D10000043382100F01024AF42002892250078BB
60096+:101D20009224008330E2007F034218213C02000C21
60097+:101D300014850007006280212402FFFFA24200F107
60098+:101D40002402FFFFA64200F20A0007272402FFFF39
60099+:101D500096020020A24200F196020022A64200F262
60100+:101D60008E020024AE4200F492220083A24200F0D0
60101+:101D70008E4200C8AE4200FC8E4200C4AE4200F863
60102+:101D80008E220050AE4201008E4200CCAE420104D1
60103+:101D9000922200853042003F0A0007823442004010
60104+:101DA0000E00123902402821922200850A00078283
60105+:101DB0003042003F936200852403FFDF3042003F42
60106+:101DC000A36200859362008500431024A36200850E
60107+:101DD0009363008393620078307400FF304200FF09
60108+:101DE00010540036240AFF803C0C000C3283007F24
60109+:101DF000000310C000031940006218213C020800D3
60110+:101E00008C4200DC268800013109007F02A21021EB
60111+:101E10000043382130E2007F0342182100EA1024F9
60112+:101E2000AF420028006C80218E020024028A182410
60113+:101E3000006A5826AE02000C8E020024310800FF12
60114+:101E4000AE02001096020014960300208E07001CBC
60115+:101E50003042FFFF3063FFFF8E060018004310235F
60116+:101E600000021100000227C30040282100C43023D3
60117+:101E700000E2102B00C2302300E53823AE07001C1F
60118+:101E8000AE06001896020020A60200149602002258
60119+:101E9000A602001692220079304200FF105400077B
60120+:101EA0000000000051370001316800FF92220078E5
60121+:101EB000304200FF1448FFCD0100A0219222008390
60122+:101EC000A22200798E2200500A0007E2AE220070A2
60123+:101ED000A22200858E22004C2405FF80AE42010C18
60124+:101EE0009222008534420020A2220085924200D135
60125+:101EF0003C0308008C6300DC305400FF3C02080007
60126+:101F00008C4200E400143140001420C002A31821C8
60127+:101F100000C4202102A210210064382100461021B3
60128+:101F20000045182400E52824AF450028AF43002CC5
60129+:101F30003042007F924400D030E3007F03422821EA
60130+:101F4000034318213C02000C006280213C02000E79
60131+:101F5000309600FF00A298211296002A000000008F
60132+:101F60008E02000C02002021026028211040002572
60133+:101F7000261000280E00064A000000009262000DA4
60134+:101F800026830001307400FF3042007FA262000D02
60135+:101F90002404FF801697FFF0267300203C020800FF
60136+:101FA0008C4200DC0000A02102A210210044102479
60137+:101FB000AF4200283C0208008C4200E43C030800C9
60138+:101FC0008C6300DC02A2102100441024AF42002CDC
60139+:101FD0003C0208008C4200E402A318213063007F19
60140+:101FE00002A210213042007F034220210343182126
60141+:101FF0003C02000C006280213C02000E0A0007A493
60142+:10200000008298218E4200D8AE2200508E4200D825
60143+:10201000AE22007092250083924600D19223008365
60144+:10202000924400D12402FF8000A228243063007F64
60145+:10203000308400FF00A628250064182A10600002E2
60146+:1020400030A500FF38A50080A2250083A2250079D5
60147+:102050000E00063D000000009222007E02A020211A
60148+:10206000A222007A8E2300743C027FFF3442FFFFDD
60149+:10207000006218240E00066BAE2300748FA20010BD
60150+:10208000AF5E00248FBF003CAF4200288FBE0038F7
60151+:102090008FA200148FB700348FB600308FB5002C9C
60152+:1020A0008FB400288FB300248FB200208FB1001CA2
60153+:1020B0008FB0001827BD004003E00008AF42002C9D
60154+:1020C00090A2000024420001A0A200003C030800EE
60155+:1020D0008C6300F4304200FF1443000F0080302175
60156+:1020E000A0A000003C0208008C4200E48F84003471
60157+:1020F000008220213082007F034218213C02000C24
60158+:10210000006218212402FF8000822024ACC300005A
60159+:1021100003E00008AF4400288C8200002442002025
60160+:1021200003E00008AC82000094C200003C080800F4
60161+:10213000950800CA30E7FFFF008048210102102106
60162+:10214000A4C2000094C200003042FFFF00E2102B46
60163+:1021500054400001A4C7000094A200003C03080002
60164+:102160008C6300CC24420001A4A2000094A20000D1
60165+:102170003042FFFF544300078F8600280107102BD1
60166+:10218000A4A000005440000101003821A4C70000B1
60167+:102190008F8600288CC4001CAF44003C94A2000031
60168+:1021A0008F43003C3042FFFF000210C00062182144
60169+:1021B000AF43003C8F42003C008220231880000483
60170+:1021C000000000008CC200180A00084324420001ED
60171+:1021D0008CC20018AF4200383C020050344200105C
60172+:1021E000AF420030000000000000000000000000CE
60173+:1021F0008F420000304200201040FFFD0000000030
60174+:102200008F420404AD2200048F420400AD2200007E
60175+:102210003C020020AF42003003E000080000000054
60176+:1022200027BDFFE0AFB20018AFB10014AFB000108F
60177+:10223000AFBF001C94C2000000C080213C12080007
60178+:10224000965200C624420001A60200009603000038
60179+:1022500094E2000000E03021144300058FB100300B
60180+:102260000E000818024038210A000875000000001E
60181+:102270008C8300048C820004244200400461000727
60182+:10228000AC8200048C8200040440000400000000C2
60183+:102290008C82000024420001AC8200009602000003
60184+:1022A0003042FFFF50520001A600000096220000BD
60185+:1022B00024420001A62200008F82002896230000FD
60186+:1022C00094420016144300048FBF001C2402000136
60187+:1022D000A62200008FBF001C8FB200188FB100141F
60188+:1022E0008FB0001003E0000827BD00208F89002870
60189+:1022F00027BDFFE0AFBF00188D220028274804004B
60190+:1023000030E700FFAF4200388D22002CAF8800304C
60191+:10231000AF42003C3C020005AF420030000000002C
60192+:1023200000000000000000000000000000000000AD
60193+:10233000000000008C82000C8C82000CAD020000BA
60194+:102340008C820010AD0200048C820018AD020008DF
60195+:102350008C82001CAD02000C8CA20014AD02001097
60196+:102360008C820020AD02001490820005304200FFF4
60197+:1023700000021200AD0200188CA20018AD02001C71
60198+:102380008CA2000CAD0200208CA20010AD02002433
60199+:102390008CA2001CAD0200288CA20020AD02002CF3
60200+:1023A000AD060030AD000034978300263402FFFFF5
60201+:1023B00014620002006020213404FFFF10E00011CD
60202+:1023C000AD04003895230036952400362402000120
60203+:1023D0003063FFFF000318C20069182190650040B8
60204+:1023E000308400070082100400451025A0620040E0
60205+:1023F0008F820028944200563042FFFF0A0008DC1A
60206+:10240000AD02003C952300369524003624020001DD
60207+:102410003063FFFF000318C2006918219065004077
60208+:1024200030840007008210040002102700451024A9
60209+:10243000A0620040AD00003C000000000000000071
60210+:10244000000000003C02000634420040AF42003071
60211+:102450000000000000000000000000008F420000AB
60212+:10246000304200101040FFFD8F860028AF880030FA
60213+:1024700024C2005624C7003C24C4002824C50032CE
60214+:1024800024C600360E000856AFA200108FBF0018F9
60215+:1024900003E0000827BD00208F8300243C060800CD
60216+:1024A0008CC600E88F82003430633FFF0003198040
60217+:1024B00000461021004310212403FF803046007F96
60218+:1024C00000431024AF420028034618213C02000CB0
60219+:1024D0000062302190C2000D30A500FF00003821BD
60220+:1024E00034420010A0C2000D8F8900288F8A00247A
60221+:1024F00095230036000A13823048000324020001AD
60222+:10250000A4C3000E1102000B2902000210400005B6
60223+:10251000240200021100000C240300010A0009201B
60224+:102520000000182111020006000000000A00092026
60225+:10253000000018218CC2002C0A000920244300014D
60226+:102540008CC20014244300018CC200180043102BDD
60227+:1025500050400009240700012402002714A20003B0
60228+:10256000000000000A00092C240700019522003E0B
60229+:1025700024420001A522003E000A138230430003DA
60230+:102580002C62000210400009008028211460000421
60231+:102590000000000094C200360A00093C3046FFFFEC
60232+:1025A0008CC600380A00093C008028210000302138
60233+:1025B0003C04080024844B780A00088900000000CD
60234+:1025C000274901008D22000C9523000601202021BF
60235+:1025D000000216023046003F3063FFFF240200274E
60236+:1025E00000C0282128C7002810C2000EAF83002495
60237+:1025F00010E00008240200312402002110C200096A
60238+:102600002402002510C200079382002D0A00095BF6
60239+:102610000000000010C200059382002D0A00095B33
60240+:10262000000000000A0008F4000000000A0006266E
60241+:102630000000000095230006912400058D25000C64
60242+:102640008D2600108D2700188D28001C8D29002054
60243+:10265000244200013C010800A4234B7E3C010800F9
60244+:10266000A0244B7D3C010800AC254B843C010800B4
60245+:10267000AC264B883C010800AC274B903C0108007D
60246+:10268000AC284B943C010800AC294B9803E00008AF
60247+:10269000A382002D8F87002827BDFFC0AFB3003471
60248+:1026A000AFB20030AFB1002CAFB00028AFBF0038E0
60249+:1026B0003C0208008C4200D094E3003030B0FFFFB1
60250+:1026C000005010073045FFFF3063FFFF00C0982126
60251+:1026D000A7A200103C110800963100C614A3000602
60252+:1026E0003092FFFF8CE2002424420030AF42003CD5
60253+:1026F0000A0009948CE2002094E200323042FFFF8D
60254+:1027000054A2000827A400188CE2002C24420030B8
60255+:10271000AF42003C8CE20028AF4200380A0009A218
60256+:102720008F84002827A5001027A60020022038212A
60257+:102730000E000818A7A000208FA200182442003025
60258+:10274000AF4200388FA2001CAF42003C8F840028AB
60259+:102750003C020005AF42003094820034274304005D
60260+:102760003042FFFF0202102B14400007AF830030FD
60261+:1027700094820054948300340202102100431023F9
60262+:102780000A0009B63043FFFF94830054948200345A
60263+:102790000223182100501023006218233063FFFF2A
60264+:1027A000948200163042FFFF144300030000000033
60265+:1027B0000A0009C424030001948200163042FFFF7E
60266+:1027C0000043102B104000058F82003094820016C9
60267+:1027D000006210233043FFFF8F820030AC530000B3
60268+:1027E000AC400004AC520008AC43000C3C020006B4
60269+:1027F00034420010AF420030000000000000000032
60270+:10280000000000008F420000304200101040FFFD29
60271+:10281000001018C2006418219065004032040007BF
60272+:10282000240200018FBF00388FB300348FB2003014
60273+:102830008FB1002C8FB000280082100400451025B5
60274+:1028400027BD004003E00008A062004027BDFFA8AC
60275+:10285000AFB60050AFB5004CAFB40048AFB30044C2
60276+:10286000AFB1003CAFBF0054AFB20040AFB00038D2
60277+:102870008C9000003C0208008C4200E88F860034F7
60278+:10288000960300022413FF8000C2302130633FFF13
60279+:102890000003198000C3382100F3102490B2000017
60280+:1028A000AF42002C9203000230E2007F034230214D
60281+:1028B0003C02000E00C28821306300C024020040A8
60282+:1028C0000080A82100A0B021146200260000A021F1
60283+:1028D0008E3400388E2200181440000224020001B9
60284+:1028E000AE2200189202000D304200201440001564
60285+:1028F0008F8200343C0308008C6300DC001238C077
60286+:10290000001231400043102100C730210046382119
60287+:1029100030E300073C02008030E6007800C230253A
60288+:102920000343182100F31024AF4208002463090078
60289+:10293000AF4608108E2200188C6300080043102157
60290+:10294000AE2200188E22002C8E2300182442000193
60291+:102950000062182B1060003D000000000A000A7899
60292+:1029600000000000920300022402FFC00043102474
60293+:10297000304200FF1440000524020001AE2200187E
60294+:10298000962200360A000A613054FFFF8E2200149E
60295+:1029900024420001AE22001892020000000216003C
60296+:1029A0000002160304410029000000009602000204
60297+:1029B00027A4001000802821A7A20016960200027A
60298+:1029C00024070001000030213042FFFFAF820024C5
60299+:1029D0000E000889AFA0001C960300023C0408000A
60300+:1029E0008C8400E88F82003430633FFF000319803D
60301+:1029F00000441021004310213043007F3C05000CAF
60302+:102A00000053102403431821AF4200280065182109
60303+:102A10009062000D001221403042007FA062000D44
60304+:102A20003C0308008C6300E48F82003400431021D3
60305+:102A30000044382130E2007F03421021004510217C
60306+:102A400000F31824AF430028AEA200009222000D2C
60307+:102A5000304200101040001302A020218F83002874
60308+:102A60008EA40000028030219462003E2442FFFFC9
60309+:102A7000A462003E948400029625000E3084FFFF7D
60310+:102A80000E00097330A5FFFF8F82002894430034A5
60311+:102A90009622000E1443000302A02021240200010C
60312+:102AA000A382002C02C028210E0007FE00000000B7
60313+:102AB0008FBF00548FB600508FB5004C8FB40048C4
60314+:102AC0008FB300448FB200408FB1003C8FB000380C
60315+:102AD00003E0000827BD00588F82002827BDFFD0E3
60316+:102AE000AFB40028AFB20020AFBF002CAFB30024BA
60317+:102AF000AFB1001CAFB00018904400D0904300D19B
60318+:102B00000000A021309200FFA3A30010306300FF5B
60319+:102B10008C5100D88C5300DC1072002B2402000171
60320+:102B20003C0308008C6300E493A400108F820034FF
60321+:102B30002406FF800004214000431021004410219E
60322+:102B40003043007F00461024AF4200280343182181
60323+:102B50003C02000C006218218C62000427A40014BF
60324+:102B600027A50010022280210270102304400015C6
60325+:102B7000AFA300149062000D00C21024304200FF89
60326+:102B800014400007020088219062000D344200408A
60327+:102B90000E0007FEA062000D0A000ABD93A20010FD
60328+:102BA0000E0009E1241400018F830028AC7000D8C6
60329+:102BB00093A20010A06200D193A200101452FFD87B
60330+:102BC0000000000024020001168200048FBF002CC8
60331+:102BD0000E000626000000008FBF002C8FB40028D6
60332+:102BE0008FB300248FB200208FB1001C8FB000186B
60333+:102BF00003E0000827BD003027BDFFD8AFB3001C9D
60334+:102C0000AFB20018AFB10014AFB00010AFBF0020DA
60335+:102C10000080982100E0802130B1FFFF0E00049376
60336+:102C200030D200FF000000000000000000000000A3
60337+:102C30008F820020AC510000AC520004AC5300085D
60338+:102C4000AC40000CAC400010AC400014AC4000188C
60339+:102C50003C03080094634B5E02038025AC50001CCB
60340+:102C6000000000000000000000000000240400013B
60341+:102C70008FBF00208FB3001C8FB200188FB10014DB
60342+:102C80008FB000100A0004B827BD002827BDFFE858
60343+:102C9000AFB00010AFBF001430A5FFFF30C600FF7B
60344+:102CA0000080802124020C80AF420024000000003C
60345+:102CB0000000000000000000000000000000000014
60346+:102CC0000E000ACC000000003C040800248400E050
60347+:102CD0008C8200002403FF808FBF001402021021A9
60348+:102CE00000431024AF4200248C8200003C03000A01
60349+:102CF000020280213210007F035010218FB000109B
60350+:102D00000043102127BD001803E00008AF8200280F
60351+:102D100027BDFFE8AFBF00108F4401403C0308000F
60352+:102D20008C6300E02402FF80AF840034008318210C
60353+:102D300000621024AF4200243C02000803424021FC
60354+:102D4000950500023063007F3C02000A034318210E
60355+:102D50000062182130A5FFFF3402FFFF0000302180
60356+:102D60003C07602010A20006AF8300282402FFFF6A
60357+:102D7000A5020002946500D40E000AF130A5FFFF01
60358+:102D80008FBF001024020C8027BD001803E000084C
60359+:102D9000AF4200243C020008034240219502000299
60360+:102DA0003C0A0800954A00C63046FFFF14C00007E1
60361+:102DB0003402FFFF8F8200288F8400343C0760209C
60362+:102DC000944500D40A000B5A30A5FFFF10C200241E
60363+:102DD0008F87002894E2005494E400163045FFFFEA
60364+:102DE00000A6102300A6182B3089FFFF10600004F6
60365+:102DF0003044FFFF00C51023012210233044FFFFA1
60366+:102E0000008A102B1040000C012A1023240200011C
60367+:102E1000A50200162402FFFFA502000294E500D4DB
60368+:102E20008F8400340000302130A5FFFF3C07602074
60369+:102E30000A000AF1000000000044102A10400008B7
60370+:102E4000000000009502001630420001104000040E
60371+:102E5000000000009742007E24420014A5020016E4
60372+:102E600003E00008000000008F84002827BDFFE079
60373+:102E7000AFBF0018948200349483003E1060001AA3
60374+:102E80003048FFFF9383002C2402000114620027C6
60375+:102E90008FBF00188F820028000818C23108000771
60376+:102EA000006218212447003A244900542444002099
60377+:102EB000244500302446003490620040304200FF38
60378+:102EC0000102100730420001104000168FBF0018A9
60379+:102ED0000E000856AFA900108F82002894420034DB
60380+:102EE0000A000B733048FFFF94830036948200344D
60381+:102EF0001043000E8FBF001894820036A482003465
60382+:102F000094820056A48200548C82002CAC8200244F
60383+:102F100094820032A48200309482003CA482003A61
60384+:102F20008FBF00180A000B3327BD002003E0000804
60385+:102F300027BD002027BDFFE8AFBF00108F4A01006A
60386+:102F40003C0508008CA500E03C02080090424B8440
60387+:102F50003C0C0800958C4B7E01452821304B003FEE
60388+:102F600030A2007F03424021396900323C02000A4E
60389+:102F70003963003F2C630001010240212D2900012B
60390+:102F80002402FF8000A2282401234825AF8A0034B0
60391+:102F900000801821AF450024000030210080282146
60392+:102FA00024070001AF8800283C04080024844B78E3
60393+:102FB000AF8C002415200007A380002D24020020E0
60394+:102FC0005562000F006020213402FFFF5582000C83
60395+:102FD000006020212402002015620005000000008E
60396+:102FE0008C6300142402FFFF106200070000000041
60397+:102FF0000E000889000000000A000BD0000000004D
60398+:103000000E0008F4016028210E000B68000000008B
60399+:103010008FBF001024020C8027BD001803E00008B9
60400+:10302000AF4200243C0208008C4200E027BDFFA014
60401+:10303000AFB1003C008210212411FF80AFBE0058C8
60402+:10304000AFB70054AFB20040AFB00038AFBF005CC4
60403+:10305000AFB60050AFB5004CAFB40048AFB30044BA
60404+:10306000005110248F4800248F4900288F470028E2
60405+:10307000AF4200243C0208008C4200E00080902116
60406+:1030800024060006008210213042007F03421821EE
60407+:103090003C02000A006280213C02001F3442FF8093
60408+:1030A00000E2382427A40010260500F00122F024B5
60409+:1030B0000102B8240E00051DAFA700308FA2001832
60410+:1030C000AE0200C48FA2001CAE0200C88FA2002472
60411+:1030D000AE0200CC93A40010920300D12402FF8022
60412+:1030E0000082102400431025304900FF3083007F08
60413+:1030F0003122007F0062102A10400004000310C03B
60414+:1031000001311026304900FF000310C000031940B0
60415+:10311000006218213C0208008C4200DC920400D2BC
60416+:10312000024210210043102100511024AF42002818
60417+:1031300093A300103063007F000310C00003194008
60418+:10314000006218213C0208008C4200DC024210217F
60419+:10315000004310213042007F034218213C02000C42
60420+:10316000006240218FA300142402FFFF1062003090
60421+:10317000309500FF93A2001195030014304400FF26
60422+:103180003063FFFF0064182B1060000D000000008A
60423+:10319000950400148D07001C8D0600183084FFFF75
60424+:1031A00000442023000421000000102100E4382105
60425+:1031B00000E4202B00C230210A000C4A00C4302158
60426+:1031C000950400148D07001C8D0600183084FFFF45
60427+:1031D000008220230004210000001021008018211B
60428+:1031E00000C2302300E4202B00C4302300E3382346
60429+:1031F000AD07001CAD06001893A20011A502001433
60430+:1032000097A20012A50200168FA20014AD020010B2
60431+:103210008FA20014AD02000C93A20011A5020020A1
60432+:1032200097A20012A50200228FA20014AD02002472
60433+:103230002406FF80024610243256007FAF4200244D
60434+:10324000035618213C02000A006280218E02004CC5
60435+:103250008FA200203124007F000428C0AE0200505D
60436+:103260008FA200200004214000852821AE020070BA
60437+:1032700093A2001001208821A202008393A20010D3
60438+:10328000A2020079920200853042003FA20200852E
60439+:103290003C0208008C4200DC024210210045102153
60440+:1032A00000461024AF42002C3C0208008C4200E48F
60441+:1032B0003C0308008C6300DC024210210044102112
60442+:1032C00000461024AF4200283C0208008C4200E473
60443+:1032D00002431821006518210242102100441021E8
60444+:1032E0003042007F3063007F93A50010034220210D
60445+:1032F000034318213C02000E006240213C02000CF6
60446+:1033000010B1008C008248213233007F1660001912
60447+:103310002404FF803C0208008C4200DC02421021A1
60448+:1033200000441024AF42002C3C0208008C4200E410
60449+:103330003C0308008C6300DC02421021004410248E
60450+:10334000AF4200283C0208008C4200E402431821EE
60451+:103350003063007F024210213042007F034220216F
60452+:10336000034318213C02000E006240213C02000C85
60453+:10337000008248219124000D2414FF8000001021B8
60454+:1033800000942025A124000D950400029505001449
60455+:103390008D07001C3084FFFF30A5FFFF8D0600184D
60456+:1033A000008520230004210000E4382100C23021E0
60457+:1033B00000E4202B00C43021AD07001CAD0600182E
60458+:1033C00095020002A5020014A50000168D02000857
60459+:1033D000AD0200108D020008AD02000C9502000243
60460+:1033E000A5020020A50000228D020008AD020024E5
60461+:1033F0009122000D30420040104000422622000180
60462+:103400003C0208008C4200E0A3B300283C10000AF4
60463+:103410000242102100541024AF4200243C02080054
60464+:103420008C4200E0A380002C27A4002C0242102133
60465+:103430003042007F03421821007018218C6200D8AE
60466+:103440008D26000427A50028AFA9002C00461021D6
60467+:10345000AC6200D80E0009E1AF83002893A30028D6
60468+:103460008F8200280E000626A04300D10E000B68B4
60469+:103470000000000002541024AF4200243C02080067
60470+:103480008C4200DC00132940001320C000A420213E
60471+:10349000024210210044102100541024AF42002C9D
60472+:1034A0003C0208008C4200E43C0308008C6300DC12
60473+:1034B00003563021024210210045102100541024EF
60474+:1034C000AF4200283C0208008C4200E4024318216D
60475+:1034D0000064182102421021004510213042007F73
60476+:1034E0003063007F03422021034318213C02000E79
60477+:1034F000006240213C02000C00D080210082482163
60478+:10350000262200013043007F14750005304400FF7F
60479+:103510002403FF800223102400431026304400FFC0
60480+:1035200093A2001000808821250800281444FF760B
60481+:103530002529002093A400108FA300142402FFFF6C
60482+:103540001062000A308900FF2482000124830001F8
60483+:103550003042007F14550005306900FF2403FF80CE
60484+:103560000083102400431026304900FF92020078A7
60485+:10357000305300FF11330032012088213C02080043
60486+:103580008C4200DC3225007F000520C00005294068
60487+:1035900000A42021024210212406FF8000441021B3
60488+:1035A00000461024AF42002C3C0308008C6300DC72
60489+:1035B0003C0208008C4200E4024318210242102120
60490+:1035C0000045102100641821004610243063007F5C
60491+:1035D000AF420028034318213C02000E0062402144
60492+:1035E0003C0208008C4200E48D06000C0100202102
60493+:1035F00002421021004510213042007F0342182171
60494+:103600003C02000C0062482110C0000D012028215E
60495+:103610000E00064A000000002402FF800222182447
60496+:1036200026240001006228263082007F1455000203
60497+:10363000308300FF30A300FF1473FFD000608821A7
60498+:103640008E0300743C027FFF3442FFFF00621824A7
60499+:10365000AE0300740E00066B02402021AF57002419
60500+:103660008FA20030AF5E00288FBF005C8FBE005875
60501+:103670008FB700548FB600508FB5004C8FB4004800
60502+:103680008FB300448FB200408FB1003C8FB0003840
60503+:1036900027BD006003E00008AF42002C27BDFFD823
60504+:1036A000AFB1001CAFBF0020AFB000182751018898
60505+:1036B000922200032408FF803C03000A3047007F69
60506+:1036C000A3A700108F4601803C0208008C4200E056
60507+:1036D000AF86003400C2282100A81024AF42002485
60508+:1036E0009224000030A2007F0342102100431021E9
60509+:1036F000AF8200283084007F24020002148200255B
60510+:10370000000719403C0208008C4200E400C210216E
60511+:103710000043282130A2007F0342182100A8102472
60512+:10372000AF4200283C02000C006218219062000D9C
60513+:10373000AFA3001400481025A062000D8FA3001451
60514+:103740009062000D304200405040006A8FBF002060
60515+:103750008F860028A380002C27A400148CC200D8D8
60516+:103760008C63000427A50010004310210E0009E11E
60517+:10377000ACC200D893A300108F8200280E0006264A
60518+:10378000A04300D10E000B68000000000A000E0BE1
60519+:103790008FBF00200E00062F00C020210E00063D26
60520+:1037A000000000003C020008034280219223000137
60521+:1037B0009202007B1443004F8FBF00209222000032
60522+:1037C0003044007F24020004108200172882000584
60523+:1037D00010400006240200052402000310820007A6
60524+:1037E0008FB1001C0A000E0C0000000010820012B5
60525+:1037F0008FBF00200A000E0C8FB1001C92050083C1
60526+:10380000920600788E0700748F84003430A500FF84
60527+:1038100000073E0230C600FF0E00067330E7007F4F
60528+:103820000A000E0B8FBF00200E000BD78F840034D0
60529+:103830000A000E0B8FBF002024020C80AF42002430
60530+:103840009202003E30420040104000200000000084
60531+:103850009202003E00021600000216030441000618
60532+:10386000000000008F8400340E0005A024050093A2
60533+:103870000A000E0B8FBF00209202003F24030018A5
60534+:10388000304200FF1443000C8F84003424050039BB
60535+:103890000E000538000030210E0002508F840034E5
60536+:1038A00024020012A202003F0E0002598F8400344D
60537+:1038B0000A000E0B8FBF0020240500360E000538CD
60538+:1038C000000030210A000E0B8FBF00200E000250B6
60539+:1038D0008F8400349202000534420020A2020005C9
60540+:1038E0000E0002598F8400340E000FC08F84003404
60541+:1038F0008FBF00208FB1001C8FB0001824020C80F5
60542+:1039000027BD002803E00008AF42002427BDFFE8E0
60543+:10391000AFB00010AFBF001427430100946200084D
60544+:103920000002140000021403044100020000802180
60545+:103930002410000194620008304200801040001AF8
60546+:10394000020010219462000830422000104000164E
60547+:10395000020010218C6300183C021C2D344219ED2A
60548+:10396000240600061062000F3C0760213C0208009C
60549+:103970008C4200D4104000078F8200288F830028DB
60550+:10398000906200623042000F34420040A062006248
60551+:103990008F8200288F840034944500D40E000AF1F1
60552+:1039A00030A5FFFF020010218FBF00148FB0001060
60553+:1039B00003E0000827BD001827BDFFE0AFB10014E9
60554+:1039C000AFB00010A380002CAFBF00188F450100DE
60555+:1039D0003C0308008C6300E02402FF80AF850034C4
60556+:1039E00000A318213064007F0344202100621824C2
60557+:1039F0003C02000A00822021AF430024275001002E
60558+:103A00008E0200148C8300DCAF8400280043102356
60559+:103A100018400004000088218E0200140E000A8461
60560+:103A2000AC8200DC9202000B24030002304200FF53
60561+:103A30001443002F0000000096020008304300FFEE
60562+:103A40002402008214620005240200840E00093E54
60563+:103A5000000000000A000E97000000001462000938
60564+:103A6000240200818F8200288F8400343C0760216B
60565+:103A7000944500D49206000530A5FFFF0A000E868B
60566+:103A800030C600FF14620027000000009202000A06
60567+:103A9000304300FF306200201040000430620040DC
60568+:103AA0008F8400340A000E82240600401040000477
60569+:103AB000000316008F8400340A000E8224060041A1
60570+:103AC00000021603044100178F84003424060042CC
60571+:103AD0008F8200283C076019944500D430A5FFFF71
60572+:103AE0000E000AF1000000000A000E97000000001E
60573+:103AF0009202000B24030016304200FF1043000620
60574+:103B0000000000009202000B24030017304200FF67
60575+:103B100014430004000000000E000E11000000001D
60576+:103B2000004088210E000B68000000009202000A8D
60577+:103B3000304200081040000624020C808F850028C7
60578+:103B40003C0400080E0011EE0344202124020C80E6
60579+:103B5000AF4200248FBF0018022010218FB0001048
60580+:103B60008FB1001403E0000827BD002027BDFFE847
60581+:103B7000AFBF0014AFB000108F5000243C0308000A
60582+:103B80008C6300E08F4501002402FF8000A3182110
60583+:103B90003064007F03442021006218243C02000AA4
60584+:103BA00000822021AF850034AF4300249082006260
60585+:103BB000AF8400283042000F34420050A0820062DF
60586+:103BC0003C02001F3442FF800E00062602028024C1
60587+:103BD000AF5000248FBF00148FB0001003E0000826
60588+:103BE00027BD00183C0208008C4200201040001D38
60589+:103BF0002745010090A300093C0200080342202150
60590+:103C000024020018546200033C0200080A000ED887
60591+:103C10002402000803422021240200161462000539
60592+:103C20002402001724020012A082003F0A000EE2C4
60593+:103C300094A700085462000694A700089362000548
60594+:103C40002403FFFE00431024A362000594A700088C
60595+:103C500090A6001B8CA4000094A500060A000ACCC4
60596+:103C600000073C0003E000080000000027440100BA
60597+:103C700094820008304500FF38A3008238A20084F7
60598+:103C80002C6300012C420001006218251060000620
60599+:103C9000240200839382002D1040000D00000000DC
60600+:103CA0000A000B9B0000000014A2000524A2FF8064
60601+:103CB0008F4301043C02602003E00008AC43001481
60602+:103CC000304200FF2C420002104000032402002278
60603+:103CD0000A000E3C0000000014A2000300000000D7
60604+:103CE0000A000EA9000000000A000EC70000000034
60605+:103CF0009363007E9362007A144300090000202140
60606+:103D00009362000024030050304200FF144300047B
60607+:103D1000240400019362007E24420001A362007E1D
60608+:103D200003E00008008010218F4201F80440FFFEEC
60609+:103D300024020002AF4401C0A34201C43C021000AF
60610+:103D400003E00008AF4201F827BDFFE8AFBF001055
60611+:103D50009362003F2403000A304200FF14430046F0
60612+:103D6000000000008F6300548F62004C1062007DE1
60613+:103D7000036030219362000024030050304200FFB2
60614+:103D80001443002F000000008F4401403C02080053
60615+:103D90008C4200E02403FF800082102100431024A5
60616+:103DA000AF4200243C0208008C4200E08F650054C2
60617+:103DB0003C03000A008220213084007F034410214C
60618+:103DC00000431021AC4501089762003C8F63004C12
60619+:103DD0003042FFFF0002104000621821AF63005C18
60620+:103DE0008F6300548F64004C9762003C006418237A
60621+:103DF0003042FFFF00031843000210400043102A26
60622+:103E000010400006000000008F6200548F63004CD9
60623+:103E1000004310230A000F58000210439762003C31
60624+:103E20003042FFFF00021040ACC2006424020001D7
60625+:103E3000A0C0007CA0C2008424020C80AF420024F9
60626+:103E40000E000F0A8F440140104000478FBF001042
60627+:103E50008F4301408F4201F80440FFFE240200021C
60628+:103E6000AF4301C0A34201C43C021000AF4201F8BD
60629+:103E70000A000FA88FBF00109362003F24030010B8
60630+:103E8000304200FF14430004000000008F44014052
60631+:103E90000A000F94000028219362003F24030016BB
60632+:103EA000304200FF1443000424020014A362003FC8
60633+:103EB0000A000FA2000000008F62004C8F630050C8
60634+:103EC00000431023044100288FBF0010936200813B
60635+:103ED00024420001A3620081936200812C4200040D
60636+:103EE00014400010000000009362003F240300040F
60637+:103EF000304200FF14430006000000008F440140E0
60638+:103F00008FBF0010240500930A0005A027BD0018EC
60639+:103F10008F440140240500938FBF00100A00060F54
60640+:103F200027BD00188F4401400E0002500000000021
60641+:103F30008F6200542442FFFFAF6200548F62005032
60642+:103F40002442FFFFAF6200500E0002598F4401402F
60643+:103F50008F4401408FBF0010240500040A00025E58
60644+:103F600027BD00188FBF001003E0000827BD001810
60645+:103F70008F4201889363007E00021402304400FFE8
60646+:103F8000306300FF1464000D0000000093620080A5
60647+:103F9000304200FF1044000900000000A3640080CC
60648+:103FA0009362000024030050304200FF14430004D9
60649+:103FB000000000000A0006D78F440180A36400803F
60650+:103FC00003E000080000000027BDFFE8AFB00010CC
60651+:103FD000AFBF00149362000524030030304200306C
60652+:103FE00014430089008080213C0208008C4200209C
60653+:103FF00010400080020020210E0004930000000009
60654+:104000008F850020ACB000009362003E9363003FB8
60655+:10401000304200FF00021200306300FF0043102511
60656+:10402000ACA2000493620082000216000002160394
60657+:1040300004410005000000003C0308008C630048B8
60658+:104040000A000FE6000000009362003E304200408C
60659+:10405000144000030000182193620081304300FFE8
60660+:104060009362008200031E00304200FF0002140031
60661+:1040700000621825ACA300088F620040ACA2000CBF
60662+:104080008F620048ACA200108F62004CACA20014FA
60663+:104090008F6200508F63004C0043102304410003E3
60664+:1040A000000000000A000FFA8F62004C8F6200507F
60665+:1040B000ACA200183C02080094424B5E3C03C00BCB
60666+:1040C00000002021004310250E0004B8ACA2001C03
60667+:1040D0008F6200548F840020AC8200008F620058F1
60668+:1040E000AC8200048F62005CAC8200088F620060CA
60669+:1040F0008F43007400431021AC82000C8F62006477
60670+:10410000AC820010976300689762006A00031C008D
60671+:104110003042FFFF00621825AC83001493620082D6
60672+:1041200024030080304200FF14430003000000001D
60673+:104130000A00102EAC8000188F63000C24020001CE
60674+:104140001062000E2402FFFF9362003E30420040E6
60675+:104150001440000A2402FFFF8F63000C8F4200749A
60676+:10416000006218233C020800006210241440000280
60677+:10417000000028210060282100051043AC820018AF
60678+:104180003C02080094424B5E3C03C00C000020211E
60679+:10419000004310258F8300200E0004B8AC62001C81
60680+:1041A0008F6200188F8300203C05080094A54B5EA9
60681+:1041B00024040001AC620000AC6000048F66006C57
60682+:1041C0003C02400D00A22825AC6600088F6200DC8E
60683+:1041D000AC62000CAC600010936200050002160097
60684+:1041E000AC620014AC6000180E0004B8AC65001C92
60685+:1041F000020020218FBF00148FB00010A3600005C3
60686+:104200000A00042127BD00188FBF00148FB00010D2
60687+:1042100003E0000827BD00189742007C30C600FF6D
60688+:10422000A08600843047FFFF2402000514C2000B63
60689+:1042300024E3465090A201122C42000710400007D0
60690+:1042400024E30A0090A30112240200140062100467
60691+:1042500000E210210A0010663047FFFF3067FFFFC1
60692+:1042600003E00008A4870014AC87004C8CA201086E
60693+:104270000080402100A0482100E2102330C600FF4A
60694+:104280001840000393AA001324E2FFFCACA201082B
60695+:1042900030C2000110400008000000008D020050F4
60696+:1042A00000E2102304410013240600058D0200548F
60697+:1042B00010E20010000000008D02005414E2001A09
60698+:1042C000000000003C0208008C4200D83042002070
60699+:1042D0001040000A2402000191030078910200833B
60700+:1042E000144300062402000101002021012028219E
60701+:1042F000240600040A00105400000000A1000084FD
60702+:1043000011400009A50200148F4301008F4201F8FB
60703+:104310000440FFFE24020002AF4301C0A34201C4D7
60704+:104320003C021000AF4201F803E00008000000006A
60705+:1043300027BDFFE88FA90028AFBF001000804021F3
60706+:1043400000E918231860007330C600FFA080007CCD
60707+:10435000A08000818CA2010800E210230440004DDF
60708+:10436000000000008C8200509483003C8C84006428
60709+:10437000004748233063FFFF012318210083202BCF
60710+:1043800010800004000000008D0200640A0010B7D5
60711+:1043900000E210219502003C3042FFFF0122102173
60712+:1043A00000E21021AD02005C9502003C8D03005C30
60713+:1043B0003042FFFF0002104000E210210043102BAA
60714+:1043C00010400003000000000A0010C68D02005CCF
60715+:1043D0009502003C3042FFFF0002104000E2102135
60716+:1043E000AD02005CA1000084AD07004C8CA2010866
60717+:1043F00000E210231840000224E2FFFCACA20108F6
60718+:1044000030C200011040000A000000008D02005080
60719+:1044100000E2102304410004010020218D02005419
60720+:1044200014E20003000000000A0010E82406000562
60721+:104430008D02005414E200478FBF00103C020800B8
60722+:104440008C4200D8304200201040000A24020001B3
60723+:1044500091030078910200831443000624020001B6
60724+:1044600001002021240600048FBF00100A00105410
60725+:1044700027BD0018A1000084A50200148F4301008D
60726+:104480008F4201F80440FFFE240200020A00110DD1
60727+:10449000000000008C82005C004910230043102BB8
60728+:1044A00054400001AC87005C9502003C3042FFFFA5
60729+:1044B0000062102B14400007240200029502003C09
60730+:1044C0008D03005C3042FFFF00621821AD03005CE9
60731+:1044D00024020002AD07004CA10200840E000F0A66
60732+:1044E0008F4401001040001B8FBF00108F4301005C
60733+:1044F0008F4201F80440FFFE24020002AF4301C0D6
60734+:10450000A34201C43C021000AF4201F80A0011238B
60735+:104510008FBF001030C200101040000E8FBF00107F
60736+:104520008C83005C9482003C006918233042FFFFBA
60737+:10453000006218213C023FFF3444FFFF0083102B30
60738+:10454000544000010080182101231021AD02005CBD
60739+:104550008FBF001003E0000827BD001827BDFFE84B
60740+:104560008FAA0028AFBF00100080402100EA482336
60741+:104570001920002130C600FF8C83005C8C8200640F
60742+:10458000006A18230043102B5040001000691821C6
60743+:1045900094A2011001221021A4A2011094A20110E2
60744+:1045A0003042FFFF0043102B1440000A3C023FFF43
60745+:1045B00094A2011000431023A4A201109482003C95
60746+:1045C0003042FFFF0A00114200621821A4A001102E
60747+:1045D0003C023FFF3444FFFF0083102B5440000196
60748+:1045E0000080182100671021AD02005CA100007C52
60749+:1045F0000A00118AA100008130C200101040003C66
60750+:10460000000000008C820050004A1023184000383F
60751+:10461000000000009082007C24420001A082007C07
60752+:104620009082007C3C0308008C630024304200FF31
60753+:104630000043102B1440005C8FBF00108CA20108B7
60754+:1046400000E2102318400058000000008C83005442
60755+:104650009482003C006A18233042FFFF0003184395
60756+:10466000000210400043102A104000050000000026
60757+:104670008C820054004A10230A001171000210437A
60758+:104680009482003C3042FFFF00021040AD02006403
60759+:104690009502003C8D0400649503003C3042FFFF0E
60760+:1046A00000021040008220213063FFFF00831821A8
60761+:1046B00001431021AD02005C8D020054ACA2010840
60762+:1046C00024020002A10200840E000F0A8F440100A0
60763+:1046D000104000358FBF00108F4301008F4201F85A
60764+:1046E0000440FFFE240200020A0011B30000000093
60765+:1046F000AD07004C8CA2010800E210231840000214
60766+:1047000024E2FFFCACA2010830C200011040000A04
60767+:10471000000000008D02005000E21023044100045C
60768+:10472000010020218D02005414E20003000000006B
60769+:104730000A0011AA240600058D02005414E2001A92
60770+:104740008FBF00103C0208008C4200D8304200208D
60771+:104750001040000A240200019103007891020083B6
60772+:104760001443000624020001010020212406000455
60773+:104770008FBF00100A00105427BD0018A10000844C
60774+:10478000A50200148F4301008F4201F80440FFFE90
60775+:1047900024020002AF4301C0A34201C43C02100046
60776+:1047A000AF4201F88FBF001003E0000827BD0018DA
60777+:1047B0008FAA00108C8200500080402130C600FF7C
60778+:1047C000004A102300A048211840000700E01821EB
60779+:1047D00024020001A0800084A0A00112A482001481
60780+:1047E0000A001125AFAA0010A0800081AD07004C7F
60781+:1047F0008CA2010800E210231840000224E2FFFC12
60782+:10480000ACA2010830C20001104000080000000006
60783+:104810008D0200500062102304410013240600059D
60784+:104820008D02005410620010000000008D02005440
60785+:1048300014620011000000003C0208008C4200D805
60786+:10484000304200201040000A240200019103007849
60787+:10485000910200831443000624020001010020217C
60788+:1048600001202821240600040A0010540000000042
60789+:10487000A1000084A502001403E00008000000006D
60790+:1048800027BDFFE0AFBF0018274201009046000A95
60791+:104890008C4800148C8B004C9082008430C900FF3F
60792+:1048A00001681823304A00FF1C60001A2D460006DC
60793+:1048B000240200010142100410C00016304300031E
60794+:1048C000012030210100382114600007304C000C19
60795+:1048D00015800009304200301440000B8FBF0018D3
60796+:1048E0000A001214000000000E001125AFAB0010EA
60797+:1048F0000A0012148FBF00180E00109AAFAB001000
60798+:104900000A0012148FBF0018AFAB00100E0011BACE
60799+:10491000AFAA00148FBF001803E0000827BD0020D5
60800+:1049200024020003A08200848C82005403E000086B
60801+:10493000ACA201083C0200080342182190620081E9
60802+:10494000240600433C07601924420001A062008154
60803+:10495000906300813C0208008C4200C0306300FF7D
60804+:10496000146200102403FF803C0208008C4200E027
60805+:104970000082102100431024AF4200243C020800B2
60806+:104980008C4200E03C03000A008210213042007F8C
60807+:104990000342102100431021944500D40A000AF17B
60808+:1049A00030A5FFFF03E000080000000027BDFFE086
60809+:1049B000AFBF0018AFB10014AFB000108F4201803C
60810+:1049C0000080802100A088210E00121B00402021C1
60811+:1049D000A20000848E0200548FBF00188FB0001018
60812+:1049E000AE2201088FB1001403E0000827BD0020AB
60813+:1049F00027BDFFE03C020008AFB00010AFBF0018B9
60814+:104A0000AFB10014034280218F5101409203008412
60815+:104A10008E0400508E02004C14820040306600FF6D
60816+:104A20003C0208008C4200E02403FF800222102197
60817+:104A300000431024AF4200243C0208008C4200E0F6
60818+:104A40009744007C92050081022210213042007FB1
60819+:104A5000034218213C02000A0062182114A0000B36
60820+:104A60003084FFFF2402000554C20014248205DCB8
60821+:104A70009062011224420001A062011224020C8003
60822+:104A8000AF4200240A00127324020005A060011244
60823+:104A90002402000514C20009248205DC9202008170
60824+:104AA0002C4200075040000524820A009203008136
60825+:104AB0002402001400621004008210213044FFFF21
60826+:104AC000A60400140E00121B022020219602003CB6
60827+:104AD0008E03004C022020213042FFFF00021040D4
60828+:104AE000006218210E000250AE03005C9202007DAD
60829+:104AF00002202021344200400E000259A202007D13
60830+:104B00008F4201F80440FFFE24020002AF5101C0B1
60831+:104B1000A34201C43C021000AF4201F88FBF00184D
60832+:104B20008FB100148FB0001003E0000827BD0020F3
60833+:104B300008000ACC08000B1408000B9808000BE4CE
60834+:104B400008000C200A0000280000000000000000FF
60835+:104B50000000000D6370362E322E3300000000007E
60836+:104B60000602030400000000000000000000000036
60837+:104B70000000000000000000000000000000000035
60838+:104B80000000000000000000000000000000002005
60839+:104B90000000000000000000000000000000000015
60840+:104BA0000000000000000000000000000000000005
60841+:104BB00000000000000000000000000000000001F4
60842+:104BC0000000002B000000000000000400030D4066
60843+:104BD00000000000000000000000000000000000D5
60844+:104BE00000000000000000001000000300000000B2
60845+:104BF0000000000D0000000D3C020800244258A4F3
60846+:104C00003C03080024635F70AC4000000043202B8D
60847+:104C10001480FFFD244200043C1D080037BD7FFCCA
60848+:104C200003A0F0213C100800261000A03C1C080046
60849+:104C3000279C58A40E0001AC000000000000000DED
60850+:104C400027BDFFE83C096018AFBF00108D2C500055
60851+:104C5000240DFF7F24080031018D5824356A380C5B
60852+:104C600024070C003C1A8000AD2A50003C04800A46
60853+:104C7000AF4800083C1B8008AF4700240E00091510
60854+:104C8000AF8400100E0008D8000000000E000825B8
60855+:104C9000000000000E001252000000003C046016EC
60856+:104CA0008C8500003C06FFFF3C02535300A61824ED
60857+:104CB0001062004734867C0094C201F2A780002C69
60858+:104CC00010400003A78000CC38581E1EA798002C67
60859+:104CD00094C201F810400004978300CC38591E1E7E
60860+:104CE000A79900CC978300CC2C7F006753E000018C
60861+:104CF000240300669784002C2C82040114400002D7
60862+:104D000000602821240404003C0760008CE904387A
60863+:104D10002403103C3128FFFF1103001F30B9FFFFAF
60864+:104D200057200010A38000CE24020050A38200CEA2
60865+:104D3000939F00CE53E0000FA78500CCA78000CC46
60866+:104D4000978500CC8FBF0010A780002CA78000346F
60867+:104D5000A78000E63C010800AC25008003E00008C5
60868+:104D600027BD0018939F00CE57E0FFF5A78000CC29
60869+:104D7000A78500CC978500CC8FBF0010A784002C9E
60870+:104D8000A7800034A78000E63C010800AC25008025
60871+:104D900003E0000827BD0018A38000CE8CCB003CA8
60872+:104DA000316A00011140000E0000000030A7FFFF33
60873+:104DB00010E0FFDE240200508CCC00C831860001D8
60874+:104DC00014C0FFDC939F00CE0A00007A2402005139
60875+:104DD0008C8F00043C0E60000A00005D01EE302163
60876+:104DE0008CEF0808240D5708000F740211CD000441
60877+:104DF00030B8FFFF240500660A00007B240404008D
60878+:104E00001700FFCC939F00CE0A00007A24020050C6
60879+:104E10008F8600103089FFFF000939408CC30010D5
60880+:104E20003C08005000E82025AF4300388CC5001432
60881+:104E300027420400AF82001CAF45003CAF44003065
60882+:104E40000000000000000000000000000000000062
60883+:104E50000000000000000000000000000000000052
60884+:104E60008F4B0000316A00201140FFFD0000000060
60885+:104E700003E00008000000008F840010948A001AEC
60886+:104E80008C8700243149FFFF000940C000E8302131
60887+:104E9000AF46003C8C8500248F43003C00A31023C8
60888+:104EA00018400029000000008C8B002025620001C2
60889+:104EB0003C0D005035AC0008AF420038AF4C00301C
60890+:104EC00000000000000000000000000000000000E2
60891+:104ED00000000000000000000000000000000000D2
60892+:104EE0008F4F000031EE002011C0FFFD00000000D8
60893+:104EF0008F4A04003C080020AC8A00108F4904044B
60894+:104F0000AC890014AF4800300000000094860018FF
60895+:104F10009487001C00C71821A48300189485001AE8
60896+:104F200024A20001A482001A9498001A9499001EE9
60897+:104F3000133800030000000003E000080000000038
60898+:104F400003E00008A480001A8C8200200A0000DC24
60899+:104F50003C0D00500A0000CD000000003C0308009A
60900+:104F60008C6300208F82001827BDFFE810620008C4
60901+:104F7000AFBF00100E000104AF8300183C0308000F
60902+:104F80008C63002024040001106400048F89001049
60903+:104F90008FBF001003E0000827BD00188FBF00106E
60904+:104FA0003C076012A520000A9528000A34E500108D
60905+:104FB00027BD00183106FFFF03E00008ACA60090F3
60906+:104FC0003C0208008C42002027BDFFC8AFBF003460
60907+:104FD000AFBE0030AFB7002CAFB60028AFB500248D
60908+:104FE000AFB40020AFB3001CAFB20018AFB10014D3
60909+:104FF00010400050AFB000108F840010948600065F
60910+:105000009483000A00C3282330B6FFFF12C0004A71
60911+:105010008FBF003494890018948A000A012A402323
60912+:105020003102FFFF02C2382B14E0000202C020212F
60913+:10503000004020212C8C0005158000020080A0215A
60914+:10504000241400040E0000B3028020218F8700107A
60915+:1050500002809821AF80001494ED000A028088211C
60916+:105060001280004E31B2FFFF3C1770003C1540002B
60917+:105070003C1E60008F8F001C8DEE000001D71824AD
60918+:10508000507500500220202102A3802B160000350D
60919+:105090003C182000507800470220202124100001F5
60920+:1050A0008F83001414600039029158230230F823D2
60921+:1050B0000250C82133F1FFFF1620FFEE3332FFFF0D
60922+:1050C0008F8700103C110020AF510030000000001D
60923+:1050D00094E6000A3C1E601237D5001002662821B3
60924+:1050E000A4E5000A94E2000A94F2000A94F400187D
60925+:1050F0003057FFFF1292003BAEB700908CED0014CA
60926+:105100008CE400100013714001AE4021000E5FC31B
60927+:10511000010E502B008B4821012A1821ACE8001405
60928+:10512000ACE3001002D3382330F6FFFF16C0FFB9FE
60929+:105130008F8400108FBF00348FBE00308FB7002CDB
60930+:105140008FB600288FB500248FB400208FB3001CC9
60931+:105150008FB200188FB100148FB0001003E0000868
60932+:1051600027BD0038107E001B000000001477FFCC24
60933+:10517000241000010E00159B000000008F83001416
60934+:105180001060FFCB0230F823029158238F87001064
60935+:10519000017020210A0001973093FFFF8F830014D4
60936+:1051A0001460FFCB3C110020AF5100300A000163B6
60937+:1051B000000000000E00077D024028210A00015770
60938+:1051C000004080210E00033A024028210A000157C6
60939+:1051D000004080210E001463022020210A000157A4
60940+:1051E000004080210E0000CD000000000A0001797F
60941+:1051F00002D3382327BDFFE8AFB00010AFBF0014C3
60942+:105200000E00003F000000003C028000345000709F
60943+:105210000A0001BA8E0600008F4F000039EE00012F
60944+:1052200031C20001104000248F8600A88E070000C4
60945+:105230003C0C08008D8C003C3C0908008D2900388E
60946+:1052400000E66823018D28210000502100AD302B9D
60947+:10525000012A4021010620213C010800AC25003C28
60948+:10526000AF8700A83C010800AC2400380E000106FE
60949+:10527000000000003C0308008C6300701060FFE633
60950+:10528000006020213C0508008CA500683C06080051
60951+:105290008CC6006C0E00152A000000003C010800BE
60952+:1052A000AC2000708F4F000039EE000131C20001C8
60953+:1052B0001440FFDE8F8600A88E0A00008F8B00A8A6
60954+:1052C0003C0508008CA5003C3C0408008C84003898
60955+:1052D000014B482300A938210082182100E9402B06
60956+:1052E000006810213C010800AC27003C3C0108008C
60957+:1052F000AC2200388F5F01002419FF0024180C0035
60958+:1053000003F9202410980012AF840000AF4400205D
60959+:10531000936D0000240C002031A600FF10CC001279
60960+:10532000240E005010CE00043C194000AF59013843
60961+:105330000A0001B3000000000E0011C800000000C8
60962+:105340003C194000AF5901380A0001B300000000C9
60963+:105350000E00011F000000003C194000AF59013849
60964+:105360000A0001B3000000008F58010000802821CE
60965+:10537000330F00FF01E020210E0002F1AF8F000487
60966+:105380003C194000AF5901380A0001B30000000089
60967+:1053900000A4102B2403000110400009000030215C
60968+:1053A0000005284000A4102B04A0000300031840AF
60969+:1053B0005440FFFC000528405060000A0004182BF0
60970+:1053C0000085382B54E000040003184200C3302548
60971+:1053D00000852023000318421460FFF900052842CD
60972+:1053E0000004182B03E0000800C310218F4201B80D
60973+:1053F0000440FFFE00000000AF4401803C031000A9
60974+:1054000024040040AF450184A3440188A3460189D8
60975+:10541000A747018A03E00008AF4301B83084FFFFCB
60976+:105420000080382130A5FFFF000020210A00022A59
60977+:10543000240600803087FFFF8CA40000240600387B
60978+:105440000A00022A000028218F8300388F8600304E
60979+:105450001066000B008040213C07080024E75A1822
60980+:10546000000328C000A710218C4400002463000121
60981+:10547000108800053063000F5466FFFA000328C04F
60982+:1054800003E00008000010213C07080024E75A1C34
60983+:1054900000A7302103E000088CC200003C0390000C
60984+:1054A0003462000100822025AF4400208F45002097
60985+:1054B00004A0FFFE0000000003E000080000000060
60986+:1054C0003C038000346200010082202503E00008D4
60987+:1054D000AF44002027BDFFE0AFB100143091FFFFC3
60988+:1054E000AFB00010AFBF00181220001300A0802141
60989+:1054F0008CA2000024040002240601401040000F8A
60990+:10550000004028210E000C5C00000000000010216B
60991+:10551000AE000000022038218FBF00188FB10014A8
60992+:105520008FB0001000402021000028210000302111
60993+:105530000A00022A27BD00208CA200000220382188
60994+:105540008FBF00188FB100148FB0001000402021D1
60995+:1055500000002821000030210A00022A27BD002077
60996+:1055600000A010213087FFFF8CA500048C440000B0
60997+:105570000A00022A2406000627BDFFE0AFB0001093
60998+:10558000AFBF0018AFB100149363003E00808021CC
60999+:105590000080282130620040000020211040000FD0
61000+:1055A0008E1100000E000851022020219367000098
61001+:1055B0002404005030E500FF50A400128E0F0000BC
61002+:1055C000022020218FBF00188FB100148FB000106F
61003+:1055D000A762013C0A00091127BD00200E000287C6
61004+:1055E000000000000E0008510220202193670000F7
61005+:1055F0002404005030E500FF14A4FFF20220202113
61006+:105600008E0F00003C1008008E1000503C0D000C66
61007+:10561000240BFF8001F05021314E007F01DA602120
61008+:10562000018D4021014B4824AF4900280220202150
61009+:105630008FBF00188FB100148FB00010A50200D6E4
61010+:1056400027BD00200A000911AF8800D027BDFFE068
61011+:10565000AFBF0018AFB10014AFB0001093660001E7
61012+:10566000008080210E00025630D1000493640005B2
61013+:10567000001029C2A765000034830040A363000521
61014+:105680000E00025F020020210E00091302002021FB
61015+:1056900024020001AF62000C02002821A762001062
61016+:1056A00024040002A762001224060140A76200142D
61017+:1056B0000E000C5CA76200161620000F8FBF0018AA
61018+:1056C000978C00343C0B08008D6B00782588FFFF19
61019+:1056D0003109FFFF256A0001012A382B10E000067E
61020+:1056E000A78800343C0F6006240E001635ED00102C
61021+:1056F000ADAE00508FBF00188FB100148FB00010F6
61022+:1057000003E0000827BD002027BDFFE0AFB1001473
61023+:10571000AFBF0018AFB0001000A088211080000AB1
61024+:105720003C03600024020080108200120000000090
61025+:105730000000000D8FBF00188FB100148FB0001053
61026+:1057400003E0000827BD00208C682BF80500FFFE51
61027+:1057500000000000AC712BC08FBF00188FB1001487
61028+:105760008FB000103C09100027BD002003E00008A6
61029+:10577000AC692BF80E00025600A0202193650005AD
61030+:10578000022020210E00025F30B000FF2403003E03
61031+:105790001603FFE7000000008F4401780480FFFE3D
61032+:1057A000240700073C061000AF51014002202021D1
61033+:1057B000A34701448FBF00188FB100148FB00010B1
61034+:1057C000AF4601780A0002C227BD002027BDFFE8CE
61035+:1057D000AFBF0014AFB000108F50002000000000D9
61036+:1057E0000E000913AF440020AF5000208FBF0014FB
61037+:1057F0008FB0001003E0000827BD00183084FFFFC1
61038+:10580000008038212406003500A020210A00022A49
61039+:10581000000028213084FFFF008038212406003654
61040+:1058200000A020210A00022A0000282127BDFFD065
61041+:10583000AFB3001C3093FFFFAFB50024AFB2001828
61042+:10584000AFBF0028AFB40020AFB10014AFB000105C
61043+:1058500030B5FFFF12600027000090218F90001CE0
61044+:105860008E0300003C0680002402004000033E023C
61045+:1058700000032C0230E4007F006688241482001D9F
61046+:1058800030A500FF8F8300282C68000A510000100B
61047+:105890008F910014000358803C0C0800258C56940E
61048+:1058A000016C50218D49000001200008000000001B
61049+:1058B00002B210213045FFFF0E000236240400849E
61050+:1058C000162000028F90001CAF8000288F910014DA
61051+:1058D000260C002026430001018080213072FFFF4A
61052+:1058E00016200004AF8C001C0253502B1540FFDC27
61053+:1058F00000000000024010218FBF00288FB5002457
61054+:105900008FB400208FB3001C8FB200188FB1001429
61055+:105910008FB0001003E0000827BD0030240E0034D3
61056+:1059200014AE00F9000000009203000E241F168040
61057+:105930003C07000CA36300219202000D0347C8211D
61058+:105940003C066000A3620020961100123C0A7FFF13
61059+:10595000354CFFFFA771003C960B00102403000597
61060+:105960003168FFFFAF6800848E05001CAF5F002820
61061+:105970008F3800008CC4444803057826008F3021FE
61062+:10598000AF66004C8F69004C24CE00013C057F00BF
61063+:10599000AF6900508F740050AF740054AF66007050
61064+:1059A000AF6E00588F6D005824140050AF6D005C2E
61065+:1059B000A3600023AF6C0064A36300378E02001461
61066+:1059C000AF6200488F710048AF7100248E0B001841
61067+:1059D000AF6B006C9208000CA3680036937F003E0A
61068+:1059E00037F90020A379003E8F78007403058024E6
61069+:1059F000360F4000AF6F007493640000308900FFE1
61070+:105A0000513402452404FF803C04080024845A9841
61071+:105A10000E00028D000000003C1008008E105A9805
61072+:105A20000E00025602002021240600042407000173
61073+:105A3000A366007D020020210E00025FA36700051F
61074+:105A40008F5F017807E0FFFE240B0002AF5001409A
61075+:105A5000A34B01448F90001C3C081000AF48017814
61076+:105A60000A000362AF8000282CAD003751A0FF98D8
61077+:105A70008F9100140005A0803C180800271856BC20
61078+:105A8000029878218DEE000001C00008000000009F
61079+:105A90002418000614B80011000000003C0808009B
61080+:105AA0008D085A9824040005AF4800208E1F001866
61081+:105AB000AF7F00188F79004CAF79001C8F650050C4
61082+:105AC000122000C0AF6500700A000362AF84002896
61083+:105AD0002406000710A60083240300063C050800E6
61084+:105AE00024A55A980E000264240400818F90001CA3
61085+:105AF0000011102B0A000362AF8200282407000463
61086+:105B000014A7FFF6240500503C1808008F185A9877
61087+:105B1000AF5800208E0F0008AF6F00408E090008BC
61088+:105B2000AF6900448E14000CAF7400488E0E001054
61089+:105B3000AF6E004C8E0D0010AF6D00848E0A001405
61090+:105B4000AF6A00508E0C0018AF6C00548E04001C1D
61091+:105B5000AF64005893630000306B00FF116501D8FB
61092+:105B6000000000008F7400488F6900400289702394
61093+:105B700005C000042404008C1620FFDE240200036C
61094+:105B8000240400823C05080024A55A980E000287D0
61095+:105B9000000000008F90001C000010210A0003622A
61096+:105BA000AF820028240F000514AFFFCC240520008D
61097+:105BB0003C0708008CE75A98AF4700208E06000487
61098+:105BC000AF66005C9208000824100008A36800215A
61099+:105BD0008F9F001C93F90009A37900208F86001C79
61100+:105BE00090D8000A330400FF10900011000000005C
61101+:105BF0002885000914A0006924020002240A00205C
61102+:105C0000108A000B34058000288D002115A00008A3
61103+:105C100024054000240E0040108E00053C050001C4
61104+:105C200024140080109400023C050002240540006A
61105+:105C30008F7800743C19FF00031980240205782531
61106+:105C4000AF6F007490C4000BA36400818F84001CAC
61107+:105C50009489000C11200192000000009490000C27
61108+:105C60002406FFBF24050004A770003C908F000E9F
61109+:105C7000A36F003E8F84001C9089000FA369003F32
61110+:105C80008F8B001C8D6E00108F54007401D468231C
61111+:105C9000AF6D00608D6A0014AF6A0064956C0018E7
61112+:105CA000A76C00689563001AA763006A8D62001CE8
61113+:105CB000AF62006C9167000EA367003E9368003EE0
61114+:105CC0000106F8241220014BA37F003E8F90001C98
61115+:105CD0000A000362AF8500282407002214A7FF7F73
61116+:105CE000240300073C0B08008D6B5A981220000C0F
61117+:105CF000AF4B00200A000362AF830028240C00335E
61118+:105D000010AC0014240A00283C05080024A55A9869
61119+:105D10000E00023C240400810A0003EB8F90001C5B
61120+:105D20003C04080024845A980E00028D00000000F4
61121+:105D30009363000024110050306200FF10510135C0
61122+:105D4000000000008F90001C000018210A00036270
61123+:105D5000AF8300283C0D08008DAD5A9824040081C3
61124+:105D6000AF4D00203C05080024A55A980E00023CC7
61125+:105D7000A36A00348F90001C240200090A00036209
61126+:105D8000AF82002802B288213225FFFF0E000236C2
61127+:105D9000240400840A0003628F90001C1082FFA478
61128+:105DA00024050400288B000311600170240C0004FA
61129+:105DB000240300015483FF9E240540000A00043B95
61130+:105DC000240501003C04080024845A988F62004C8A
61131+:105DD0000E00028D8F6300508F90001C0000202168
61132+:105DE0000A000362AF8400288E1000042404008A95
61133+:105DF000AF50002093790005333800021700015F8F
61134+:105E0000020028219368002302002821311F00206E
61135+:105E100017E0015A2404008D9367003F2406001206
61136+:105E200030E200FF10460155240400810E000256A6
61137+:105E30000200202193630023240500040200202196
61138+:105E4000346B0042A36B00230E00025FA365007D4C
61139+:105E50008F4401780480FFFE240A0002AF50014005
61140+:105E6000A34A01448F90001C3C0C1000AF4C0178F9
61141+:105E70000A0003EC0011102B8E1000042404008A89
61142+:105E8000AF500020936E000531CD000215A0001622
61143+:105E900002002821936F003F2414000402002821EF
61144+:105EA00031E900FF11340010240400810E00025675
61145+:105EB000020020219362002324080012241FFFFE09
61146+:105EC00034460020A3660023A368003F93790005B1
61147+:105ED00002002021033FC0240E00025FA3780005CA
61148+:105EE00002002821000020210E00033400000000E1
61149+:105EF0000A0003EB8F90001C8E1000043C03000886
61150+:105F00000343A021AF500020928B000024050050D5
61151+:105F1000316400FF10850161240700880200202100
61152+:105F2000000028210E00022A2406000E928D000097
61153+:105F3000240EFF800200282101AE8025A2900000DF
61154+:105F4000240400040E000C5C240600300A0003EB5D
61155+:105F50008F90001C8E0800043C14080026945A9868
61156+:105F60003C010800AC285A98AF480020921F00035B
61157+:105F700033F9000413200002240200122402000658
61158+:105F8000A362003F920B001B2404FFC03165003F59
61159+:105F900000A43825A367003E9206000330C200012A
61160+:105FA00014400132000000008E020008AE8200089A
61161+:105FB0003C0208008C425AA010400131000249C244
61162+:105FC000A76900088E14000C240C0001240300149F
61163+:105FD000AF74002C8E0E0010AF6E0030960D0016C0
61164+:105FE000A76D0038960A0014A76A003AAF6C000C3F
61165+:105FF000A76C0010A76C0012A76C0014A76C001609
61166+:1060000012200136A3630034920F000331F0000226
61167+:106010002E1100018F90001C262200080A00036246
61168+:10602000AF8200288E0400043C0E0008034E30218D
61169+:10603000AF4400208E05000890CD0000240C0050D5
61170+:1060400031AA00FF114C00862407008824060009AD
61171+:106050000E00022A000000000A0003EB8F90001CD3
61172+:106060008E04001C0E00024100000000104000F4ED
61173+:10607000004050218F89001C240700890140202105
61174+:106080008D25001C240600010E00022A00000000DD
61175+:106090000A0003EB8F90001C960D00023C140800D0
61176+:1060A00026945A9831AA0004514000B83C10600070
61177+:1060B0008E0E001C3C010800AC2E5A98AF4E0020FA
61178+:1060C000920700102408001430E200FF144800D6A4
61179+:1060D00000000000960B00023163000114600165AE
61180+:1060E000000000008E020004AE8200083C1408008C
61181+:1060F0008E945AA01280015B000000008F7400741F
61182+:106100003C0380002404000102835825AF6B007417
61183+:10611000A3600005AF64000C3C0708008CE75AA0A0
61184+:106120008F86001CA7640010000711C2A76400122C
61185+:10613000A7640014A7640016A76200088CC80008B2
61186+:1061400024040002AF68002C8CC5000CAF65003041
61187+:1061500090DF0010A37F00348F99001C9330001152
61188+:10616000A37000358F98001C930F0012A36F0036A8
61189+:106170008F89001C912E0013A36E00378F90001C96
61190+:10618000960D0014A76D0038960A0016A76A003A0B
61191+:106190008E0C0018AF6C00245620FDCCAF84002874
61192+:1061A0003C05080024A55A980E0002640000202136
61193+:1061B0008F90001C0A0004A7000020218E1000040C
61194+:1061C00024070081AF500020936900233134001070
61195+:1061D000128000170000000002002021000028218A
61196+:1061E0002406001F0E00022A000000000A0003EB34
61197+:1061F0008F90001C3C05080024A55A980E000287C9
61198+:10620000240400828F90001C000028210A000362F1
61199+:10621000AF8500283C0408008C845A980E0014E8CE
61200+:10622000000000008F90001C0A000482000018216A
61201+:106230000E00025602002021937800230200202144
61202+:10624000370F00100E00025FA36F002300003821FB
61203+:1062500002002021000028210A0005A82406001FB2
61204+:10626000920F000C31E90001112000030000000032
61205+:106270009618000EA4D8002C921F000C33F90002CF
61206+:1062800013200005000038218E0200149608001229
61207+:10629000ACC2001CA4C8001A0A0005432406000969
61208+:1062A0003C05080024A55A980E0002872404008BA0
61209+:1062B0008F90001C0011282B0A000362AF85002874
61210+:1062C000AF6000843C0A08008D4A5A983C0D0800D3
61211+:1062D0008DAD0050240CFF803C02000C014D1821B4
61212+:1062E000006C2024AF4400288E070014306B007F20
61213+:1062F000017A282100A2C821AF2700D88E060014F9
61214+:10630000AF9900D0AF2600DC8E080010251FFFFEDD
61215+:106310000A000408AF3F01083C0508008CA55A9804
61216+:106320003C1908008F39005024CCFFFE00B9C02171
61217+:1063300003047824AF4F00283C1408008E945A9828
61218+:106340003C0908008D2900500289702131CD007F61
61219+:1063500001BA502101478021AE0600D8AF9000D08D
61220+:10636000AE0000DC0A0003B1AE0C0108548CFE3014
61221+:10637000240540000A00043B240510000E00032EF3
61222+:10638000000000000A0003EB8F90001C8E0F442CCD
61223+:106390003C186C62370979703C010800AC205A98AF
61224+:1063A00015E9000824050140979F00349786002CCA
61225+:1063B0000280282103E6C82B132000112404009238
61226+:1063C000240501400E000C7A240400023C01080060
61227+:1063D000AC225A98AF4200203C0508008CA55A9880
61228+:1063E00010A00005240400830E00084500000000F2
61229+:1063F00010400009240400833C05080024A55A9895
61230+:106400000E000264000000008F90001C0011202B81
61231+:106410000A000362AF8400280E0008490000000053
61232+:106420000A00055F8F90001C0E00084D0000000060
61233+:106430003C05080024A55A980A00062F2404008B66
61234+:10644000240400040E000C7A240500301440002AB5
61235+:10645000004050218F89001C240700830140202127
61236+:106460008D25001C0A000551240600018E04000839
61237+:106470000E000241000000000A00051BAE82000869
61238+:106480003C05080024A55A980E00023C240400870D
61239+:106490008F90001C0A0005360011102B8F830038E6
61240+:1064A0008F8600301066FE9D000038213C070800F2
61241+:1064B00024E75A1C000320C0008728218CAC000070
61242+:1064C00011900061246A00013143000F5466FFFA05
61243+:1064D000000320C00A0004F6000038213C05080033
61244+:1064E00024A55A980E000287240400828F90001C75
61245+:1064F0000A000536000010213C0B0008034B202148
61246+:106500002403005024070001AF420020A0830000B4
61247+:10651000A08700018F82001C90480004A08800180A
61248+:106520008F85001C90A60005A08600198F9F001C77
61249+:1065300093F90006A099001A8F90001C921800078A
61250+:10654000A098001B8F94001C928F0008A08F001C45
61251+:106550008F89001C912E0009A08E001D8F8D001CBC
61252+:1065600091AC000AA08C001E8F8B001C3C0C080014
61253+:10657000258C5A1C9163000B3C0B0800256B5A18A4
61254+:10658000A083001F8F87001C90E8000CA0880020CB
61255+:106590008F82001C9045000D24024646A0850021F4
61256+:1065A0008F86001C90DF000EA09F00228F99001C98
61257+:1065B0009330000FA09000238F98001C93140010BC
61258+:1065C000A09400248F8F001C91E90011A089002560
61259+:1065D0008F89001C8F8E00308F900038952D00140D
61260+:1065E000000E18C025C80001A48D002895270016AC
61261+:1065F000006C3021006BC821A487002A9525001863
61262+:106600003108000FA485002CA482002E8D3F001CB1
61263+:10661000ACCA0000AF88003011100006AF3F000088
61264+:10662000000038218D25001C014020210A00055161
61265+:1066300024060001250C00013184000F00003821E0
61266+:106640000A0006B8AF8400383C07080024E75A184F
61267+:106650000087302100003821ACA000000A0004F6B9
61268+:10666000ACC000003C05080024A55A980A00062F7B
61269+:10667000240400878E0400040E0002410000000084
61270+:106680000A00056AAE8200083084FFFF30C600FFB2
61271+:106690008F4201B80440FFFE00064400010430258B
61272+:1066A0003C07200000C720253C031000AF400180BC
61273+:1066B000AF450184AF44018803E00008AF4301B84F
61274+:1066C00027BDFFE8AFB00010AFBF00143C0760006B
61275+:1066D000240600021080000600A080210010102B6C
61276+:1066E0008FBF00148FB0001003E0000827BD001812
61277+:1066F0003C09600EAD2000348CE5201C8F82001C0C
61278+:106700002408FFFC00A81824ACE3201C0E0006D1CE
61279+:106710008C45000C0010102B8FBF00148FB00010A0
61280+:1067200003E0000827BD00183C02600E344701005A
61281+:1067300024090018274A040000000000000000009F
61282+:10674000000000003C06005034C30200AF44003893
61283+:10675000AF45003CAF430030014018218F4B000093
61284+:10676000316800201100FFFD2406007F2408FFFF90
61285+:106770008C6C000024C6FFFF24630004ACEC000016
61286+:1067800014C8FFFB24E70004000000000000000024
61287+:10679000000000003C0F0020AF4F00300000000060
61288+:1067A00024AD020001A5702B2529FFFF008E2021BA
61289+:1067B0001520FFE101A0282103E0000800000000EF
61290+:1067C00027BDFFE0AFB10014AFBF0018AFB000109D
61291+:1067D0003C05600E8CA20034008088211440000625
61292+:1067E0003C0460008C87201C2408FFFC00E8302457
61293+:1067F00034C30001AC83201C8F8B001C24090001D2
61294+:10680000ACA90034956900028D6500148D70000CF0
61295+:106810002D2400818D6700048D660008108000071C
61296+:106820008D6A00102D2C00041580000E30CE00075C
61297+:10683000312D000311A0000B000000002404008B88
61298+:10684000020028210E0006D1240600030011102B9F
61299+:106850008FBF00188FB100148FB0001003E0000844
61300+:1068600027BD002015C0FFF62404008B3C03002048
61301+:10687000AF4300300000000024020001AF8200148A
61302+:106880000000000000000000000000003C1F01505C
61303+:10689000013FC825253800033C0F600EAF47003884
61304+:1068A00000181882AF46003C35E8003CAF59003074
61305+:1068B000274704008F4400003086002010C0FFFDF1
61306+:1068C00000000000106000082466FFFF2403FFFFA3
61307+:1068D0008CEB000024C6FFFF24E70004AD0B000092
61308+:1068E00014C3FFFB250800043C08600EAD09003806
61309+:1068F0000000000000000000000000003C07002035
61310+:10690000AF470030000000000E0006F901402021D2
61311+:1069100002002821000020210E0006D124060003D9
61312+:106920000011102B8FBF00188FB100148FB0001012
61313+:1069300003E0000827BD002027BDFFE0AFB200182C
61314+:106940003092FFFFAFB10014AFBF001CAFB000101A
61315+:106950001640000D000088210A0007AA022010211D
61316+:1069600024050001508500278CE5000C0000000D77
61317+:10697000262300013071FFFF24E200200232382B71
61318+:1069800010E00019AF82001C8F8200141440001622
61319+:106990008F87001C3C0670003C0320008CE5000043
61320+:1069A00000A62024148300108F84003C00054402BC
61321+:1069B0003C09800000A980241480FFE9310600FF13
61322+:1069C0002CCA00095140FFEB262300010006688015
61323+:1069D0003C0E080025CE579801AE60218D8B00003B
61324+:1069E0000160000800000000022010218FBF001C81
61325+:1069F0008FB200188FB100148FB0001003E00008B0
61326+:106A000027BD00200E0006D1240400841600FFD804
61327+:106A10008F87001C0A00078BAF80003C90EF0002BC
61328+:106A200000002021240600090E0006D1000F2E00D0
61329+:106A30008F87001C0010102B0A00078BAF82003CD0
61330+:106A4000020028210E0006DF240400018F87001CAD
61331+:106A50000A00078BAF82003C020028210E0006DFEF
61332+:106A6000000020210A0007C38F87001C0E00071FAB
61333+:106A7000020020210A0007C38F87001C30B0FFFFEF
61334+:106A8000001019C08F5801B80700FFFE3C1F2004FA
61335+:106A90003C191000AF430180AF400184AF5F018813
61336+:106AA000AF5901B80A00078C262300013082FFFF8E
61337+:106AB00014400003000018210004240224030010E5
61338+:106AC000308500FF14A000053087000F2466000801
61339+:106AD0000004220230C300FF3087000F14E00005DD
61340+:106AE000308900032468000400042102310300FF00
61341+:106AF0003089000315200005388B0001246A00024C
61342+:106B000000042082314300FF388B00013164000112
61343+:106B100010800002246C0001318300FF03E00008B4
61344+:106B200000601021308BFFFF000B394230E600FF80
61345+:106B30003C09080025295998000640800109602178
61346+:106B40008D8700003164001F240A0001008A1804A8
61347+:106B500030A500FF00E3202514A000020003102749
61348+:106B600000E22024240F000100CF700401096821F5
61349+:106B7000000E282714800005ADA400008F86000CAD
61350+:106B800000A6102403E00008AF82000C8F88000CE0
61351+:106B900001C8102503E00008AF82000C3C06001F6E
61352+:106BA0003C0360003084FFFF34C5FF8024020020D6
61353+:106BB000AC602008AC60200CAC602010AC652014E8
61354+:106BC000AC642018AC62200000000000000000004F
61355+:106BD00003E000080000000027BDFFE82402FFFFDB
61356+:106BE000AFBF0010AF82000C000020213C0608005F
61357+:106BF00024C659982405FFFF248900010004408021
61358+:106C00003124FFFF010618212C87002014E0FFFA31
61359+:106C1000AC6500000E0008160000202124020001CF
61360+:106C20003C04600024050020AC822018AC852000C4
61361+:106C3000000000000000000000000000244A0001E5
61362+:106C40003142FFFF2C46040014C0FFF78FBF001035
61363+:106C500003E0000827BD00188F8300082C620400A1
61364+:106C600003E00008384200018F830008246200011D
61365+:106C700003E00008AF8200088F8300082462FFFF52
61366+:106C800003E00008AF82000827BDFFE0AFB10014A9
61367+:106C9000AFBF0018AFB000108F6B00303C06600033
61368+:106CA00000808821ACCB20088F6A002C3C02800039
61369+:106CB00024030008ACCA200C9769003A9768003892
61370+:106CC00000092C003107FFFF00A72025ACC42010CD
61371+:106CD000ACC22014ACC32000000000000000000083
61372+:106CE000000000003C0360008C6D200031AC000807
61373+:106CF0001580FFF9000000008C6E201405C00020F4
61374+:106D0000000000000E0007DA8F84000C00024080B3
61375+:106D10003C09080025295998010938218CE4000014
61376+:106D20000E0007DA00028140020220213090FFFFAE
61377+:106D3000020020210E0007F8000028213C0C8000F2
61378+:106D4000022C58253210FFFF3C116000240A00205D
61379+:106D5000AE2B2014AE302018AE2A20000000000018
61380+:106D60000000000000000000020010218FBF00188A
61381+:106D70008FB100148FB0001003E0000827BD002081
61382+:106D80008C6620143C02001F3443FF803C1FFFE848
61383+:106D900000C3C02437F9080003198021001079C20C
61384+:106DA0003C0C8000022C582531F0FFFF3C116000A4
61385+:106DB000240A0020AE2B2014AE302018AE2A20006A
61386+:106DC0000000000000000000000000000200102190
61387+:106DD0008FBF00188FB100148FB0001003E00008BF
61388+:106DE00027BD002027BDFFE8AFB000103402FFFF31
61389+:106DF0003090FFFFAFBF00141202000602002021F6
61390+:106E00000E00081600000000020020210E0007F806
61391+:106E1000240500018F8400088FBF00148FB000107C
61392+:106E20002483FFFF27BD001803E00008AF8300089C
61393+:106E3000000439C230E6003F00043B42000718401E
61394+:106E4000240210002CC4002024C8FFE0AF42002C14
61395+:106E5000246300011480000330A900FF00071840DC
61396+:106E6000310600FF0003608024080001019A5821C8
61397+:106E70003C0A000E00C82804016A382111200005D0
61398+:106E8000000530278CE900000125302503E00008CB
61399+:106E9000ACE600008CEE000001C6682403E00008A8
61400+:106EA000ACED000027BDFFE8AFBF0014AFB000108D
61401+:106EB0003C0460008C8508083403F00030A2F00028
61402+:106EC00050430006240200018C8708083404E000C7
61403+:106ED00030E6F00010C4001E24020002AF82004021
61404+:106EE0003C1060003C0A0200AE0A0814240910009D
61405+:106EF0003C08000E8E03440003482021AF49002CBB
61406+:106F0000240501200E000CC0000030218F830040BA
61407+:106F1000106000043C021691240B0001106B000E5F
61408+:106F20003C023D2C344F0090AE0F44088FBF00143C
61409+:106F30008FB000103C0C6000240E10003C0D0200CD
61410+:106F400027BD0018AD8E442003E00008AD8D081069
61411+:106F50000A0008E7AF8000403C0218DA344F009086
61412+:106F6000AE0F44088FBF00148FB000103C0C6000BF
61413+:106F7000240E10003C0D020027BD0018AD8E4420E9
61414+:106F800003E00008AD8D08100A0008BB24050001CD
61415+:106F90000A0008BB000028213C08080025085DA461
61416+:106FA0002404FFFF010018212402001E2442FFFFD9
61417+:106FB000AC6400000441FFFD246300043C070800AA
61418+:106FC00024E75E208CE5FFFC2404001C240600015D
61419+:106FD000308A001F0146480424840001000910275C
61420+:106FE0002C8300201460FFFA00A22824ACE5FFFCEB
61421+:106FF0003C05666634A4616E3C06080024C65EE06B
61422+:10700000AF840058AF88009C2404FFFF00C0182103
61423+:107010002402001F2442FFFFAC6400000441FFFD76
61424+:10702000246300043C0766663C05080024A55EA0B6
61425+:10703000AF86004834E6616EAF8600982404FFFFF7
61426+:1070400000A018212402000F2442FFFFAC640000BE
61427+:107050000441FFFD246300043C0B66663C06080007
61428+:1070600024C65E203568616EAF8500A4AF880070CD
61429+:107070002404FFFF00C018212402001F2442FFFF48
61430+:10708000AC6400000441FFFD246300043C0D66660F
61431+:107090003C0A0800254A5F6035AC616EAF860090FF
61432+:1070A000AF8C005C2404FFFF014018212402000380
61433+:1070B0002442FFFFAC6400000441FFFD2463000490
61434+:1070C0003C09080025295F708D27FFFC2404000679
61435+:1070D000240500013099001F0325C0042484000109
61436+:1070E000001878272C8E002015C0FFFA00EF3824F6
61437+:1070F000AD27FFFC3C09666624030400240403DC7E
61438+:1071000024050200240600663522616E3C08080052
61439+:1071100025085AA4AF820074AF830044AF83006C8B
61440+:10712000AF830050AF830084AF8A008CAF840064CB
61441+:10713000AF85004CAF860054AF840078AF85006007
61442+:10714000AF86008001001821240200022442FFFFC4
61443+:10715000AC6000000441FFFD24630004240400032C
61444+:107160002403000C3C0A0800254A5AB0AF8A006884
61445+:107170000A00098E2405FFFF000418802484000102
61446+:10718000006858212C8700C014E0FFFBAD650000AB
61447+:107190003C0E666635CD616E240C17A024081800DD
61448+:1071A000AF8D0088AF8C009403E00008AF88007CAE
61449+:1071B0002484007F000421C200004021000030210F
61450+:1071C00000003821000028210A0009A5AF8400A092
61451+:1071D0001060000624E7000100C4302124A500014E
61452+:1071E0002CC20BF51440FFFA2CA300663C090800E2
61453+:1071F00025295F6001201821240200032442FFFF9B
61454+:10720000AC6000000441FFFD2463000410E0001A9C
61455+:1072100024E3FFFF0003294210A0000A0000202100
61456+:107220002406FFFF3C03080024635F602484000100
61457+:107230000085502BAC660000250800011540FFFBBF
61458+:107240002463000430E2001F10400008000868803A
61459+:10725000240C0001004C38040008588001692821E2
61460+:1072600024E6FFFF03E00008ACA6000001A94021CE
61461+:107270002409FFFFAD09000003E000080000000042
61462+:10728000AF4400283C04000C034420210005288260
61463+:107290000A000CC000003021000421803C03600083
61464+:1072A000AC6410080000000000052980AC65100CDB
61465+:1072B0000000000003E000088C62100C27BDFFE80E
61466+:1072C0000080282124040038AFBF00140E0009D527
61467+:1072D000AFB0001024040E00AF4400283C10000C96
61468+:1072E00003502021240500100E000CC000003021A6
61469+:1072F00003501021AC400000AC40000424040038CE
61470+:107300008FBF00148FB0001024053FFF27BD001869
61471+:107310000A0009D58C430000000421803C03600072
61472+:10732000AC641008000000008C62100C03E0000840
61473+:107330000002118227BDFFC8AFB400208F940068FF
61474+:10734000AFBE0030AFB7002CAFB600280000B821A8
61475+:107350000080B021241E00C0AFBF0034AFB50024B0
61476+:10736000AFB3001CAFB20018AFB10014AFB0001043
61477+:107370000A000A12AFA5003C504000018F9400683B
61478+:1073800027DEFFFF13C00028269400048E92000021
61479+:107390003C03080024635DA01240FFF70283102B1A
61480+:1073A0003C04080024845AA4028410230002A8C0CC
61481+:1073B000000098210A000A212411000100118840D0
61482+:1073C000122000260000000002B380210251282470
61483+:1073D0000200202110A0FFF9267300010E0009DE33
61484+:1073E000000000000016684032EC000101AC2021D2
61485+:1073F0000E0009D5020028218F89009426F700018C
61486+:107400008FA6003C3AEB0001316A00012528FFFFFE
61487+:107410000011382702CAB021AF88009416E6FFE7B2
61488+:1074200002479024AE92000002E010218FBF00348A
61489+:107430008FBE00308FB7002C8FB600288FB5002488
61490+:107440008FB400208FB3001C8FB200188FB10014CE
61491+:107450008FB0001003E0000827BD00383C0E080084
61492+:1074600025CE5DA0028E102B0A000A0DAE92000000
61493+:1074700027BDFFD8AFB10014AFB00010AFBF0020E0
61494+:10748000AFB3001CAFB2001800A0882110A0001FED
61495+:10749000000480403C13080026735AA40A000A5ACC
61496+:1074A0002412000112200019261000010E0009F517
61497+:1074B00002002021000231422444FFA0000618806F
61498+:1074C0003045001F2C8217A1007318212631FFFFC1
61499+:1074D0001040FFF400B230048C690000020020214B
61500+:1074E00024053FFF012640241500FFEE0126382524
61501+:1074F0000E0009D5AC6700008F8A009426100001A9
61502+:10750000254700011620FFE9AF8700948FBF0020B8
61503+:107510008FB3001C8FB200188FB100148FB0001011
61504+:1075200003E0000827BD00288F85009C00805821BB
61505+:107530000000402100004821240A001F3C0C0800E4
61506+:10754000258C5E1C3C0D080025AD5DA48CA60000BA
61507+:1075500050C000140000402100AD1023000238C0CC
61508+:10756000240300010A000A930000202115000003F3
61509+:1075700000E410212448202400004821252900018E
61510+:10758000512B00132506DFDC106000062484000167
61511+:1075900000C3702415C0FFF5000318400A000A91CB
61512+:1075A0000000402110AC002624A300040060282124
61513+:1075B000254AFFFF1540FFE5AF85009C512B0004D5
61514+:1075C0002506DFDC0000402103E000080100102157
61515+:1075D0000006614230C5001F000C50803C070800C7
61516+:1075E00024E75DA424040001014730211120000F8D
61517+:1075F00000A420043C05080024A55E20148000059A
61518+:107600002529FFFF24C6000410C50011000000005A
61519+:10761000240400018CCF00000004C0270004204097
61520+:1076200001F868241520FFF5ACCD00008F99007893
61521+:1076300001001021032B482303E00008AF890078E4
61522+:107640003C05080024A55DA40A000A9B0000402117
61523+:107650003C06080024C65DA40A000AB42404000104
61524+:10766000308800FF240200021102000A24030003F4
61525+:107670001103005C8F8900A4240400041104005F3E
61526+:1076800024050005110500670000182103E000082B
61527+:10769000006010218F8900483C0C0800258C5EE0BA
61528+:1076A0003C04080024845F60240300201060000F65
61529+:1076B00000005821240D0002240E00033C0F080096
61530+:1076C00025EF5EE08D27000014E0000B30F9FFFF8E
61531+:1076D000252900040124C02B53000001018048210A
61532+:1076E0002463FFFF5460FFF88D270000016018211C
61533+:1076F00003E0000800601021132000323C0500FF69
61534+:1077000030E200FF004030211040004200005021D4
61535+:1077100024050001000020210005C84000A6C02467
61536+:1077200017000003332500FF14A0FFFB2484000191
61537+:10773000012CC023001828C000AA6021008C502111
61538+:107740003144001F240C0001008C18040003102792
61539+:1077500000E23024110D0041AD260000110E004C56
61540+:10776000000A1840110D00368F87006C510E00562C
61541+:107770008F8C0060240D0004110D005A8F8E008440
61542+:10778000240E0005150EFFDA01601821240B1430B9
61543+:1077900011400006000018218F8400A0246300011E
61544+:1077A000006A402B1500FFFD016458218F8A00807C
61545+:1077B000AF89008C016018212549FFFF0A000AEB00
61546+:1077C000AF89008000E52024000736021080FFD03A
61547+:1077D000240A001800075402314600FF0A000AF389
61548+:1077E000240A00103C0C0800258C5EA03C04080014
61549+:1077F00024845EE00A000ADA240300103C0C08002E
61550+:10780000258C5E203C04080024845EA00A000AD96E
61551+:107810008F89009000071A02306600FF0A000AF301
61552+:10782000240A00088F89008C3C0C0800258C5F60BE
61553+:107830003C04080024845F700A000ADA2403000470
61554+:10784000000A4080250B003024E6FFFF016018216C
61555+:10785000AF8900480A000AEBAF86006C000AC982B3
61556+:10786000001978803C07080024E75EA001E720218A
61557+:10787000000A18428C8F00003079001F032C380456
61558+:107880000007C02701F860240A000B08AC8C000038
61559+:10789000000331420006288000AF28213062001F1B
61560+:1078A0008CB8000024630001004CC804000321428E
61561+:1078B000001938270004108003073024004F2021CE
61562+:1078C0000A000B4CACA60000000A68C025AB0032D1
61563+:1078D000258AFFFF01601821AF8900A40A000AEB86
61564+:1078E000AF8A0060254B1030AF89009001601821ED
61565+:1078F00025C9FFFF0A000AEBAF8900843086000724
61566+:107900002CC2000610400014000000000006408059
61567+:107910003C030800246357BC010338218CE40000B9
61568+:1079200000800008000000002409000310A9000ED8
61569+:1079300000000000240A000510AA000B000000004F
61570+:10794000240B000110AB0008000000008F8C00A089
61571+:1079500010AC00050000000003E00008000010214A
61572+:107960000A000A7900A020210A000AC700C02021CD
61573+:1079700027BDFFE8308400FF240300021083000BC2
61574+:10798000AFBF0010240600031086003A240800044C
61575+:1079900010880068240E0005108E007F2CAF143074
61576+:1079A0008FBF001003E0000827BD00182CA2003094
61577+:1079B0001440FFFC8FBF001024A5FFD0000531C28A
61578+:1079C000000668803C07080024E75EE001A730213C
61579+:1079D0008CC900000005288230AC001F240B000178
61580+:1079E000018B50048F840048012A4025ACC8000058
61581+:1079F0008C83000050600001AF8600488F98006CB7
61582+:107A000030AE000124A6FFFF270F000115C00002C1
61583+:107A1000AF8F006C24A600010006414200082080C0
61584+:107A2000008718218C79000030C2001F2406000155
61585+:107A30000046F804033F382410E0FFDA8FBF00103F
61586+:107A40000005C182001870803C0F080025EF5EA081
61587+:107A500001CF48218D2B00000005684231A5001F91
61588+:107A600000A66004016C502527BD001803E0000843
61589+:107A7000AD2A00002CA7003014E0FFCA8FBF001011
61590+:107A800030B900071723FFC724A8FFCE00086A02F9
61591+:107A9000000D60803C0B0800256B5EA0018B30213F
61592+:107AA0008CC40000000828C230AA001F240800016E
61593+:107AB000014848048F8200A400891825ACC3000047
61594+:107AC0008C5F000053E00001AF8600A40005704009
61595+:107AD000000E7942000F28803C04080024845EE0F8
61596+:107AE00000A418218C6B000025DF000131CD001FA0
61597+:107AF000001F514201A86004016C4825000A108053
61598+:107B0000AC690000004428218CA600008F9800601A
61599+:107B100033F9001F8FBF00100328380400C77825F1
61600+:107B2000270E000127BD0018ACAF000003E00008DD
61601+:107B3000AF8E006024A5EFD02CB804001300FF998D
61602+:107B40008FBF001000053142000658803C0A080033
61603+:107B5000254A5E20016A30218CC4000030A3001F3A
61604+:107B600024090001006910048F9900900082F82513
61605+:107B7000ACDF00008F27000050E00001AF860090CE
61606+:107B80008F8D00848FBF001027BD001825AC000129
61607+:107B900003E00008AF8C008415E0FF828FBF001067
61608+:107BA0008F8600A0000610400046F821001F21002B
61609+:107BB00003E4C8210019384024F8143000B8402BE1
61610+:107BC0001100FF788FBF001024A4EBD00E00021329
61611+:107BD00000C0282100027942000F70803C0D08008F
61612+:107BE00025AD5F6001CD20218C8B0000304C001F43
61613+:107BF00024060001018618048F89008C016350253A
61614+:107C0000AC8A00008D25000050A00001AF84008CDC
61615+:107C10008F9800808FBF001027BD00182708000133
61616+:107C200003E00008AF88008030A5000724030003AC
61617+:107C300010A3001028A2000414400008240700022A
61618+:107C40002403000410A300152408000510A8000F49
61619+:107C50008F8500A003E000080000000014A7FFFDCE
61620+:107C60000080282114C3FFFB240400020A000B8BB0
61621+:107C700000000000240900050080282110C9FFFB36
61622+:107C80002404000303E000080000000014C5FFF115
61623+:107C9000008028210A000B8B24040005240A00011F
61624+:107CA0000080282110CAFFF12404000403E000082A
61625+:107CB0000000000027BDFFE0AFB00010000581C24A
61626+:107CC0002603FFD024C5003F2C6223D024C6007FAA
61627+:107CD000AFB20018AFB10014AFBF001C309100FF6D
61628+:107CE000000691C2000529820200202110400008F0
61629+:107CF0002403FFFF0E000A4B0000000002002021B9
61630+:107D0000022028210E000C390240302100001821E9
61631+:107D10008FBF001C8FB200188FB100148FB00010FD
61632+:107D20000060102103E0000827BD002027BDFFD818
61633+:107D300024A2007FAFB3001CAFB20018000299C2AA
61634+:107D4000309200FF24A3003F02402021026028213E
61635+:107D5000AFB10014AFB00010AFBF00200E000B6E2B
61636+:107D60000003898200408021004020210220282138
61637+:107D700014400009000018218FBF00208FB3001CA1
61638+:107D80008FB200188FB100148FB000100060102166
61639+:107D900003E0000827BD00280E0009FC00000000D9
61640+:107DA00000402821020020211051FFF3001019C0CB
61641+:107DB0000E000A4B00000000020020210240282192
61642+:107DC0000E000C39026030218FBF00208FB3001CE1
61643+:107DD0008FB200188FB100148FB00010000018216E
61644+:107DE0000060102103E0000827BD00283084FFFF59
61645+:107DF00030A5FFFF1080000700001821308200012D
61646+:107E00001040000200042042006518211480FFFB8E
61647+:107E10000005284003E000080060102110C00007A2
61648+:107E2000000000008CA2000024C6FFFF24A500046F
61649+:107E3000AC82000014C0FFFB2484000403E00008AF
61650+:107E40000000000010A0000824A3FFFFAC86000083
61651+:107E500000000000000000002402FFFF2463FFFF79
61652+:107E60001462FFFA2484000403E00008000000000C
61653+:107E700030A5FFFF8F4201B80440FFFE3C076015AC
61654+:107E800000A730253C031000AF440180AF400184BF
61655+:107E9000AF46018803E00008AF4301B88F8500D0EA
61656+:107EA0002C864000008018218CA700840087102BAE
61657+:107EB00014400010000000008CA800842D06400033
61658+:107EC00050C0000F240340008CAA0084008A482B75
61659+:107ED000512000018CA3008400035A42000B208033
61660+:107EE0003C05080024A558200085182103E000085F
61661+:107EF0008C62000014C0FFF4000000002403400066
61662+:107F000000035A42000B20803C05080024A558209D
61663+:107F10000085182103E000088C6200008F8300D0E8
61664+:107F2000906600D024C50001A06500D08F8500D0E8
61665+:107F3000906400D090A200D210440017000000000E
61666+:107F4000936C00788F8B00BC318A00FFA16A000C13
61667+:107F500025490001938700C4312200FF3048007F8B
61668+:107F60001107000B00026827A36200788F4E01788A
61669+:107F700005C0FFFE8F9900B0241800023C0F1000CE
61670+:107F8000AF590140A358014403E00008AF4F017806
61671+:107F90000A000D0931A20080A0A000D00A000CFF49
61672+:107FA000000000008F8700D027BDFFC8AFBF0030A2
61673+:107FB000AFB7002CAFB60028AFB50024AFB4002097
61674+:107FC000AFB3001CAFB20018AFB10014AFB00010D7
61675+:107FD00094E300E094E200E2104300D72405FFFFA1
61676+:107FE0003C047FFF3497FFFF2415FF800A000DF04B
61677+:107FF0003C16000E108A00D18FBF00308F9100B068
61678+:108000003C1808008F18005C001230C0001291402C
61679+:108010000311702101D57824AF4F002C94EC00E2BD
61680+:1080200031CD007F01BA5821318A7FFF0176482186
61681+:10803000000A804002091021945300003C08080007
61682+:108040008D0800580246C02132733FFF001319808B
61683+:10805000010320210224282130BF007F03FAC82118
61684+:1080600000B5A024AF54002C0336A0218E87001049
61685+:108070008E8F003003785821256D008800EF702323
61686+:10808000240C0002AE8E0010AF8D00ACA16C0088F5
61687+:10809000976A003C8E8400308F9100AC0E000CD6A5
61688+:1080A0003150FFFF00024B80020940253C02420094
61689+:1080B00001022025AE2400048E8300048F8D00ACC5
61690+:1080C0008E860000240E0008ADA3001CADA600188B
61691+:1080D000ADA0000CADA00010929F000A33F900FF84
61692+:1080E000A5B90014968500083C1F000CA5A5001634
61693+:1080F0009298000A331100FFA5B100209690000865
61694+:1081000024180005A5B00022ADA00024928F000B1A
61695+:108110002410C00031E700FFA5A70002A1AE0001B6
61696+:108120008E8C00308F8B00AC8F8400B0AD6C00085B
61697+:108130003C0A08008D4A005401444821013540247E
61698+:10814000AF4800283C0208008C4200540044302113
61699+:1081500030C3007F007AC821033F282102458821CF
61700+:10816000AF9100BCAF8500C0A23800008F8A00BC70
61701+:108170002403FFBF2418FFDF954F000201F03824CD
61702+:1081800000F37025A54E0002914D000231AC003F76
61703+:10819000358B0040A14B00028F8600BC8F8900D038
61704+:1081A000ACC000048D28007C3C098000ACC80008ED
61705+:1081B00090C4000D3082007FA0C2000D8F8500BCEE
61706+:1081C00090BF000D03E3C824A0B9000D8F9100BC3F
61707+:1081D0009233000D02789024A232000D8E9000346C
61708+:1081E0008F8B00BCAD7000108E87002C8E8F0030FE
61709+:1081F00000EF7023AD6E0014916D001831AC007F5C
61710+:10820000A16C00188F9F00BC8E8A00308FE8001888
61711+:10821000015720240109302400C41025AFE20018C2
61712+:108220009283000AA3E3001C969900088F8500BC86
61713+:108230008F9800D0A4B9001E8E9000308E8400303C
61714+:108240000E0002138F0500848F8500D0000291403C
61715+:108250000002990090AF00BC0253882100403021F9
61716+:1082600031E7000210E0000302118021000290803B
61717+:108270000212802190B900BC3327000410E00002F4
61718+:108280000006F880021F80218E9800308F8B00BC82
61719+:1082900024068000330F0003000F702331CD00034C
61720+:1082A000020D6021AD6C000494A400E294AA00E2E7
61721+:1082B00094B000E231497FFF2522000130537FFF57
61722+:1082C0000206182400734025A4A800E294A400E24A
61723+:1082D0003C1408008E94006030917FFF123400221D
61724+:1082E000000000000E000CF6000000008F8700D098
61725+:1082F0000000282194F300E094F000E21213000F34
61726+:108300008FBF003090E900D090E800D1313200FFFB
61727+:10831000310400FF0244302B14C0FF36264A00010E
61728+:1083200090EE00D2264B000131CD00FF008D602180
61729+:10833000158BFF338F9100B08FBF00308FB7002CAB
61730+:108340008FB600288FB500248FB400208FB3001C97
61731+:108350008FB200188FB100148FB0001000A0102150
61732+:1083600003E0000827BD003894A300E20066402423
61733+:10837000A4A800E290A400E290B900E2309100FFCE
61734+:108380000011A1C20014F827001F39C03332007F4A
61735+:10839000024730250A000DE8A0A600E23084FFFF66
61736+:1083A00030A5FFFFAF440018AF45001C03E00008F4
61737+:1083B0008F42001427BDFFB8AFB000208F9000D0CF
61738+:1083C0003084FFFFAFA40010AFBF0044AFBE004039
61739+:1083D000AFB7003CAFB60038AFB50034AFB4003033
61740+:1083E000AFB3002CAFB20028AFB10024A7A0001893
61741+:1083F000920600D1920500D030C400FF30A300FFE8
61742+:108400000064102B10400122AFA00014920900D08C
61743+:108410008FB50010312800FF0088382324F4FFFFB7
61744+:108420000014882B0015982B02339024524001260B
61745+:108430008FB40014961E0012961F00108FB7001004
61746+:1084400003DFC823001714000019C400000224032E
61747+:108450000018140302E2B02A52C00001004020219B
61748+:108460000284282B10A0000200801821028018210D
61749+:1084700000033C0000071C033064FFFF2C8600094A
61750+:1084800014C000020060B821241700088E0A0008FA
61751+:10849000001769808E09000C31ABFFFF3C0C001007
61752+:1084A000016C402527520400AF4A0038AF9200B853
61753+:1084B000AF49003CAF480030000000000000000061
61754+:1084C00000000000000000000000000000000000AC
61755+:1084D00000000000000000008F4F000031EE00207F
61756+:1084E00011C0FFFD0017982A027110240A000E83A4
61757+:1084F0000000B02155E001019258000131130080C5
61758+:10850000126001CF012020219655001232A5FFFFF5
61759+:108510000E000CCBA7B500188F9000D00291A023BD
61760+:1085200026CD00018F9100B8000DB4000016B403F1
61761+:108530002638004002D7582A0014882B2405000151
61762+:108540000300902101711024AF9800B8AFA500146A
61763+:10855000104001BC8F8900B03C0C08008D8C005489
61764+:10856000240BFF80921E00D001895021014B28244A
61765+:10857000921900D0AF4500288E4700103C08080033
61766+:108580008D0800583C1808008F18005430E33FFF56
61767+:108590000003218001043021012658212402FF809C
61768+:1085A0000162F824920C00D0AF5F002C92480000CA
61769+:1085B00033D100FF333500FF0309982100117140CA
61770+:1085C000001578C0326D007F01CF382101BA282113
61771+:1085D000318300FF3164007F3C0A000C00AA88212F
61772+:1085E0000367F02100033140009A10213108003F59
61773+:1085F0003C1F000E00D1C021005F982127D90088C0
61774+:108600002D150008AF9100C0AF9900ACAF9800BC29
61775+:10861000AF9300B412A0018A00008821240E00014B
61776+:10862000010E4004310D005D11A0FFB2310F0002B8
61777+:108630008E4A00283C0300803C04FFEFAE6A000035
61778+:108640008E450024A260000A3488FFFFAE65000456
61779+:108650009247002C3C1FFF9F37FEFFFFA267000CD4
61780+:108660008E62000C3C180040A267000B00433025CE
61781+:1086700000C8C824033E88240238A825AE75000C23
61782+:108680008E490004AE6000183C0F00FFAE69001474
61783+:108690008E4D002C35EEFFFF8F8B00B001AE6024B5
61784+:1086A000AE6C00108E470008A660000896450012C8
61785+:1086B000AE6700208E42000C30B03FFF00105180AA
61786+:1086C000AE6200248E5E0014014B182130A400011C
61787+:1086D000AE7E00288E590018000331C2000443808A
61788+:1086E000AE79002C8E51001C00C8F821A67F001C1A
61789+:1086F000AE710030965800028E550020A678001EFC
61790+:10870000AE75003492490033313000045600000544
61791+:10871000925000008F8C00D08D8B007CAE6B0030AF
61792+:10872000925000008F8F00BCA1F00000924E0033E9
61793+:1087300031CD000251A00007925E00018F8900BC7C
61794+:108740002418FF80913100000311A825A1350000F5
61795+:10875000925E00018F9900BC2409FFBF240BFFDF4C
61796+:10876000A33E00018F9500BC92B8000D3311007F2D
61797+:10877000A2B1000D8F8E00BC91D0000D02097824AB
61798+:10878000A1CF000D8F8800BC8E6D0014910A000DE2
61799+:108790002DAC0001000C2940014B382400E51825C0
61800+:1087A000A103000D964200128F8800BC8F8700D075
61801+:1087B000A50200028E45000490FF00BC30A4000317
61802+:1087C0000004302330DE000300BE102133F9000224
61803+:1087D00017200002244400342444003090E200BCFE
61804+:1087E00000A2302430DF000417E0000224830004DC
61805+:1087F000008018218F8F00AC24090002AD03000413
61806+:10880000A1E90000924E003F8F8D00ACA1AE0001A7
61807+:108810008F9500AC924C003F8E440004A6AC000241
61808+:10882000976B003C0E000CD63170FFFF00025380A6
61809+:10883000020A38253C05420000E51825AEA30004D5
61810+:108840008F8600AC8E480038ACC800188E440034C7
61811+:10885000ACC4001CACC0000CACC00010A4C0001420
61812+:10886000A4C00016A4C00020A4C00022ACC00024F4
61813+:108870008E6400145080000124040001ACC4000880
61814+:108880000E000CF6241100010A000E768F9000D025
61815+:10889000920F00D2920E00D08FB5001031EB00FF86
61816+:1088A00031CD00FF008D6023016C50212554FFFF66
61817+:1088B0000014882B0015982B023390241640FEDDFF
61818+:1088C000000000008FB400148FBF00448FBE004032
61819+:1088D0003A8200018FB7003C8FB600388FB5003464
61820+:1088E0008FB400308FB3002C8FB200288FB10024DA
61821+:1088F0008FB0002003E0000827BD0048331100209E
61822+:10890000122000EF24150001921E00BC241F00015C
61823+:108910000000A82133D900011320000DAFBF001CB7
61824+:108920008E4400148E0800840088102B144000022E
61825+:10893000008030218E0600848E03006400C3A82BC3
61826+:1089400016A0000200C020218E0400640080A8212F
61827+:108950008E4700148E05006400E5302B14C0000221
61828+:1089600000E020218E0400640095F02313C0000471
61829+:108970008FAC001C240A0002AFAA001C8FAC001CA4
61830+:10898000028C582B156000A8000018218E4F00386B
61831+:108990008E6D000C3C0E0080AE6F00008E4A0034DD
61832+:1089A0003C10FF9F01AE5825AE6A00049246003F7E
61833+:1089B000360CFFFF016C38243C0500203C03FFEF20
61834+:1089C000A266000B00E510253468FFFF8F8700B812
61835+:1089D0000048F8243C04000803E4C825AE79000CE4
61836+:1089E0008CF80014AE60001802BE7821AE78001436
61837+:1089F0008CF10018AE71001C8CE90008AE690024EF
61838+:108A00008CEE000CAE6F002CAE600028AE6E002025
61839+:108A1000A6600038A660003A8CED001401B58023F2
61840+:108A2000021E902312400011AE72001090EA003D29
61841+:108A30008E6500048E640000000A310000A6C82183
61842+:108A4000000010210326402B0082F82103E8C021FA
61843+:108A5000AE790004AE78000090F1003DA271000AEA
61844+:108A60008F8900B895320006A67200088F9800AC76
61845+:108A70002419000202A02021A31900009769003CDC
61846+:108A80008F9200AC0E000CD63131FFFF00027B80CC
61847+:108A90008F8500B8022F68253C0E420001AE80256C
61848+:108AA000AE5000048F8400AC8CAC0038AC8C001845
61849+:108AB0008CAB0034AC8B001CAC80000CAC80001084
61850+:108AC000A4800014A4800016A4800020A4800022AA
61851+:108AD000AC80002490A7003FA487000212A00135BB
61852+:108AE0002403000153C0000290A2003D90A2003E6A
61853+:108AF00024480001A08800018F9F00ACAFF500085A
61854+:108B00008F8300D024070034906600BC30C500027B
61855+:108B100050A00001240700308F9200B88F8A00BC5B
61856+:108B2000906D00BC924B00002412C00032A50003DF
61857+:108B3000A14B00008F8600B88F8800BC240200047F
61858+:108B400090C400010045182330790003A1040001FE
61859+:108B50008F8A00BC8F9F00B800F53821955800021D
61860+:108B600097E9001200F9382103128824312F3FFFC2
61861+:108B7000022F7025A54E00029150000231A800047A
61862+:108B8000320C003F358B0040A14B000212A00002C6
61863+:108B90008F8500BC00E838218F8E00D0ACA7000480
61864+:108BA000240BFFBF8DCD007C2EA400012403FFDF2A
61865+:108BB000ACAD000890B0000D00044140320C007FC5
61866+:108BC000A0AC000D8F8600BC90CA000D014B102494
61867+:108BD000A0C2000D8F8700BC90E5000D00A3F82413
61868+:108BE00003E8C825A0F9000D8F9100B88F8D00BC57
61869+:108BF0008E380020ADB800108E290024ADA90014D5
61870+:108C00008E2F0028ADAF00188E2E002C0E000CF613
61871+:108C1000ADAE001C8FB0001C240C0002120C00EE44
61872+:108C20008F9000D08FA3001C006088211460000288
61873+:108C30000060A8210000A02156A0FE390291A023C7
61874+:108C40000014882B8FA90010960700103C1E0020EE
61875+:108C50000136402302C750213112FFFFA60A00103F
61876+:108C6000AFB20010AF5E0030000000009617001099
61877+:108C7000961300121277008F000000008E05000C82
61878+:108C80008E0B00080016698000AD7021000DC7C36F
61879+:108C900001CDA82B0178782101F56021AE0E000CE2
61880+:108CA000AE0C00088FB300100013B82B02378024DD
61881+:108CB0001200FF048F9000D00A000E3C000000005C
61882+:108CC0008E4D0038A6600008240B0003AE6D000036
61883+:108CD0008E500034A260000A8F9800B8AE70000475
61884+:108CE0003C0500809311003FA26B000C8E6F000CBE
61885+:108CF0003C0EFF9FA271000B01E5102535CCFFFF54
61886+:108D00003C03FFEF8F9200B8004C30243464FFFF27
61887+:108D100000C4F824AE7F000C8E590014964800124F
61888+:108D20008F8A00B0AE7900108E490014AE60001832
61889+:108D3000AE600020AE690014AE6000248E470018BB
61890+:108D400031093FFF0009F180AE6700288E4D000811
61891+:108D500003CA802131180001AE6D00308E4F000C27
61892+:108D60008F8C00AC001089C200185B80022B282178
61893+:108D7000240E0002A665001CA6600036AE6F002C13
61894+:108D8000A18E00009763003C8F8A00AC3C04420037
61895+:108D90003062FFFF00443025AD4600048F9F00B8CD
61896+:108DA000240700012411C0008FF30038240600348A
61897+:108DB000AD5300188FF90034AD59001CAD40000CC4
61898+:108DC000AD400010A5400014A5400016A5400020AD
61899+:108DD000A5400022AD400024A5550002A147000196
61900+:108DE0008F9E00AC8F8800B88F9200BCAFD5000872
61901+:108DF000910D0000A24D00008F9000B88F8B00BC39
61902+:108E000092180001A17800018F8400BC94850002B3
61903+:108E100000B1782401E97025A48E0002908C000234
61904+:108E20003183003FA08300028F8300D08F8400BC79
61905+:108E3000906200BC305300025260000124060030F2
61906+:108E4000AC8600048C6F007C2403FFBF02A0882145
61907+:108E5000AC8F0008908E000D31CC007FA08C000DEF
61908+:108E60008F8600BC90C2000D00432024A0C4000DDA
61909+:108E70008F8900BC913F000D37F90020A139000D0A
61910+:108E80008F8800B88F9300BC8D070020AE6700105C
61911+:108E90008D0A0024AE6A00148D1E0028AE7E0018D4
61912+:108EA0008D12002C0E000CF6AE72001C0A00103D54
61913+:108EB0008F9000D0960E00148E03000431CCFFFF7B
61914+:108EC000000C10C000622021AF44003C8E1F000443
61915+:108ED0008F46003C03E6C8231B20003C0000000036
61916+:108EE0008E0F000025E200013C05001034B500089B
61917+:108EF000AF420038AF550030000000000000000015
61918+:108F00000000000000000000000000000000000061
61919+:108F100000000000000000008F580000330B00200C
61920+:108F20001160FFFD000000008F5304003C0D002085
61921+:108F3000AE1300088F570404AE17000CAF4D00307D
61922+:108F4000000000003C0608008CC600442416000106
61923+:108F500010D600BD00000000961F00123C0508005E
61924+:108F60008CA5004000BFC821A61900129609001464
61925+:108F700025270001A6070014960A00143144FFFFBC
61926+:108F80005486FF498FB30010A60000140E000E1681
61927+:108F900030A5FFFF3C0408008C84002496030012D7
61928+:108FA0000044102300623023A60600120A00105964
61929+:108FB0008FB30010A08300018F8200AC2404000155
61930+:108FC000AC4400080A000FF08F8300D08E0200002E
61931+:108FD0000A0010EA3C0500108F8200C08FA7001C19
61932+:108FE000921800D0920B00D0920E00D0331100FFE7
61933+:108FF000316900FF00117940000928C001E56021B6
61934+:1090000031C300FF036C50210003314000C2C8216E
61935+:10901000255F0088AF9F00ACAF9900BCA1470088D6
61936+:109020009768003C03C020218F9100AC0E000CD645
61937+:109030003110FFFF00026B80020DC0253C0442008E
61938+:109040008F8D00B803045825AE2B00048DA900387D
61939+:109050008F8B00AC0000882100118100AD690018E1
61940+:109060008DAF00343C087FFF3504FFFFAD6F001C5F
61941+:1090700091AC003E8D65001C8D660018000C190037
61942+:10908000000C770200A33821020E102500E3F82B14
61943+:1090900000C2C821033F5021AD67001CAD6A001813
61944+:1090A000AD60000CAD60001091B8003E24050005D5
61945+:1090B00003C45024A578001495A9000403C02021FE
61946+:1090C000A569001691AF003EA56F002095B1000480
61947+:1090D000A5710022AD60002491AE003FA56E000294
61948+:1090E00091B0003E91AC003D01901023244300015B
61949+:1090F000A16300018F8600AC8F9F00BCACDE00082E
61950+:10910000A3E500008F9000BC8F9900B82405FFBF35
61951+:1091100096070002973800120247782433093FFF70
61952+:1091200001E98825A6110002921200022418FFDF2F
61953+:10913000324E003F35CD0040A20D00028F8600BCAC
61954+:109140008F8C00D02412FFFFACC000048D8B007CFC
61955+:109150003C0C8000ACCB000890C2000D3043007F77
61956+:10916000A0C3000D8F8700BC90FF000D03E5C8244D
61957+:10917000A0F9000D8F9100BC9229000D01387824D0
61958+:10918000A22F000D8F9000BCAE120010AE1500147F
61959+:10919000920E00182415FF8002AE6825A20D00185B
61960+:1091A0008F8500BC8F8300B88CAB0018016C102435
61961+:1091B000004A3025ACA600189068003EA0A8001C0C
61962+:1091C0008F9F00B88F8700BC8F9800D097F900045C
61963+:1091D000A4F9001E0E0002138F0500848F8600D0B4
61964+:1091E000000279400002490090D200BC01E98821C8
61965+:1091F000004028213255000212A0000303D1202193
61966+:109200000002A8800095202190CD00BC31B200045E
61967+:109210001240000333DF0003000540800088202156
61968+:10922000240600048F9E00BC00DFC8233327000300
61969+:1092300000875021AFCA00040E000CF6A665003866
61970+:109240000A0010388F9000D0961E00123C080800CB
61971+:109250008D080024011E9021A61200120A00105948
61972+:109260008FB3001027BDFFE03C1808008F18005096
61973+:10927000AFB00010AFBF0018AFB10014AF8400B0A2
61974+:1092800093710074030478212410FF8031EE007F75
61975+:109290003225007F01F0582401DA68213C0C000AD5
61976+:1092A000A38500C401AC2821AF4B002494A9001071
61977+:1092B0009768000690A600620080382124020030E2
61978+:1092C0000109202330C300F0AF8500D010620019DF
61979+:1092D0003090FFFF90AE0062240DFFF0240A005092
61980+:1092E00001AE6024318B00FF116A002F00000000E6
61981+:1092F00016000007241F0C00AF5F00248FB100147C
61982+:109300008FBF00188FB0001003E0000827BD0020B9
61983+:109310000E000E1C02002021241F0C00AF5F002451
61984+:109320008FB100148FBF00188FB0001003E0000849
61985+:1093300027BD002094A200E094A400E290BF011396
61986+:10934000008218263079FFFF33E700C014E00009DF
61987+:109350002F31000116000038000000005620FFE603
61988+:10936000241F0C000E000D18000000000A0011ED73
61989+:10937000241F0C001620FFDE000000000E000D1858
61990+:10938000000000001440FFDC241F0C001600002227
61991+:109390008F8300D0906901133122003FA062011336
61992+:1093A0000A0011ED241F0C0094AF00D48F8600D466
61993+:1093B00000E02821240400050E000C5C31F0FFFFC2
61994+:1093C0001440000524030003979100E600001821D3
61995+:1093D0002625FFFFA78500E68F5801B80700FFFE8E
61996+:1093E0003C196013AF400180241F0C00AF50018472
61997+:1093F000007938253C101000AF4701888FB1001468
61998+:10940000AF5001B8AF5F00248FB000108FBF0018BD
61999+:1094100003E0000827BD00200E000E1C02002021E2
62000+:109420005040FFB5241F0C008F8300D090690113BA
62001+:109430000A0012163122003F0E000E1C02002021ED
62002+:109440001440FFAD241F0C00122000078F8300D0B2
62003+:10945000906801133106003F34C20040A06201133E
62004+:109460000A0011ED241F0C000E000D180000000072
62005+:109470005040FFA1241F0C008F8300D0906801137F
62006+:109480003106003F0A00124634C20040AF9B00C8BC
62007+:1094900003E00008AF8000EC3089FFFF0009404284
62008+:1094A0002D020041000921801440000200095040B3
62009+:1094B00024080040000830C0000811400046582130
62010+:1094C000256701A800E2C821272F007F2418FF800C
62011+:1094D00001F818240064302100CA702125CC00FF57
62012+:1094E000240DFF00018D202425650088240A0088B2
62013+:1094F0003C010800AC2A004C3C010800AC2500509F
62014+:10950000AF8400D43C010800AC2900603C01080095
62015+:10951000AC2800643C010800AC2700543C01080062
62016+:10952000AC2300583C010800AC26005C03E00008B6
62017+:1095300000000000308300FF30C6FFFF30E400FF72
62018+:109540008F4201B80440FFFE00034C00012438257F
62019+:109550003C08600000E820253C031000AF45018076
62020+:10956000AF460184AF44018803E00008AF4301B86F
62021+:109570008F86001C3C096012352700108CCB00043C
62022+:109580003C0C600E35850010316A00062D48000144
62023+:10959000ACE800C48CC40004ACA431808CC20008C8
62024+:1095A00094C30002ACA2318403E00008A78300E466
62025+:1095B0003C0308008C6300508F8400E88F86001CF9
62026+:1095C0002402FF800064C0210302C824AF59002890
62027+:1095D0008CCD00043305007F00BA78213C0E000CCE
62028+:1095E00001EE2821ACAD00588CC80008AF8500D032
62029+:1095F0003C076012ACA8005C8CCC001034E8001072
62030+:10960000ACAC000C8CCB000CACAB000894AA0014E2
62031+:109610003C0208008C42004425490001A4A9001422
62032+:1096200094A400143083FFFF106200178F8400D0D1
62033+:109630003C0A08008D4A0040A4AA00128CCE0018F3
62034+:10964000AC8E00248CCD0014AC8D00208CC700188B
62035+:10965000AC87002C8CCC001424060001AC8C0028B4
62036+:109660008D0B00BC5166001A8D0200B48D0200B84B
62037+:10967000A482003A948F003AA48F003C948800D4CE
62038+:1096800003E000083102FFFF3C0908008D29002497
62039+:10969000A4A000148F8400D0A4A900128CCE0018BE
62040+:1096A000AC8E00248CCD0014AC8D00208CC700182B
62041+:1096B000AC87002C8CCC001424060001AC8C002854
62042+:1096C0008D0B00BC5566FFEA8D0200B88D0200B418
62043+:1096D000A482003A948F003AA48F003C948800D46E
62044+:1096E00003E000083102FFFF8F86001C3C0C0800DD
62045+:1096F0008D8C0050240BFF808CCD00083C03000CA7
62046+:10970000000D51C0018A4021010B4824AF8A00E8B6
62047+:10971000AF49002890C700073105007F00BA10212B
62048+:109720000043282130E4000410800039AF8500D0C8
62049+:1097300090CF000731EE000811C000380000000093
62050+:109740008CD9000C8CC400140324C02B13000030EF
62051+:10975000000000008CC2000CACA200648CCD00188C
62052+:109760002402FFF8ACAD00688CCC0010ACAC0080DB
62053+:109770008CCB000CACAB00848CCA001CACAA007C67
62054+:1097800090A900BC01224024A0A800BC90C30007FF
62055+:109790003067000810E000048F8500D090AF00BC57
62056+:1097A00035EE0001A0AE00BC90D9000733380001AF
62057+:1097B000130000088F8300D08F8700D0240400346A
62058+:1097C00090E800BC35030002A0E300BC8F8300D00A
62059+:1097D000AC6400C090C900073126000210C000052B
62060+:1097E00000000000906A00BC35420004A06200BC8A
62061+:1097F0008F8300D09065011330AD003FA06D011341
62062+:109800008F8C00D0958B00D403E000083162FFFFFD
62063+:109810008CC200140A001305000000000A001306A1
62064+:10982000ACA0006427BDFFD8AFB000108F90001C23
62065+:10983000AFBF0024AFB40020AFB20018AFB1001426
62066+:10984000AFB3001C9613000E3C07600A3C14600680
62067+:109850003264FFFF369300100E00125534F40410EA
62068+:109860008F8400D43C11600E0E00099B363100102D
62069+:10987000920E00153C0708008CE700603C12601255
62070+:1098800031CD000FA38D00F08E0E00048E0D000868
62071+:1098900096080012961F00109619001A9618001EBE
62072+:1098A000960F001C310CFFFF33EBFFFF332AFFFF45
62073+:1098B0003309FFFF31E6FFFF3C010800AC2B0040FD
62074+:1098C0003C010800AC2C00243C010800AC2A0044F8
62075+:1098D000AE293178AE26317C92020015960300162F
62076+:1098E00036520010304400FF3065FFFF3C06080090
62077+:1098F0008CC60064AE243188AE4500B492080014D2
62078+:1099000096190018241F0001011FC004332FFFFF08
62079+:109910003C0508008CA50058AE5800B8AE4F00BCFE
62080+:10992000920C0014AF8E00D8AF8D00DC318B00FF9D
62081+:10993000AE4B00C0920A0015AE670048AE66004C00
62082+:10994000314900FFAE4900C8AE65007C3C03080009
62083+:109950008C6300503C0408008C84004C3C080800D8
62084+:109960008D0800543C0208008C42005C8FBF00242C
62085+:10997000AE6300808FB00010AE8300748FB3001C04
62086+:10998000AE22319CAE4200DCAE2731A0AE2631A41F
62087+:10999000AE24318CAE233190AE283194AE2531986F
62088+:1099A000AE870050AE860054AE8500708FB10014B3
62089+:1099B000AE4700E0AE4600E4AE4400CCAE4300D07B
62090+:1099C000AE4800D4AE4500D88FB400208FB2001846
62091+:1099D00003E0000827BD002827BDFFE0AFB1001459
62092+:1099E000AFBF0018241100010E000845AFB00010F1
62093+:1099F00010510005978400E6978300CC0083102B5C
62094+:109A0000144000088F8500D4240700028FBF00187F
62095+:109A10008FB100148FB0001000E0102103E00008A7
62096+:109A200027BD00200E000C7A24040005AF8200E858
62097+:109A30001040FFF6240700020E0008498F90001C1A
62098+:109A4000979F00E68F9900E88F8D00C827EF0001EF
62099+:109A5000240E0050AF590020A78F00E6A1AE0000F1
62100+:109A60003C0C08008D8C00648F8600C8240A80009E
62101+:109A7000000C5E00ACCB0074A4C0000694C9000AC0
62102+:109A8000241FFF803C0D000C012AC024A4D8000A2A
62103+:109A900090C8000A24182000011F1825A0C3000A3E
62104+:109AA0008F8700C8A0E000788F8500C800003821AB
62105+:109AB000A0A000833C0208008C4200508F8400E884
62106+:109AC0000044782101FFC824AF590028960B0002FA
62107+:109AD00031EE007F01DA6021018D3021A4CB00D46A
62108+:109AE000960A0002AF8600D03C0E000425492401EE
62109+:109AF000A4C900E68E080004ACC800048E03000868
62110+:109B0000ACC30000A4C00010A4C00014A0C000D0CA
62111+:109B10008F8500D02403FFBFA0A000D13C04080023
62112+:109B20008C8400648F8200D0A04400D28E1F000C71
62113+:109B30008F8A00D0978F00E4AD5F001C8E19001053
62114+:109B400024100030AD590018A5400030A551005434
62115+:109B5000A5510056A54F0016AD4E0068AD580080C7
62116+:109B6000AD580084914D006231AC000F358B001070
62117+:109B7000A14B00628F8600D090C900633128007F1E
62118+:109B8000A0C800638F8400D02406FFFF9085006387
62119+:109B900000A31024A08200638F9100D000E0102168
62120+:109BA000923F00BC37F90001A23900BC8F8A00D077
62121+:109BB000938F00F0AD580064AD5000C0914E00D3BB
62122+:109BC000000F690031CC000F018D5825A14B00D347
62123+:109BD0008F8500D08F8900DCACA900E88F8800D881
62124+:109BE0008FBF00188FB100148FB0001027BD002068
62125+:109BF000ACA800ECA4A600D6A4A000E0A4A000E2BB
62126+:109C000003E000080000000027BDFFE0AFB0001037
62127+:109C10008F90001CAFB10014AFBF00188E19000464
62128+:109C20003C1808008F180050240FFF80001989C0CD
62129+:109C30000238702131CD007F01CF602401BA50215C
62130+:109C40003C0B000CAF4C0028014B4021950900D47F
62131+:109C5000950400D68E0700043131FFFFAF8800D095
62132+:109C60000E000913000721C08E0600048F8300C870
62133+:109C7000000629C0AF4500209064003E30820040BD
62134+:109C8000144000068F8400D0341FFFFF948300D659
62135+:109C90003062FFFF145F000400000000948400D6CF
62136+:109CA0000E0008A83084FFFF8E050004022030213A
62137+:109CB0008FBF00188FB100148FB000102404002251
62138+:109CC00000003821000529C00A00127C27BD0020B1
62139+:109CD00027BDFFE0AFB100143091FFFFAFB000101F
62140+:109CE000AFBF00181220001D000080218F86001CCD
62141+:109CF0008CC500002403000600053F020005140285
62142+:109D000030E4000714830015304500FF2CA800063E
62143+:109D10001100004D000558803C0C0800258C57D4DC
62144+:109D2000016C50218D490000012000080000000056
62145+:109D30008F8E00EC240D000111CD005900000000B1
62146+:109D4000260B00013170FFFF24CA00200211202BD6
62147+:109D5000014030211480FFE6AF8A001C0200102170
62148+:109D60008FBF00188FB100148FB0001003E00008FF
62149+:109D700027BD0020938700CE14E00038240400148F
62150+:109D80000E001338000000008F86001C2402000122
62151+:109D90000A00147FAF8200EC8F8900EC24080002D7
62152+:109DA0001128003B2404001300002821000030216A
62153+:109DB000240700010E00127C000000000A00147F3E
62154+:109DC0008F86001C8F8700EC2405000214E5FFF647
62155+:109DD000240400120E0012E9000000008F8500E844
62156+:109DE00000403021240400120E00127C00003821B3
62157+:109DF0000A00147F8F86001C8F8300EC241F000351
62158+:109E0000147FFFD0260B00010E00129B0000000003
62159+:109E10008F8500E800403021240200022404001055
62160+:109E200000003821AF8200EC0E00127C0000000020
62161+:109E30000A00147F8F86001C8F8F00EC240600021E
62162+:109E400011E6000B0000000024040010000028218F
62163+:109E5000000030210A00149C240700010000282182
62164+:109E60000E00127C000030210A00147F8F86001C37
62165+:109E70000E0013A500000000144000128F99001C72
62166+:109E80008F86001C240200030A00147FAF8200ECBE
62167+:109E90000E001431000000000A00147F8F86001CA1
62168+:109EA0000E00128B000000002402000224040014A3
62169+:109EB0000000282100003021000038210A0014B9D8
62170+:109EC000AF8200EC004038212404001097380002D3
62171+:109ED000000028210E00127C3306FFFF0A00147FC9
62172+:109EE0008F86001C8F8400C83C077FFF34E6FFFF8D
62173+:109EF0008C8500742402000100A61824AC83007431
62174+:109F000003E00008A082000510A000362CA200800B
62175+:109F1000274A04003C0B000524090080104000077C
62176+:109F20002408008030A6000F00C540212D030081C9
62177+:109F30001460000200A0482124080080AF4B0030CC
62178+:109F400000000000000000000000000011000009F7
62179+:109F500000003821014030218C8D000024E70004EE
62180+:109F600000E8602BACCD0000248400041580FFFACB
62181+:109F700024C60004000000000000000000000000F3
62182+:109F80003C0E0006010E3825AF47003000000000EF
62183+:109F900000000000000000008F4F000031E80010BA
62184+:109FA0001100FFFD000000008F42003C8F43003C89
62185+:109FB0000049C8210323C02B130000040000000047
62186+:109FC0008F4C003825860001AF4600388F47003C93
62187+:109FD00000A9282300E96821AF4D003C14A0FFCE62
62188+:109FE0002CA2008003E000080000000027BDFFD085
62189+:109FF0003C020002AFB100143C11000CAF45003828
62190+:10A00000AFB3001CAF46003C00809821AF42003047
62191+:10A0100024050088AF44002803512021AFBF002849
62192+:10A02000AFB50024AFB40020AFB200180E0014F199
62193+:10A03000AFB000103C1F08008FFF004C3C18080018
62194+:10A040008F1800642410FF8003F3A82132B9007F29
62195+:10A0500002B078240018A0C0033A70210018914083
62196+:10A0600001D12021AF4F00280E0014F10254282105
62197+:10A070003C0D08008DAD00502405012001B358218E
62198+:10A08000316C007F01705024019A48210131202158
62199+:10A090000E0014F1AF4A00283C0808008D08005457
62200+:10A0A0003C0508008CA500640113382130E6007FD0
62201+:10A0B00000F0182400DA202100912021AF4300286D
62202+:10A0C0000E0014F1000529403C0208008C420058A3
62203+:10A0D0003C1008008E1000601200001C0053882104
62204+:10A0E0002415FF800A0015743C14000C3226007FF2
62205+:10A0F0000235182400DA202102402821AF4300282D
62206+:10A10000009420210E0014F12610FFC01200000F51
62207+:10A11000023288212E05004110A0FFF42412100005
62208+:10A120003226007F001091800235182400DA2021A9
62209+:10A1300002402821AF430028009420210E0014F192
62210+:10A14000000080211600FFF3023288213C0B08003A
62211+:10A150008D6B005C240AFF802405000201734021FE
62212+:10A16000010A4824AF4900283C0408009484006296
62213+:10A170003110007F021A88213C07000C0E000CAA47
62214+:10A180000227982100402821026020218FBF00284B
62215+:10A190008FB500248FB400208FB3001C8FB200183D
62216+:10A1A0008FB100148FB000100A0014F127BD0030E9
62217+:10A1B0008F83001C8C62000410400003000000002C
62218+:10A1C00003E00008000000008C6400108C650008AB
62219+:10A1D0000A00152A8C66000C000000000000001B1D
62220+:10A1E0000000000F0000000A000000080000000648
62221+:10A1F000000000050000000500000004000000044D
62222+:10A200000000000300000003000000030000000342
62223+:10A210000000000300000002000000020000000235
62224+:10A220000000000200000002000000020000000226
62225+:10A230000000000200000002000000020000000216
62226+:10A240000000000200000002000000020000000206
62227+:10A2500000000001000000010000000108000F24C0
62228+:10A2600008000D6C08000FB80800106008000F4CC3
62229+:10A2700008000F8C0800119408000D88080011B820
62230+:10A2800008000DD8080015540800151C08000D889A
62231+:10A2900008000D8808000D880800124008001240D0
62232+:10A2A00008000D8808000D88080014E008000D88DB
62233+:10A2B00008000D8808000D8808000D88080013B4F8
62234+:10A2C00008000D8808000D8808000D8808000D881A
62235+:10A2D00008000D8808000D8808000D8808000D880A
62236+:10A2E00008000D8808000D8808000D8808000D88FA
62237+:10A2F00008000D8808000D8808000FAC08000D88C4
62238+:10A3000008000D880800167808000D8808000D88E0
62239+:10A3100008000D8808000D8808000D8808000D88C9
62240+:10A3200008000D8808000D8808000D8808000D88B9
62241+:10A3300008000D8808000D8808000D8808000D88A9
62242+:10A3400008000D8808000D8808000D88080014100A
62243+:10A3500008000D8808000D8808001334080012A4B6
62244+:10A3600008001E2C08001EFC08001F1408001F28EF
62245+:10A3700008001F3808001E2C08001E2C08001E2C88
62246+:10A3800008001ED808002E1408002E1C08002DE41A
62247+:10A3900008002DF008002DFC08002E08080052F4DB
62248+:10A3A000080052B40800528008005254080052308D
62249+:10A3B000080051EC0A000C840000000000000000BE
62250+:10A3C0000000000D727870362E322E33000000002F
62251+:10A3D000060203030000000000000001000000006E
62252+:10A3E000000000000000000000000000000000006D
62253+:10A3F000000000000000000000000000000000005D
62254+:10A40000000000000000000000000000000000004C
62255+:10A41000000000000000000000000000000000003C
62256+:10A42000000000000000000000000000000000002C
62257+:10A43000000000000000000000000000000000001C
62258+:10A44000000000000000000000000000000000000C
62259+:10A4500000000000000000000000000000000000FC
62260+:10A4600000000000000000000000000000000000EC
62261+:10A4700000000000000000000000000000000000DC
62262+:10A4800000000000000000000000000000000000CC
62263+:10A4900000000000000000000000000000000000BC
62264+:10A4A00000000000000000000000000000000000AC
62265+:10A4B000000000000000000000000000000000009C
62266+:10A4C000000000000000000000000000000000008C
62267+:10A4D000000000000000000000000000000000007C
62268+:10A4E000000000000000000000000000000000006C
62269+:10A4F000000000000000000000000000000000005C
62270+:10A50000000000000000000000000000000000004B
62271+:10A51000000000000000000000000000000000003B
62272+:10A52000000000000000000000000000000000002B
62273+:10A53000000000000000000000000000000000001B
62274+:10A54000000000000000000000000000000000000B
62275+:10A5500000000000000000000000000000000000FB
62276+:10A5600000000000000000000000000000000000EB
62277+:10A5700000000000000000000000000000000000DB
62278+:10A5800000000000000000000000000000000000CB
62279+:10A5900000000000000000000000000000000000BB
62280+:10A5A00000000000000000000000000000000000AB
62281+:10A5B000000000000000000000000000000000009B
62282+:10A5C000000000000000000000000000000000008B
62283+:10A5D000000000000000000000000000000000007B
62284+:10A5E000000000000000000000000000000000006B
62285+:10A5F000000000000000000000000000000000005B
62286+:10A60000000000000000000000000000000000004A
62287+:10A61000000000000000000000000000000000003A
62288+:10A62000000000000000000000000000000000002A
62289+:10A63000000000000000000000000000000000001A
62290+:10A64000000000000000000000000000000000000A
62291+:10A6500000000000000000000000000000000000FA
62292+:10A6600000000000000000000000000000000000EA
62293+:10A6700000000000000000000000000000000000DA
62294+:10A6800000000000000000000000000000000000CA
62295+:10A6900000000000000000000000000000000000BA
62296+:10A6A00000000000000000000000000000000000AA
62297+:10A6B000000000000000000000000000000000009A
62298+:10A6C000000000000000000000000000000000008A
62299+:10A6D000000000000000000000000000000000007A
62300+:10A6E000000000000000000000000000000000006A
62301+:10A6F000000000000000000000000000000000005A
62302+:10A700000000000000000000000000000000000049
62303+:10A710000000000000000000000000000000000039
62304+:10A720000000000000000000000000000000000029
62305+:10A730000000000000000000000000000000000019
62306+:10A740000000000000000000000000000000000009
62307+:10A7500000000000000000000000000000000000F9
62308+:10A7600000000000000000000000000000000000E9
62309+:10A7700000000000000000000000000000000000D9
62310+:10A7800000000000000000000000000000000000C9
62311+:10A7900000000000000000000000000000000000B9
62312+:10A7A00000000000000000000000000000000000A9
62313+:10A7B0000000000000000000000000000000000099
62314+:10A7C0000000000000000000000000000000000089
62315+:10A7D0000000000000000000000000000000000079
62316+:10A7E0000000000000000000000000000000000069
62317+:10A7F0000000000000000000000000000000000059
62318+:10A800000000000000000000000000000000000048
62319+:10A810000000000000000000000000000000000038
62320+:10A820000000000000000000000000000000000028
62321+:10A830000000000000000000000000000000000018
62322+:10A840000000000000000000000000000000000008
62323+:10A8500000000000000000000000000000000000F8
62324+:10A8600000000000000000000000000000000000E8
62325+:10A8700000000000000000000000000000000000D8
62326+:10A8800000000000000000000000000000000000C8
62327+:10A8900000000000000000000000000000000000B8
62328+:10A8A00000000000000000000000000000000000A8
62329+:10A8B0000000000000000000000000000000000098
62330+:10A8C0000000000000000000000000000000000088
62331+:10A8D0000000000000000000000000000000000078
62332+:10A8E0000000000000000000000000000000000068
62333+:10A8F0000000000000000000000000000000000058
62334+:10A900000000000000000000000000000000000047
62335+:10A910000000000000000000000000000000000037
62336+:10A920000000000000000000000000000000000027
62337+:10A930000000000000000000000000000000000017
62338+:10A940000000000000000000000000000000000007
62339+:10A9500000000000000000000000000000000000F7
62340+:10A9600000000000000000000000000000000000E7
62341+:10A9700000000000000000000000000000000000D7
62342+:10A9800000000000000000000000000000000000C7
62343+:10A9900000000000000000000000000000000000B7
62344+:10A9A00000000000000000000000000000000000A7
62345+:10A9B0000000000000000000000000000000000097
62346+:10A9C0000000000000000000000000000000000087
62347+:10A9D0000000000000000000000000000000000077
62348+:10A9E0000000000000000000000000000000000067
62349+:10A9F0000000000000000000000000000000000057
62350+:10AA00000000000000000000000000000000000046
62351+:10AA10000000000000000000000000000000000036
62352+:10AA20000000000000000000000000000000000026
62353+:10AA30000000000000000000000000000000000016
62354+:10AA40000000000000000000000000000000000006
62355+:10AA500000000000000000000000000000000000F6
62356+:10AA600000000000000000000000000000000000E6
62357+:10AA700000000000000000000000000000000000D6
62358+:10AA800000000000000000000000000000000000C6
62359+:10AA900000000000000000000000000000000000B6
62360+:10AAA00000000000000000000000000000000000A6
62361+:10AAB0000000000000000000000000000000000096
62362+:10AAC0000000000000000000000000000000000086
62363+:10AAD0000000000000000000000000000000000076
62364+:10AAE0000000000000000000000000000000000066
62365+:10AAF0000000000000000000000000000000000056
62366+:10AB00000000000000000000000000000000000045
62367+:10AB10000000000000000000000000000000000035
62368+:10AB20000000000000000000000000000000000025
62369+:10AB30000000000000000000000000000000000015
62370+:10AB40000000000000000000000000000000000005
62371+:10AB500000000000000000000000000000000000F5
62372+:10AB600000000000000000000000000000000000E5
62373+:10AB700000000000000000000000000000000000D5
62374+:10AB800000000000000000000000000000000000C5
62375+:10AB900000000000000000000000000000000000B5
62376+:10ABA00000000000000000000000000000000000A5
62377+:10ABB0000000000000000000000000000000000095
62378+:10ABC0000000000000000000000000000000000085
62379+:10ABD0000000000000000000000000000000000075
62380+:10ABE0000000000000000000000000000000000065
62381+:10ABF0000000000000000000000000000000000055
62382+:10AC00000000000000000000000000000000000044
62383+:10AC10000000000000000000000000000000000034
62384+:10AC20000000000000000000000000000000000024
62385+:10AC30000000000000000000000000000000000014
62386+:10AC40000000000000000000000000000000000004
62387+:10AC500000000000000000000000000000000000F4
62388+:10AC600000000000000000000000000000000000E4
62389+:10AC700000000000000000000000000000000000D4
62390+:10AC800000000000000000000000000000000000C4
62391+:10AC900000000000000000000000000000000000B4
62392+:10ACA00000000000000000000000000000000000A4
62393+:10ACB0000000000000000000000000000000000094
62394+:10ACC0000000000000000000000000000000000084
62395+:10ACD0000000000000000000000000000000000074
62396+:10ACE0000000000000000000000000000000000064
62397+:10ACF0000000000000000000000000000000000054
62398+:10AD00000000000000000000000000000000000043
62399+:10AD10000000000000000000000000000000000033
62400+:10AD20000000000000000000000000000000000023
62401+:10AD30000000000000000000000000000000000013
62402+:10AD40000000000000000000000000000000000003
62403+:10AD500000000000000000000000000000000000F3
62404+:10AD600000000000000000000000000000000000E3
62405+:10AD700000000000000000000000000000000000D3
62406+:10AD800000000000000000000000000000000000C3
62407+:10AD900000000000000000000000000000000000B3
62408+:10ADA00000000000000000000000000000000000A3
62409+:10ADB0000000000000000000000000000000000093
62410+:10ADC0000000000000000000000000000000000083
62411+:10ADD0000000000000000000000000000000000073
62412+:10ADE0000000000000000000000000000000000063
62413+:10ADF0000000000000000000000000000000000053
62414+:10AE00000000000000000000000000000000000042
62415+:10AE10000000000000000000000000000000000032
62416+:10AE20000000000000000000000000000000000022
62417+:10AE30000000000000000000000000000000000012
62418+:10AE40000000000000000000000000000000000002
62419+:10AE500000000000000000000000000000000000F2
62420+:10AE600000000000000000000000000000000000E2
62421+:10AE700000000000000000000000000000000000D2
62422+:10AE800000000000000000000000000000000000C2
62423+:10AE900000000000000000000000000000000000B2
62424+:10AEA00000000000000000000000000000000000A2
62425+:10AEB0000000000000000000000000000000000092
62426+:10AEC0000000000000000000000000000000000082
62427+:10AED0000000000000000000000000000000000072
62428+:10AEE0000000000000000000000000000000000062
62429+:10AEF0000000000000000000000000000000000052
62430+:10AF00000000000000000000000000000000000041
62431+:10AF10000000000000000000000000000000000031
62432+:10AF20000000000000000000000000000000000021
62433+:10AF30000000000000000000000000000000000011
62434+:10AF40000000000000000000000000000000000001
62435+:10AF500000000000000000000000000000000000F1
62436+:10AF600000000000000000000000000000000000E1
62437+:10AF700000000000000000000000000000000000D1
62438+:10AF800000000000000000000000000000000000C1
62439+:10AF900000000000000000000000000000000000B1
62440+:10AFA00000000000000000000000000000000000A1
62441+:10AFB0000000000000000000000000000000000091
62442+:10AFC0000000000000000000000000000000000081
62443+:10AFD0000000000000000000000000000000000071
62444+:10AFE0000000000000000000000000000000000061
62445+:10AFF0000000000000000000000000000000000051
62446+:10B000000000000000000000000000000000000040
62447+:10B010000000000000000000000000000000000030
62448+:10B020000000000000000000000000000000000020
62449+:10B030000000000000000000000000000000000010
62450+:10B040000000000000000000000000000000000000
62451+:10B0500000000000000000000000000000000000F0
62452+:10B0600000000000000000000000000000000000E0
62453+:10B0700000000000000000000000000000000000D0
62454+:10B0800000000000000000000000000000000000C0
62455+:10B0900000000000000000000000000000000000B0
62456+:10B0A00000000000000000000000000000000000A0
62457+:10B0B0000000000000000000000000000000000090
62458+:10B0C0000000000000000000000000000000000080
62459+:10B0D0000000000000000000000000000000000070
62460+:10B0E0000000000000000000000000000000000060
62461+:10B0F0000000000000000000000000000000000050
62462+:10B10000000000000000000000000000000000003F
62463+:10B11000000000000000000000000000000000002F
62464+:10B12000000000000000000000000000000000001F
62465+:10B13000000000000000000000000000000000000F
62466+:10B1400000000000000000000000000000000000FF
62467+:10B1500000000000000000000000000000000000EF
62468+:10B1600000000000000000000000000000000000DF
62469+:10B1700000000000000000000000000000000000CF
62470+:10B1800000000000000000000000000000000000BF
62471+:10B1900000000000000000000000000000000000AF
62472+:10B1A000000000000000000000000000000000009F
62473+:10B1B000000000000000000000000000000000008F
62474+:10B1C000000000000000000000000000000000007F
62475+:10B1D000000000000000000000000000000000006F
62476+:10B1E000000000000000000000000000000000005F
62477+:10B1F000000000000000000000000000000000004F
62478+:10B20000000000000000000000000000000000003E
62479+:10B21000000000000000000000000000000000002E
62480+:10B22000000000000000000000000000000000001E
62481+:10B23000000000000000000000000000000000000E
62482+:10B2400000000000000000000000000000000000FE
62483+:10B2500000000000000000000000000000000000EE
62484+:10B2600000000000000000000000000000000000DE
62485+:10B2700000000000000000000000000000000000CE
62486+:10B2800000000000000000000000000000000000BE
62487+:10B2900000000000000000000000000000000000AE
62488+:10B2A000000000000000000000000000000000009E
62489+:10B2B000000000000000000000000000000000008E
62490+:10B2C000000000000000000000000000000000007E
62491+:10B2D000000000000000000000000000000000006E
62492+:10B2E000000000000000000000000000000000005E
62493+:10B2F000000000000000000000000000000000004E
62494+:10B30000000000000000000000000000000000003D
62495+:10B31000000000000000000000000000000000002D
62496+:10B32000000000000000000000000000000000001D
62497+:10B33000000000000000000000000000000000000D
62498+:10B3400000000000000000000000000000000000FD
62499+:10B3500000000000000000000000000000000000ED
62500+:10B3600000000000000000000000000000000000DD
62501+:10B3700000000000000000000000000000000000CD
62502+:10B3800000000000000000000000000000000000BD
62503+:10B3900000000000000000000000000000000000AD
62504+:10B3A000000000000000000000000000000000009D
62505+:10B3B000000000000000000000000000000000008D
62506+:10B3C000000000000000000000000000000000007D
62507+:10B3D000000000000000000000000000000000006D
62508+:10B3E000000000000000000000000000000000005D
62509+:10B3F000000000000000000000000000000000004D
62510+:10B40000000000000000000000000000000000003C
62511+:10B41000000000000000000000000000000000002C
62512+:10B42000000000000000000000000000000000001C
62513+:10B43000000000000000000000000000000000000C
62514+:10B4400000000000000000000000000000000000FC
62515+:10B4500000000000000000000000000000000000EC
62516+:10B4600000000000000000000000000000000000DC
62517+:10B4700000000000000000000000000000000000CC
62518+:10B4800000000000000000000000000000000000BC
62519+:10B4900000000000000000000000000000000000AC
62520+:10B4A000000000000000000000000000000000009C
62521+:10B4B000000000000000000000000000000000008C
62522+:10B4C000000000000000000000000000000000007C
62523+:10B4D000000000000000000000000000000000006C
62524+:10B4E000000000000000000000000000000000005C
62525+:10B4F000000000000000000000000000000000004C
62526+:10B50000000000000000000000000000000000003B
62527+:10B51000000000000000000000000000000000002B
62528+:10B52000000000000000000000000000000000001B
62529+:10B53000000000000000000000000000000000000B
62530+:10B5400000000000000000000000000000000000FB
62531+:10B5500000000000000000000000000000000000EB
62532+:10B5600000000000000000000000000000000000DB
62533+:10B5700000000000000000000000000000000000CB
62534+:10B5800000000000000000000000000000000000BB
62535+:10B5900000000000000000000000000000000000AB
62536+:10B5A000000000000000000000000000000000009B
62537+:10B5B000000000000000000000000000000000008B
62538+:10B5C000000000000000000000000000000000007B
62539+:10B5D000000000000000000000000000000000006B
62540+:10B5E000000000000000000000000000000000005B
62541+:10B5F000000000000000000000000000000000004B
62542+:10B60000000000000000000000000000000000003A
62543+:10B61000000000000000000000000000000000002A
62544+:10B62000000000000000000000000000000000001A
62545+:10B63000000000000000000000000000000000000A
62546+:10B6400000000000000000000000000000000000FA
62547+:10B6500000000000000000000000000000000000EA
62548+:10B6600000000000000000000000000000000000DA
62549+:10B6700000000000000000000000000000000000CA
62550+:10B6800000000000000000000000000000000000BA
62551+:10B6900000000000000000000000000000000000AA
62552+:10B6A000000000000000000000000000000000009A
62553+:10B6B000000000000000000000000000000000008A
62554+:10B6C000000000000000000000000000000000007A
62555+:10B6D000000000000000000000000000000000006A
62556+:10B6E000000000000000000000000000000000005A
62557+:10B6F000000000000000000000000000000000004A
62558+:10B700000000000000000000000000000000000039
62559+:10B710000000000000000000000000000000000029
62560+:10B720000000000000000000000000000000000019
62561+:10B730000000000000000000000000000000000009
62562+:10B7400000000000000000000000000000000000F9
62563+:10B7500000000000000000000000000000000000E9
62564+:10B7600000000000000000000000000000000000D9
62565+:10B7700000000000000000000000000000000000C9
62566+:10B7800000000000000000000000000000000000B9
62567+:10B7900000000000000000000000000000000000A9
62568+:10B7A0000000000000000000000000000000000099
62569+:10B7B0000000000000000000000000000000000089
62570+:10B7C0000000000000000000000000000000000079
62571+:10B7D0000000000000000000000000000000000069
62572+:10B7E0000000000000000000000000000000000059
62573+:10B7F0000000000000000000000000000000000049
62574+:10B800000000000000000000000000000000000038
62575+:10B810000000000000000000000000000000000028
62576+:10B820000000000000000000000000000000000018
62577+:10B830000000000000000000000000000000000008
62578+:10B8400000000000000000000000000000000000F8
62579+:10B8500000000000000000000000000000000000E8
62580+:10B8600000000000000000000000000000000000D8
62581+:10B8700000000000000000000000000000000000C8
62582+:10B8800000000000000000000000000000000000B8
62583+:10B8900000000000000000000000000000000000A8
62584+:10B8A0000000000000000000000000000000000098
62585+:10B8B0000000000000000000000000000000000088
62586+:10B8C0000000000000000000000000000000000078
62587+:10B8D0000000000000000000000000000000000068
62588+:10B8E0000000000000000000000000000000000058
62589+:10B8F0000000000000000000000000000000000048
62590+:10B900000000000000000000000000000000000037
62591+:10B910000000000000000000000000000000000027
62592+:10B920000000000000000000000000000000000017
62593+:10B930000000000000000000000000000000000007
62594+:10B9400000000000000000000000000000000000F7
62595+:10B9500000000000000000000000000000000000E7
62596+:10B9600000000000000000000000000000000000D7
62597+:10B9700000000000000000000000000000000000C7
62598+:10B9800000000000000000000000000000000000B7
62599+:10B9900000000000000000000000000000000000A7
62600+:10B9A0000000000000000000000000000000000097
62601+:10B9B0000000000000000000000000000000000087
62602+:10B9C0000000000000000000000000000000000077
62603+:10B9D0000000000000000000000000000000000067
62604+:10B9E0000000000000000000000000000000000057
62605+:10B9F0000000000000000000000000000000000047
62606+:10BA00000000000000000000000000000000000036
62607+:10BA10000000000000000000000000000000000026
62608+:10BA20000000000000000000000000000000000016
62609+:10BA30000000000000000000000000000000000006
62610+:10BA400000000000000000000000000000000000F6
62611+:10BA500000000000000000000000000000000000E6
62612+:10BA600000000000000000000000000000000000D6
62613+:10BA700000000000000000000000000000000000C6
62614+:10BA800000000000000000000000000000000000B6
62615+:10BA900000000000000000000000000000000000A6
62616+:10BAA0000000000000000000000000000000000096
62617+:10BAB0000000000000000000000000000000000086
62618+:10BAC0000000000000000000000000000000000076
62619+:10BAD0000000000000000000000000000000000066
62620+:10BAE0000000000000000000000000000000000056
62621+:10BAF0000000000000000000000000000000000046
62622+:10BB00000000000000000000000000000000000035
62623+:10BB10000000000000000000000000000000000025
62624+:10BB20000000000000000000000000000000000015
62625+:10BB30000000000000000000000000000000000005
62626+:10BB400000000000000000000000000000000000F5
62627+:10BB500000000000000000000000000000000000E5
62628+:10BB600000000000000000000000000000000000D5
62629+:10BB700000000000000000000000000000000000C5
62630+:10BB800000000000000000000000000000000000B5
62631+:10BB900000000000000000000000000000000000A5
62632+:10BBA0000000000000000000000000000000000095
62633+:10BBB0000000000000000000000000000000000085
62634+:10BBC0000000000000000000000000000000000075
62635+:10BBD0000000000000000000000000000000000065
62636+:10BBE0000000000000000000000000000000000055
62637+:10BBF0000000000000000000000000000000000045
62638+:10BC00000000000000000000000000000000000034
62639+:10BC10000000000000000000000000000000000024
62640+:10BC20000000000000000000000000000000000014
62641+:10BC30000000000000000000000000000000000004
62642+:10BC400000000000000000000000000000000000F4
62643+:10BC500000000000000000000000000000000000E4
62644+:10BC600000000000000000000000000000000000D4
62645+:10BC700000000000000000000000000000000000C4
62646+:10BC800000000000000000000000000000000000B4
62647+:10BC900000000000000000000000000000000000A4
62648+:10BCA0000000000000000000000000000000000094
62649+:10BCB0000000000000000000000000000000000084
62650+:10BCC0000000000000000000000000000000000074
62651+:10BCD0000000000000000000000000000000000064
62652+:10BCE0000000000000000000000000000000000054
62653+:10BCF0000000000000000000000000000000000044
62654+:10BD00000000000000000000000000000000000033
62655+:10BD10000000000000000000000000000000000023
62656+:10BD20000000000000000000000000000000000013
62657+:10BD30000000000000000000000000000000000003
62658+:10BD400000000000000000000000000000000000F3
62659+:10BD500000000000000000000000000000000000E3
62660+:10BD600000000000000000000000000000000000D3
62661+:10BD700000000000000000000000000000000000C3
62662+:10BD800000000000000000000000000000000000B3
62663+:10BD900000000000000000000000000000000000A3
62664+:10BDA0000000000000000000000000000000000093
62665+:10BDB0000000000000000000000000000000000083
62666+:10BDC0000000000000000000000000000000000073
62667+:10BDD0000000000000000000000000000000000063
62668+:10BDE0000000000000000000000000000000000053
62669+:10BDF0000000000000000000000000000000000043
62670+:10BE00000000000000000000000000000000000032
62671+:10BE10000000000000000000000000000000000022
62672+:10BE20000000000000000000000000000000000012
62673+:10BE30000000000000000000000000000000000002
62674+:10BE400000000000000000000000000000000000F2
62675+:10BE500000000000000000000000000000000000E2
62676+:10BE600000000000000000000000000000000000D2
62677+:10BE700000000000000000000000000000000000C2
62678+:10BE800000000000000000000000000000000000B2
62679+:10BE900000000000000000000000000000000000A2
62680+:10BEA0000000000000000000000000000000000092
62681+:10BEB0000000000000000000000000000000000082
62682+:10BEC0000000000000000000000000000000000072
62683+:10BED0000000000000000000000000000000000062
62684+:10BEE0000000000000000000000000000000000052
62685+:10BEF0000000000000000000000000000000000042
62686+:10BF00000000000000000000000000000000000031
62687+:10BF10000000000000000000000000000000000021
62688+:10BF20000000000000000000000000000000000011
62689+:10BF30000000000000000000000000000000000001
62690+:10BF400000000000000000000000000000000000F1
62691+:10BF500000000000000000000000000000000000E1
62692+:10BF600000000000000000000000000000000000D1
62693+:10BF700000000000000000000000000000000000C1
62694+:10BF800000000000000000000000000000000000B1
62695+:10BF900000000000000000000000000000000000A1
62696+:10BFA0000000000000000000000000000000000091
62697+:10BFB0000000000000000000000000000000000081
62698+:10BFC0000000000000000000000000000000000071
62699+:10BFD0000000000000000000000000000000000061
62700+:10BFE0000000000000000000000000000000000051
62701+:10BFF0000000000000000000000000000000000041
62702+:10C000000000000000000000000000000000000030
62703+:10C010000000000000000000000000000000000020
62704+:10C020000000000000000000000000000000000010
62705+:10C030000000000000000000000000000000000000
62706+:10C0400000000000000000000000000000000000F0
62707+:10C0500000000000000000000000000000000000E0
62708+:10C0600000000000000000000000000000000000D0
62709+:10C0700000000000000000000000000000000000C0
62710+:10C0800000000000000000000000000000000000B0
62711+:10C0900000000000000000000000000000000000A0
62712+:10C0A0000000000000000000000000000000000090
62713+:10C0B0000000000000000000000000000000000080
62714+:10C0C0000000000000000000000000000000000070
62715+:10C0D0000000000000000000000000000000000060
62716+:10C0E0000000000000000000000000000000000050
62717+:10C0F0000000000000000000000000000000000040
62718+:10C10000000000000000000000000000000000002F
62719+:10C11000000000000000000000000000000000001F
62720+:10C12000000000000000000000000000000000000F
62721+:10C1300000000000000000000000000000000000FF
62722+:10C1400000000000000000000000000000000000EF
62723+:10C1500000000000000000000000000000000000DF
62724+:10C1600000000000000000000000000000000000CF
62725+:10C1700000000000000000000000000000000000BF
62726+:10C1800000000000000000000000000000000000AF
62727+:10C19000000000000000000000000000000000009F
62728+:10C1A000000000000000000000000000000000008F
62729+:10C1B000000000000000000000000000000000007F
62730+:10C1C000000000000000000000000000000000006F
62731+:10C1D000000000000000000000000000000000005F
62732+:10C1E000000000000000000000000000000000004F
62733+:10C1F000000000000000000000000000000000003F
62734+:10C20000000000000000000000000000000000002E
62735+:10C21000000000000000000000000000000000001E
62736+:10C22000000000000000000000000000000000000E
62737+:10C2300000000000000000000000000000000000FE
62738+:10C2400000000000000000000000000000000000EE
62739+:10C2500000000000000000000000000000000000DE
62740+:10C2600000000000000000000000000000000000CE
62741+:10C2700000000000000000000000000000000000BE
62742+:10C2800000000000000000000000000000000000AE
62743+:10C29000000000000000000000000000000000009E
62744+:10C2A000000000000000000000000000000000008E
62745+:10C2B000000000000000000000000000000000007E
62746+:10C2C000000000000000000000000000000000006E
62747+:10C2D000000000000000000000000000000000005E
62748+:10C2E000000000000000000000000000000000004E
62749+:10C2F000000000000000000000000000000000003E
62750+:10C30000000000000000000000000000000000002D
62751+:10C31000000000000000000000000000000000001D
62752+:10C32000000000000000000000000000000000000D
62753+:10C3300000000000000000000000000000000000FD
62754+:10C3400000000000000000000000000000000000ED
62755+:10C3500000000000000000000000000000000000DD
62756+:10C3600000000000000000000000000000000000CD
62757+:10C3700000000000000000000000000000000000BD
62758+:10C3800000000000000000000000000000000000AD
62759+:10C39000000000000000000000000000000000009D
62760+:10C3A000000000000000000000000000000000008D
62761+:10C3B000000000000000000000000000000000007D
62762+:10C3C000000000000000000000000000000000006D
62763+:10C3D000000000000000000000000000000000005D
62764+:10C3E000000000000000000000000000000000004D
62765+:10C3F000000000000000000000000000000000003D
62766+:10C40000000000000000000000000000000000002C
62767+:10C41000000000000000000000000000000000001C
62768+:10C42000000000000000000000000000000000000C
62769+:10C4300000000000000000000000000000000000FC
62770+:10C4400000000000000000000000000000000000EC
62771+:10C4500000000000000000000000000000000000DC
62772+:10C4600000000000000000000000000000000000CC
62773+:10C4700000000000000000000000000000000000BC
62774+:10C4800000000000000000000000000000000000AC
62775+:10C49000000000000000000000000000000000009C
62776+:10C4A000000000000000000000000000000000008C
62777+:10C4B000000000000000000000000000000000007C
62778+:10C4C000000000000000000000000000000000006C
62779+:10C4D000000000000000000000000000000000005C
62780+:10C4E000000000000000000000000000000000004C
62781+:10C4F000000000000000000000000000000000003C
62782+:10C50000000000000000000000000000000000002B
62783+:10C51000000000000000000000000000000000001B
62784+:10C52000000000000000000000000000000000000B
62785+:10C5300000000000000000000000000000000000FB
62786+:10C5400000000000000000000000000000000000EB
62787+:10C5500000000000000000000000000000000000DB
62788+:10C5600000000000000000000000000000000000CB
62789+:10C5700000000000000000000000000000000000BB
62790+:10C5800000000000000000000000000000000000AB
62791+:10C59000000000000000000000000000000000009B
62792+:10C5A000000000000000000000000000000000008B
62793+:10C5B000000000000000000000000000000000007B
62794+:10C5C000000000000000000000000000000000006B
62795+:10C5D000000000000000000000000000000000005B
62796+:10C5E000000000000000000000000000000000004B
62797+:10C5F000000000000000000000000000000000003B
62798+:10C60000000000000000000000000000000000002A
62799+:10C61000000000000000000000000000000000001A
62800+:10C62000000000000000000000000000000000000A
62801+:10C6300000000000000000000000000000000000FA
62802+:10C6400000000000000000000000000000000000EA
62803+:10C6500000000000000000000000000000000000DA
62804+:10C6600000000000000000000000000000000000CA
62805+:10C6700000000000000000000000000000000000BA
62806+:10C6800000000000000000000000000000000000AA
62807+:10C69000000000000000000000000000000000009A
62808+:10C6A000000000000000000000000000000000008A
62809+:10C6B000000000000000000000000000000000007A
62810+:10C6C000000000000000000000000000000000006A
62811+:10C6D000000000000000000000000000000000005A
62812+:10C6E000000000000000000000000000000000004A
62813+:10C6F000000000000000000000000000000000003A
62814+:10C700000000000000000000000000000000000029
62815+:10C710000000000000000000000000000000000019
62816+:10C720000000000000000000000000000000000009
62817+:10C7300000000000000000000000000000000000F9
62818+:10C7400000000000000000000000000000000000E9
62819+:10C7500000000000000000000000000000000000D9
62820+:10C7600000000000000000000000000000000000C9
62821+:10C7700000000000000000000000000000000000B9
62822+:10C7800000000000000000000000000000000000A9
62823+:10C790000000000000000000000000000000000099
62824+:10C7A0000000000000000000000000000000000089
62825+:10C7B0000000000000000000000000000000000079
62826+:10C7C0000000000000000000000000000000000069
62827+:10C7D0000000000000000000000000000000000059
62828+:10C7E0000000000000000000000000000000000049
62829+:10C7F0000000000000000000000000000000000039
62830+:10C800000000000000000000000000000000000028
62831+:10C810000000000000000000000000000000000018
62832+:10C820000000000000000000000000000000000008
62833+:10C8300000000000000000000000000000000000F8
62834+:10C8400000000000000000000000000000000000E8
62835+:10C8500000000000000000000000000000000000D8
62836+:10C8600000000000000000000000000000000000C8
62837+:10C8700000000000000000000000000000000000B8
62838+:10C8800000000000000000000000000000000000A8
62839+:10C890000000000000000000000000000000000098
62840+:10C8A0000000000000000000000000000000000088
62841+:10C8B0000000000000000000000000000000000078
62842+:10C8C0000000000000000000000000000000000068
62843+:10C8D0000000000000000000000000000000000058
62844+:10C8E0000000000000000000000000000000000048
62845+:10C8F0000000000000000000000000000000000038
62846+:10C900000000000000000000000000000000000027
62847+:10C910000000000000000000000000000000000017
62848+:10C920000000000000000000000000000000000007
62849+:10C9300000000000000000000000000000000000F7
62850+:10C9400000000000000000000000000000000000E7
62851+:10C9500000000000000000000000000000000000D7
62852+:10C9600000000000000000000000000000000000C7
62853+:10C9700000000000000000000000000000000000B7
62854+:10C9800000000000000000000000000000000000A7
62855+:10C990000000000000000000000000000000000097
62856+:10C9A0000000000000000000000000000000000087
62857+:10C9B0000000000000000000000000000000000077
62858+:10C9C0000000000000000000000000000000000067
62859+:10C9D0000000000000000000000000000000000057
62860+:10C9E0000000000000000000000000000000000047
62861+:10C9F0000000000000000000000000000000000037
62862+:10CA00000000000000000000000000000000000026
62863+:10CA10000000000000000000000000000000000016
62864+:10CA20000000000000000000000000000000000006
62865+:10CA300000000000000000000000000000000000F6
62866+:10CA400000000000000000000000000000000000E6
62867+:10CA500000000000000000000000000000000000D6
62868+:10CA600000000000000000000000000000000000C6
62869+:10CA700000000000000000000000000000000000B6
62870+:10CA800000000000000000000000000000000000A6
62871+:10CA90000000000000000000000000000000000096
62872+:10CAA0000000000000000000000000000000000086
62873+:10CAB0000000000000000000000000000000000076
62874+:10CAC0000000000000000000000000000000000066
62875+:10CAD0000000000000000000000000000000000056
62876+:10CAE0000000000000000000000000000000000046
62877+:10CAF0000000000000000000000000000000000036
62878+:10CB00000000000000000000000000000000000025
62879+:10CB10000000000000000000000000000000000015
62880+:10CB20000000000000000000000000000000000005
62881+:10CB300000000000000000000000000000000000F5
62882+:10CB400000000000000000000000000000000000E5
62883+:10CB500000000000000000000000000000000000D5
62884+:10CB600000000000000000000000000000000000C5
62885+:10CB700000000000000000000000000000000000B5
62886+:10CB800000000000000000000000000000000000A5
62887+:10CB90000000000000000000000000000000000095
62888+:10CBA0000000000000000000000000000000000085
62889+:10CBB0000000000000000000000000000000000075
62890+:10CBC0000000000000000000000000000000000065
62891+:10CBD0000000000000000000000000000000000055
62892+:10CBE0000000000000000000000000000000000045
62893+:10CBF0000000000000000000000000000000000035
62894+:10CC00000000000000000000000000000000000024
62895+:10CC10000000000000000000000000000000000014
62896+:10CC20000000000000000000000000000000000004
62897+:10CC300000000000000000000000000000000000F4
62898+:10CC400000000000000000000000000000000000E4
62899+:10CC500000000000000000000000000000000000D4
62900+:10CC600000000000000000000000000000000000C4
62901+:10CC700000000000000000000000000000000000B4
62902+:10CC800000000000000000000000000000000000A4
62903+:10CC90000000000000000000000000000000000094
62904+:10CCA0000000000000000000000000000000000084
62905+:10CCB0000000000000000000000000000000000074
62906+:10CCC0000000000000000000000000000000000064
62907+:10CCD0000000000000000000000000000000000054
62908+:10CCE0000000000000000000000000000000000044
62909+:10CCF0000000000000000000000000000000000034
62910+:10CD00000000000000000000000000000000000023
62911+:10CD10000000000000000000000000000000000013
62912+:10CD20000000000000000000000000000000000003
62913+:10CD300000000000000000000000000000000000F3
62914+:10CD400000000000000000000000000000000000E3
62915+:10CD500000000000000000000000000000000000D3
62916+:10CD600000000000000000000000000000000000C3
62917+:10CD700000000000000000000000000000000000B3
62918+:10CD800000000000000000000000000000000000A3
62919+:10CD90000000000000000000000000000000000093
62920+:10CDA0000000000000000000000000000000000083
62921+:10CDB0000000000000000000000000000000000073
62922+:10CDC0000000000000000000000000000000000063
62923+:10CDD0000000000000000000000000000000000053
62924+:10CDE0000000000000000000000000000000000043
62925+:10CDF0000000000000000000000000000000000033
62926+:10CE00000000000000000000000000000000000022
62927+:10CE10000000000000000000000000000000000012
62928+:10CE20000000000000000000000000000000000002
62929+:10CE300000000000000000000000000000000000F2
62930+:10CE400000000000000000000000000000000000E2
62931+:10CE500000000000000000000000000000000000D2
62932+:10CE600000000000000000000000000000000000C2
62933+:10CE700000000000000000000000000000000000B2
62934+:10CE800000000000000000000000000000000000A2
62935+:10CE90000000000000000000000000000000000092
62936+:10CEA0000000000000000000000000000000000082
62937+:10CEB0000000000000000000000000000000000072
62938+:10CEC0000000000000000000000000000000000062
62939+:10CED0000000000000000000000000000000000052
62940+:10CEE0000000000000000000000000000000000042
62941+:10CEF0000000000000000000000000000000000032
62942+:10CF00000000000000000000000000000000000021
62943+:10CF10000000000000000000000000000000000011
62944+:10CF20000000000000000000000000000000000001
62945+:10CF300000000000000000000000000000000000F1
62946+:10CF400000000000000000000000000000000000E1
62947+:10CF500000000000000000000000000000000000D1
62948+:10CF600000000000000000000000000000000000C1
62949+:10CF700000000000000000000000000000000000B1
62950+:10CF800000000000000000000000000000000000A1
62951+:10CF90000000000000000000000000000000000091
62952+:10CFA0000000000000000000000000000000000081
62953+:10CFB0000000000000000000000000000000000071
62954+:10CFC0000000000000000000000000000000000061
62955+:10CFD0000000000000000000000000000000000051
62956+:10CFE0000000000000000000000000000000000041
62957+:10CFF0000000000000000000000000000000000031
62958+:10D000000000000000000000000000000000000020
62959+:10D010000000000000000000000000000000000010
62960+:10D020000000000000000000000000000000000000
62961+:10D0300000000000000000000000000000000000F0
62962+:10D0400000000000000000000000000000000000E0
62963+:10D0500000000000000000000000000000000000D0
62964+:10D0600000000000000000000000000000000000C0
62965+:10D0700000000000000000000000000000000000B0
62966+:10D0800000000000000000000000000000000000A0
62967+:10D090000000000000000000000000000000000090
62968+:10D0A0000000000000000000000000000000000080
62969+:10D0B0000000000000000000000000000000000070
62970+:10D0C0000000000000000000000000000000000060
62971+:10D0D0000000000000000000000000000000000050
62972+:10D0E0000000000000000000000000000000000040
62973+:10D0F0000000000000000000000000000000000030
62974+:10D10000000000000000000000000000000000001F
62975+:10D11000000000000000000000000000000000000F
62976+:10D1200000000000000000000000000000000000FF
62977+:10D1300000000000000000000000000000000000EF
62978+:10D1400000000000000000000000000000000000DF
62979+:10D1500000000000000000000000000000000000CF
62980+:10D1600000000000000000000000000000000000BF
62981+:10D1700000000000000000000000000000000000AF
62982+:10D18000000000000000000000000000000000009F
62983+:10D19000000000000000000000000000000000008F
62984+:10D1A000000000000000000000000000000000007F
62985+:10D1B000000000000000000000000000000000006F
62986+:10D1C000000000000000000000000000000000005F
62987+:10D1D000000000000000000000000000000000004F
62988+:10D1E000000000000000000000000000000000003F
62989+:10D1F000000000000000000000000000000000002F
62990+:10D20000000000000000000000000000000000001E
62991+:10D21000000000000000000000000000000000000E
62992+:10D2200000000000000000000000000000000000FE
62993+:10D2300000000000000000000000000000000000EE
62994+:10D2400000000000000000000000000000000000DE
62995+:10D2500000000000000000000000000000000000CE
62996+:10D2600000000000000000000000000000000000BE
62997+:10D2700000000000000000000000000000000000AE
62998+:10D28000000000000000000000000000000000009E
62999+:10D29000000000000000000000000000000000008E
63000+:10D2A000000000000000000000000000000000007E
63001+:10D2B000000000000000000000000000000000006E
63002+:10D2C000000000000000000000000000000000005E
63003+:10D2D000000000000000000000000000000000004E
63004+:10D2E000000000000000000000000000000000003E
63005+:10D2F000000000000000000000000000000000002E
63006+:10D30000000000000000000000000000000000001D
63007+:10D31000000000000000000000000000000000000D
63008+:10D3200000000000000000000000000000000000FD
63009+:10D3300000000000000000000000000000000000ED
63010+:10D3400000000000000000000000000000000000DD
63011+:10D3500000000000000000000000000000000000CD
63012+:10D3600000000000000000000000000000000000BD
63013+:10D3700000000000000000000000000000000000AD
63014+:10D38000000000000000000000000000000000009D
63015+:10D39000000000000000000000000000000000008D
63016+:10D3A000000000000000000000000000000000007D
63017+:10D3B000000000000000000000000000000000006D
63018+:10D3C000000000000000000000000000000000005D
63019+:10D3D000000000000000000000000000000000004D
63020+:10D3E000000000000000000000000000000000003D
63021+:10D3F000000000000000000000000000000000002D
63022+:10D40000000000000000000000000000000000001C
63023+:10D41000000000000000000000000000000000000C
63024+:10D4200000000000000000000000000000000000FC
63025+:10D4300000000000000000000000000000000000EC
63026+:10D4400000000000000000000000000000000000DC
63027+:10D4500000000000000000000000000000000000CC
63028+:10D4600000000000000000000000000000000000BC
63029+:10D4700000000000000000000000000000000000AC
63030+:10D48000000000000000000000000000000000009C
63031+:10D49000000000000000000000000000000000008C
63032+:10D4A000000000000000000000000000000000007C
63033+:10D4B000000000000000000000000000000000006C
63034+:10D4C000000000000000000000000000000000005C
63035+:10D4D000000000000000000000000000000000004C
63036+:10D4E000000000000000000000000000000000003C
63037+:10D4F000000000000000000000000000000000002C
63038+:10D50000000000000000000000000000000000001B
63039+:10D51000000000000000000000000000000000000B
63040+:10D5200000000000000000000000000000000000FB
63041+:10D5300000000000000000000000000000000000EB
63042+:10D5400000000000000000000000000000000000DB
63043+:10D5500000000000000000000000000000000000CB
63044+:10D5600000000000000000000000000000000000BB
63045+:10D5700000000000000000000000000000000000AB
63046+:10D58000000000000000000000000000000000009B
63047+:10D59000000000000000008000000000000000000B
63048+:10D5A000000000000000000000000000000000007B
63049+:10D5B00000000000000000000000000A0000000061
63050+:10D5C0000000000000000000100000030000000048
63051+:10D5D0000000000D0000000D3C02080024427340D2
63052+:10D5E0003C030800246377CCAC4000000043202BB0
63053+:10D5F0001480FFFD244200043C1D080037BD7FFC61
63054+:10D6000003A0F0213C100800261032103C1C08003A
63055+:10D61000279C73400E0010FE000000000000000D6B
63056+:10D6200030A5FFFF30C600FF274301808F4201B8BD
63057+:10D630000440FFFE24020002AC640000A465000860
63058+:10D64000A066000AA062000B3C021000AC67001844
63059+:10D6500003E00008AF4201B83C0360008C624FF861
63060+:10D660000440FFFE3C020200AC644FC0AC624FC4F9
63061+:10D670003C02100003E00008AC624FF89482000CFA
63062+:10D680002486001400A0382100021302000210803A
63063+:10D690000082402100C8102B1040005700000000FD
63064+:10D6A00090C300002C6200095040005190C200015C
63065+:10D6B000000310803C030800246372F00043102133
63066+:10D6C0008C420000004000080000000090C30001F0
63067+:10D6D0002402000A1462003A000000000106102330
63068+:10D6E0002C42000A1440003624C600028CE20000DE
63069+:10D6F00034420100ACE2000090C2000090C300017F
63070+:10D7000090C4000290C5000300031C000002160034
63071+:10D710000043102500042200004410250045102578
63072+:10D7200024C60004ACE2000490C2000090C30001D3
63073+:10D7300090C4000290C500030002160000031C0004
63074+:10D740000043102500042200004410250045102548
63075+:10D7500024C600040A000CB8ACE2000890C3000123
63076+:10D76000240200041462001624C6000290C20000C5
63077+:10D7700090C400018CE30000000212000044102558
63078+:10D780003463000424C60002ACE2000C0A000CB8AA
63079+:10D79000ACE3000090C300012402000314620008FF
63080+:10D7A00024C600028CE2000090C3000024C60001E1
63081+:10D7B00034420008A0E300100A000CB8ACE20000FC
63082+:10D7C00003E000082402000190C3000124020002CB
63083+:10D7D0001062000224C40002010020210A000CB8DB
63084+:10D7E000008030210A000CB824C6000190C200015C
63085+:10D7F0000A000CB800C2302103E00008000010212C
63086+:10D8000027BDFFE8AFBF0014AFB000100E00130239
63087+:10D8100000808021936200052403FFFE0200202186
63088+:10D82000004310248FBF00148FB00010A3620005C6
63089+:10D830000A00130B27BD001827BDFFE8AFB000108A
63090+:10D84000AFBF00140E000F3C0080802193620000E7
63091+:10D8500024030050304200FF14430004240201005E
63092+:10D86000AF4201800A000D3002002021AF4001804C
63093+:10D87000020020218FBF00148FB000100A000FE7B4
63094+:10D8800027BD001827BDFF80AFBE0078AFB700747A
63095+:10D89000AFB20060AFBF007CAFB60070AFB5006C38
63096+:10D8A000AFB40068AFB30064AFB1005CAFB0005874
63097+:10D8B0008F5001283C0208008C4231A02403FF80D5
63098+:10D8C0009365003F0202102100431024AF42002460
63099+:10D8D0003C0208008C4231A09364000530B200FF86
63100+:10D8E000020210213042007F034218210004202749
63101+:10D8F0003C02000A0062182130840001AF8300144A
63102+:10D900000000F0210000B82114800053AFA00050A7
63103+:10D9100093430116934401128F450104306300FFC5
63104+:10D920003C020001308400FF00A2282403431021A0
63105+:10D9300003441821245640002467400014A001CD60
63106+:10D940002402000193620000304300FF2402002003
63107+:10D950001062000524020050106200060000000062
63108+:10D960000A000D74000000000000000D0A000D7D8B
63109+:10D97000AFA000303C1E080027DE738C0A000D7D2E
63110+:10D98000AFA000303C0208008C4200DC24420001C1
63111+:10D990003C010800AC2200DC0E00139F00000000D8
63112+:10D9A0000A000F318FBF007C8F4201043C0300202E
63113+:10D9B00092D3000D004310240002202B00042140CC
63114+:10D9C000AFA400308F4301043C02004000621824E1
63115+:10D9D000146000023485004000802821326200205B
63116+:10D9E000AFA500301440000234A6008000A0302112
63117+:10D9F00010C0000BAFA6003093C500088F67004C25
63118+:10DA00000200202100052B0034A5008130A5F08103
63119+:10DA10000E000C9B30C600FF0A000F2E0000000015
63120+:10DA20009362003E304200401040000F2402000488
63121+:10DA300056420007240200120200202100E02821A3
63122+:10DA40000E0013F702C030210A000F318FBF007C97
63123+:10DA500016420005000000000E000D2100002021EC
63124+:10DA60000A000F318FBF007C9743011A96C4000E45
63125+:10DA700093620035326500043075FFFF00442004D6
63126+:10DA8000AFA400548ED1000410A000158ED400085D
63127+:10DA90009362003E3042004010400007000000004A
63128+:10DAA0000E0013E0022020211040000D00000000B5
63129+:10DAB0000A000F2E000000008F6200440222102393
63130+:10DAC0000440016A000000008F6200480222102317
63131+:10DAD00004410166240400160A000E218FC20004CE
63132+:10DAE0008F6200480222102304400008000000005A
63133+:10DAF0003C0208008C423100244200013C01080035
63134+:10DB0000AC2231000A000F23000000008F620040A9
63135+:10DB100002221023184000128F8400143C020800D7
63136+:10DB20008C423100327300FC0000A8212442000125
63137+:10DB30003C010800AC2231008F6300409482011C3C
63138+:10DB4000022318233042FFFF0043102A50400010E8
63139+:10DB50002402000C8F6200400A000DF20222102302
63140+:10DB60009483011C9762003C0043102B1040000678
63141+:10DB7000000000009482011C00551023A482011CA7
63142+:10DB80000A000DF72402000CA480011C2402000CE2
63143+:10DB9000AFA200308F620040005120231880000D9A
63144+:10DBA00002A4102A1440012600000000149500066B
63145+:10DBB00002A410233A620001304200011440012007
63146+:10DBC0000000000002A41023022488210A000E098C
63147+:10DBD0003055FFFF00002021326200021040001A81
63148+:10DBE000326200109362003E30420040504000110B
63149+:10DBF0008FC200040E00130202002021240200182C
63150+:10DC0000A362003F936200052403FFFE020020216F
63151+:10DC1000004310240E00130BA362000524040039F6
63152+:10DC2000000028210E0013C9240600180A000F3036
63153+:10DC300024020001240400170040F809000000003D
63154+:10DC40000A000F302402000110400108000000000B
63155+:10DC50008F63004C8F620054028210231C4001032A
63156+:10DC600002831023044200010060A021AFA4001829
63157+:10DC7000AFB10010AFB50014934201208F65004092
63158+:10DC80009763003C304200FF034210210044102102
63159+:10DC90008FA400543063FFFF244240000083182B00
63160+:10DCA0008FA40030AFA20020AFA50028008320255C
63161+:10DCB000AFA40030AFA50024AFA0002CAFB4003457
63162+:10DCC0009362003E30420008504000118FC20000B5
63163+:10DCD00002C0202127A500380E000CB2AFA00038EA
63164+:10DCE0005440000B8FC200008FA200383042010068
63165+:10DCF000504000078FC200008FA3003C8F6200607D
63166+:10DD00000062102304430001AF6300608FC2000073
63167+:10DD10000040F80927A400108FA200303042000212
63168+:10DD200054400001327300FE9362003E30420040D6
63169+:10DD3000104000378FA200248F6200541682001A10
63170+:10DD40003262000124020014124200102A4200151F
63171+:10DD500010400006240200162402000C12420007A4
63172+:10DD6000326200010A000E7D000000001242000530
63173+:10DD7000326200010A000E7D000000000A000E78E9
63174+:10DD80002417000E0A000E78241700100A000E7CDB
63175+:10DD900024170012936200232403FFBD00431024C4
63176+:10DDA000A362002332620001104000198FA20024F8
63177+:10DDB0002402000C1242000E2A42000D1040000600
63178+:10DDC0002402000E2402000A124200078FA200243F
63179+:10DDD0000A000E9524420001124200088FA200247E
63180+:10DDE0000A000E95244200010A000E932417000831
63181+:10DDF0002402000E16E20002241700162417001059
63182+:10DE00008FA2002424420001AFA200248FA200248C
63183+:10DE10008FA300148F76004000431021AF620040B2
63184+:10DE20008F8200149442011C104000090000000081
63185+:10DE30008F6200488F6400409763003C00441023C9
63186+:10DE40003063FFFF0043102A104000088FA20054E7
63187+:10DE5000936400368F6300403402FFFC008210049C
63188+:10DE600000621821AF6300488FA200548FA60030D3
63189+:10DE70000282902130C200081040000E0000000015
63190+:10DE80008F6200581642000430C600FF9742011A04
63191+:10DE90005040000134C6001093C500088FA700341D
63192+:10DEA0000200202100052B0034A500800E000C9BF1
63193+:10DEB00030A5F0808F620040005610231840001BF0
63194+:10DEC0008FA200183C0208008C42319830420010AA
63195+:10DED0001040000D24020001976200681440000AFF
63196+:10DEE000240200018F8200149442011C1440000699
63197+:10DEF00024020001A76200689742007A244200646D
63198+:10DF00000A000EE9A7620012A76200120E001302B7
63199+:10DF1000020020219362007D2403000102002021E1
63200+:10DF2000344200010A000EE7AFA300501840000A77
63201+:10DF3000000000000E001302020020219362007D09
63202+:10DF40002403000102002021AFA30050344200044A
63203+:10DF50000E00130BA362007D9362003E304200402E
63204+:10DF60001440000C326200011040000A0000000062
63205+:10DF70008F6300408FC20004240400182463000152
63206+:10DF80000040F809AF6300408FA200300A000F3054
63207+:10DF9000304200048F620058105200100000000050
63208+:10DFA0008F620018022210231C4000082404000184
63209+:10DFB0008F62001816220009000000008F62001C0A
63210+:10DFC000028210230440000500000000AF720058D8
63211+:10DFD000AFA40050AF710018AF74001C12E0000B2A
63212+:10DFE0008FA200500E00130202002021A377003FF1
63213+:10DFF0000E00130B0200202102E030212404003720
63214+:10E000000E0013C9000028218FA200501040000309
63215+:10E01000000000000E000CA90200202112A0000543
63216+:10E02000000018218FA2003030420004504000113F
63217+:10E0300000601021240300010A000F30006010214D
63218+:10E040000E001302020020219362007D02002021B5
63219+:10E05000344200040E00130BA362007D0E000CA9D5
63220+:10E06000020020210A000F3024020001AF400044CA
63221+:10E07000240200018FBF007C8FBE00788FB7007430
63222+:10E080008FB600708FB5006C8FB400688FB30064DA
63223+:10E090008FB200608FB1005C8FB0005803E00008C1
63224+:10E0A00027BD00808F4201B80440FFFE2402080013
63225+:10E0B000AF4201B803E00008000000003C02000885
63226+:10E0C00003421021944200483084FFFF2484001250
63227+:10E0D0003045FFFF10A0001700A4102B10400016C1
63228+:10E0E00024020003934201202403001AA343018B5E
63229+:10E0F000304200FF2446FFFE8F82000000A6182B4E
63230+:10E100003863000100021382004310241040000510
63231+:10E110008F84000434820001A746019403E00008C4
63232+:10E12000AF8200042402FFFE0082102403E00008F6
63233+:10E13000AF8200042402000303E00008A342018B25
63234+:10E1400027BDFFE0AFB10014AFB00010AFBF0018A3
63235+:10E1500030B0FFFF30D1FFFF8F4201B80440FFFE17
63236+:10E1600000000000AF440180AF4400200E000F42C9
63237+:10E17000020020218F8300008F840004A750019AA1
63238+:10E18000A750018EA74301908F8300083082800042
63239+:10E19000AF4301A8A75101881040000E8F820004F0
63240+:10E1A00093420116304200FC24420004005A102120
63241+:10E1B0008C4240003042FFFF144000068F82000472
63242+:10E1C0003C02FFFF34427FFF00821024AF82000434
63243+:10E1D0008F8200042403BFFF00431024A74201A63E
63244+:10E1E0009743010C8F42010400031C003042FFFFE3
63245+:10E1F00000621825AF4301AC3C021000AF4201B8E9
63246+:10E200008FBF00188FB100148FB0001003E000081A
63247+:10E2100027BD00208F470070934201128F830000BA
63248+:10E2200027BDFFF0304200FF00022882306201006B
63249+:10E23000000030211040004324A40003306240005D
63250+:10E24000104000103062200000041080005A10219D
63251+:10E250008C43400024A4000400041080AFA30000FD
63252+:10E26000005A10218C424000AFA2000493420116D4
63253+:10E27000304200FC005A10218C4240000A000FC0BE
63254+:10E28000AFA200081040002F0000302100041080D1
63255+:10E29000005A10218C43400024A400040004108084
63256+:10E2A000AFA30000005A10218C424000AFA000082C
63257+:10E2B000AFA200048FA80008000030210000202138
63258+:10E2C000240A00083C0908002529010003A41021A4
63259+:10E2D000148A000300042A001100000A0000000054
63260+:10E2E00090420000248400012C83000C00A2102125
63261+:10E2F00000021080004910218C4200001460FFF3DE
63262+:10E3000000C230263C0408008C8431048F42007027
63263+:10E310002C83002010600009004738233C030800CC
63264+:10E32000246331080004108000431021248300017D
63265+:10E33000AC4700003C010800AC233104AF86000864
63266+:10E340002406000100C0102103E0000827BD0010D2
63267+:10E350003C0208008C42003827BDFFD0AFB5002436
63268+:10E36000AFB40020AFB10014AFBF0028AFB3001CA2
63269+:10E37000AFB20018AFB00010000088213C150800B3
63270+:10E3800026B50038144000022454FFFF0000A021ED
63271+:10E390009742010E8F8400003042FFFF308340001F
63272+:10E3A0001060000A245200043C0200200082102465
63273+:10E3B00050400007308280008F8200042403BFFF9A
63274+:10E3C000008318240A0010103442100030828000AC
63275+:10E3D0001040000A3C020020008210241040000778
63276+:10E3E0008F8200043C03FFFF34637FFF0083182407
63277+:10E3F00034428000AF820004AF8300000E000F980B
63278+:10E400000000000014400007000000009743011EB8
63279+:10E410009742011C3063FFFF0002140000621825C0
63280+:10E42000AF8300089742010C8F4340003045FFFF47
63281+:10E430003402FFFF14620003000000000A001028ED
63282+:10E44000241100208F42400030420100544000015E
63283+:10E45000241100108F8400003082100050400014FE
63284+:10E4600036310001308200201440000B3C021000C5
63285+:10E47000008210245040000E363100013C030E0093
63286+:10E480003C020DFF008318243442FFFF0043102B91
63287+:10E4900050400007363100013C0208008C42002C3D
63288+:10E4A000244200013C010800AC22002C363100055A
63289+:10E4B0003C0608008CC6003454C000238F85000041
63290+:10E4C0008F820004304240005440001F8F850000BE
63291+:10E4D0003C021F01008210243C0310005443001A28
63292+:10E4E0008F85000030A20200144000178F850000C5
63293+:10E4F0003250FFFF363100028F4201B80440FFFE68
63294+:10E5000000000000AF400180020020210E000F42F9
63295+:10E51000AF4000208F8300042402BFFFA750019A60
63296+:10E52000006218248F820000A750018EA751018835
63297+:10E53000A74301A6A74201903C021000AF4201B8D8
63298+:10E540000A0010F5000010213C02100000A2102467
63299+:10E550001040003A0000000010C0000F0000000052
63300+:10E5600030A201001040000C3C0302003C020F00EE
63301+:10E5700000A2102410430008000000008F82000851
63302+:10E58000005410240055102190420004244200043D
63303+:10E590000A00109F000221C00000000000051602C2
63304+:10E5A0003050000F3A0300022E4203EF38420001C0
63305+:10E5B0002C6300010062182414600073240200011F
63306+:10E5C0003C0308008C6300D02E06000C386200016A
63307+:10E5D0002C4200010046102414400015001021C0F8
63308+:10E5E0002602FFFC2C4200045440001100002021B0
63309+:10E5F000386200022C420001004610241040000343
63310+:10E60000000512420A00109F000020210010182B64
63311+:10E610000043102450400006001021C000002021BB
63312+:10E620003245FFFF0E000F633226FFFB001021C0B2
63313+:10E630003245FFFF0A0010F2362600028F424000EA
63314+:10E640003C0308008C630024304201001040004667
63315+:10E6500030620001322200043070000D14400002CC
63316+:10E660002413000424130002000512C238420001E2
63317+:10E670002E4303EF304200013863000100431025B0
63318+:10E68000104000033231FFFB2402FFFB0202802412
63319+:10E6900010C000183202000130A201001040001525
63320+:10E6A000320200013C020F0000A210243C030200D1
63321+:10E6B0001043000F8F8200082403FFFE0203802412
63322+:10E6C00000541024005510219042000402333025DC
63323+:10E6D0002442000412000002000221C03226FFFF83
63324+:10E6E0000E000F633245FFFF1200002700001021CB
63325+:10E6F000320200011040000D320200042402000129
63326+:10E7000012020002023330253226FFFF00002021D2
63327+:10E710000E000F633245FFFF2402FFFE0202802439
63328+:10E7200012000019000010213202000410400016EF
63329+:10E7300024020001240200041202000202333025E8
63330+:10E740003226FFFF3245FFFF0E000F632404010055
63331+:10E750002402FFFB020280241200000B00001021A3
63332+:10E760000A0010F5240200011040000700001021EB
63333+:10E770003245FFFF36260002000020210E000F6305
63334+:10E7800000000000000010218FBF00288FB500247A
63335+:10E790008FB400208FB3001C8FB200188FB100140B
63336+:10E7A0008FB0001003E0000827BD003027BDFFD068
63337+:10E7B000AFB000103C04600CAFBF002CAFB6002817
63338+:10E7C000AFB50024AFB40020AFB3001CAFB2001847
63339+:10E7D000AFB100148C8250002403FF7F3C1A8000EC
63340+:10E7E000004310243442380CAC8250002402000351
63341+:10E7F0003C106000AF4200088E0208083C1B8008F5
63342+:10E800003C010800AC2000203042FFF038420010EC
63343+:10E810002C4200010E001B8DAF8200183C04FFFF4C
63344+:10E820003C020400348308063442000CAE0219484E
63345+:10E83000AE03194C3C0560168E0219808CA30000B3
63346+:10E840003442020000641824AE0219803C02535383
63347+:10E850001462000334A47C008CA200040050202128
63348+:10E860008C82007C8C830078AF820010AF83000C18
63349+:10E870008F55000032A200031040FFFD32A20001BC
63350+:10E880001040013D32A200028F420128AF42002019
63351+:10E890008F4201048F430100AF8200000E000F3C45
63352+:10E8A000AF8300043C0208008C4200C01040000806
63353+:10E8B0008F8400003C0208008C4200C42442000106
63354+:10E8C0003C010800AC2200C40A00126900000000EC
63355+:10E8D0003C020010008210241440010C8F830004BD
63356+:10E8E0003C0208008C4200203C0308008C63003886
63357+:10E8F00000008821244200013C010800AC220020D5
63358+:10E900003C16080026D60038146000022474FFFF6D
63359+:10E910000000A0219742010E308340003042FFFFEB
63360+:10E920001060000A245200043C02002000821024DF
63361+:10E9300050400007308280008F8200042403BFFF14
63362+:10E94000008318240A0011703442100030828000C5
63363+:10E950001040000A3C0200200082102410400007F2
63364+:10E960008F8200043C03FFFF34637FFF0083182481
63365+:10E9700034428000AF820004AF8300000E000F9885
63366+:10E980000000000014400007000000009743011E33
63367+:10E990009742011C3063FFFF00021400006218253B
63368+:10E9A000AF8300089742010C8F4340003045FFFFC2
63369+:10E9B0003402FFFF14620003000000000A00118807
63370+:10E9C000241100208F4240003042010054400001D9
63371+:10E9D000241100108F840000308210005040001479
63372+:10E9E00036310001308200201440000B3C02100040
63373+:10E9F000008210245040000E363100013C030E000E
63374+:10EA00003C020DFF008318243442FFFF0043102B0B
63375+:10EA100050400007363100013C0208008C42002CB7
63376+:10EA2000244200013C010800AC22002C36310005D4
63377+:10EA30003C0608008CC6003454C000238F850000BB
63378+:10EA40008F820004304240005440001F8F85000038
63379+:10EA50003C021F01008210243C0310005443001AA2
63380+:10EA60008F85000030A20200144000178F8500003F
63381+:10EA70003250FFFF363100028F4201B80440FFFEE2
63382+:10EA800000000000AF400180020020210E000F4274
63383+:10EA9000AF4000208F8300042402BFFFA750019ADB
63384+:10EAA000006218248F820000A750018EA7510188B0
63385+:10EAB000A74301A6A74201903C021000AF4201B853
63386+:10EAC0000A001267000010213C02100000A210246E
63387+:10EAD0001040003A0000000010C0000F00000000CD
63388+:10EAE00030A201001040000C3C0302003C020F0069
63389+:10EAF00000A2102410430008000000008F820008CC
63390+:10EB000000541024005610219042000424420004B6
63391+:10EB10000A0011FF000221C00000000000051602DB
63392+:10EB20003050000F3A0300022E4203EF384200013A
63393+:10EB30002C63000100621824146000852402000187
63394+:10EB40003C0308008C6300D02E06000C38620001E4
63395+:10EB50002C4200010046102414400015001021C072
63396+:10EB60002602FFFC2C42000454400011000020212A
63397+:10EB7000386200022C42000100461024504000037D
63398+:10EB8000000512420A0011FF000020210010182B7E
63399+:10EB90000043102450400006001021C00000202136
63400+:10EBA0003245FFFF0E000F633226FFFB001021C02D
63401+:10EBB0003245FFFF0A001252362600028F42400003
63402+:10EBC0003C0308008C6300243042010010400046E2
63403+:10EBD00030620001322200043070000D1440000247
63404+:10EBE0002413000424130002000512C2384200015D
63405+:10EBF0002E4303EF3042000138630001004310252B
63406+:10EC0000104000033231FFFB2402FFFB020280248C
63407+:10EC100010C000183202000130A20100104000159F
63408+:10EC2000320200013C020F0000A210243C0302004B
63409+:10EC30001043000F8F8200082403FFFE020380248C
63410+:10EC40000054102400561021904200040233302555
63411+:10EC50002442000412000002000221C03226FFFFFD
63412+:10EC60000E000F633245FFFF120000390000102133
63413+:10EC7000320200011040000D3202000424020001A3
63414+:10EC800012020002023330253226FFFF000020214D
63415+:10EC90000E000F633245FFFF2402FFFE02028024B4
63416+:10ECA0001200002B00001021320200041040002846
63417+:10ECB0002402000124020004120200020233302563
63418+:10ECC0003226FFFF3245FFFF0E000F6324040100D0
63419+:10ECD0002402FFFB020280241200001D000010210C
63420+:10ECE0000A001267240200015040001900001021A0
63421+:10ECF0003245FFFF36260002000020210E000F6380
63422+:10ED0000000000000A001267000010212402BFFF6B
63423+:10ED1000006210241040000800000000240287FF59
63424+:10ED200000621024144000083C020060008210249D
63425+:10ED300010400005000000000E000D34000000002F
63426+:10ED40000A001267000000000E0012C70000000059
63427+:10ED5000104000063C0240008F4301243C0260202A
63428+:10ED6000AC430014000000003C024000AF420138F8
63429+:10ED70000000000032A200021040FEBD00000000B2
63430+:10ED80008F4201403C044000AF4200208F430148C5
63431+:10ED90003C02700000621824106400420000000071
63432+:10EDA0000083102B144000063C0260003C0220004F
63433+:10EDB000106200073C0240000A0012C3000000007D
63434+:10EDC0001062003C3C0240000A0012C30000000038
63435+:10EDD0008F4501408F4601448F42014800021402D2
63436+:10EDE000304300FF240200041462000A274401801B
63437+:10EDF0008F4201B80440FFFE2402001CAC850000D5
63438+:10EE0000A082000B3C021000AF4201B80A0012C3FE
63439+:10EE10003C0240002402000914620012000616029F
63440+:10EE2000000229C0AF4500208F4201B80440FFFE18
63441+:10EE30002402000124030003AF450180A343018B9A
63442+:10EE4000A740018EA740019AA7400190AF4001A8BA
63443+:10EE5000A7420188A74201A6AF4001AC3C021000C6
63444+:10EE6000AF4201B88F4201B80440FFFE000000002D
63445+:10EE7000AC8500008F42014800021402A482000801
63446+:10EE800024020002A082000B8F420148A4820010DD
63447+:10EE90003C021000AC860024AF4201B80A0012C345
63448+:10EEA0003C0240000E001310000000000A0012C3D4
63449+:10EEB0003C0240000E001BC2000000003C0240006B
63450+:10EEC000AF420178000000000A00112F000000008E
63451+:10EED0008F4201003042003E144000112402000124
63452+:10EEE000AF4000488F420100304207C0104000058B
63453+:10EEF00000000000AF40004CAF40005003E00008AD
63454+:10EF000024020001AF400054AF4000408F42010096
63455+:10EF10003042380054400001AF4000442402000158
63456+:10EF200003E00008000000008F4201B80440FFFE2B
63457+:10EF300024020001AF440180AF400184A74501884D
63458+:10EF4000A342018A24020002A342018B9742014A94
63459+:10EF500014C00004A7420190AF4001A40A0012EFC0
63460+:10EF60003C0210008F420144AF4201A43C02100059
63461+:10EF7000AF4001A803E00008AF4201B88F4201B8DA
63462+:10EF80000440FFFE24020002AF440180AF4401842C
63463+:10EF9000A7450188A342018AA342018B9742014AF7
63464+:10EFA000A7420190AF4001A48F420144AF4201A8A3
63465+:10EFB0003C02100003E00008AF4201B83C029000A0
63466+:10EFC0003442000100822025AF4400208F420020FF
63467+:10EFD0000440FFFE0000000003E000080000000005
63468+:10EFE0003C028000344200010082202503E000083A
63469+:10EFF000AF44002027BDFFE8AFBF0014AFB0001042
63470+:10F000008F50014093430149934201489344014882
63471+:10F01000306300FF304200FF00021200006228252A
63472+:10F020002402001910620076308400802862001AE1
63473+:10F030001040001C24020020240200081062007707
63474+:10F04000286200091040000E2402000B2402000177
63475+:10F0500010620034286200025040000524020006BD
63476+:10F0600050600034020020210A00139A00000000C2
63477+:10F0700010620030020020210A00139A00000000F4
63478+:10F080001062003B2862000C504000022402000E77
63479+:10F090002402000910620056020020210A00139A7F
63480+:10F0A0000000000010620056286200211040000F8E
63481+:10F0B000240200382402001C106200582862001D3F
63482+:10F0C000104000062402001F2402001B1062004CA6
63483+:10F0D000000000000A00139A000000001062004ABD
63484+:10F0E000020020210A00139A00000000106200456F
63485+:10F0F0002862003910400007240200802462FFCB00
63486+:10F100002C42000210400045020020210A00139604
63487+:10F110000000302110620009000000000A00139A6C
63488+:10F12000000000001480003D020020210A0013901E
63489+:10F130008FBF00140A001396240600018F4201B805
63490+:10F140000440FFFE24020002A342018BA745018870
63491+:10F150009742014AA74201908F420144A74201927F
63492+:10F160003C021000AF4201B80A00139C8FBF00148C
63493+:10F170009742014A144000290000000093620005F4
63494+:10F180003042000414400025000000000E0013026D
63495+:10F190000200202193620005020020213442000475
63496+:10F1A0000E00130BA36200059362000530420004B9
63497+:10F1B00014400002000000000000000D93620000F7
63498+:10F1C00024030020304200FF14430014000000001C
63499+:10F1D0008F4201B80440FFFE24020005AF500180B9
63500+:10F1E000A342018B3C0210000A00139AAF4201B8FF
63501+:10F1F0008FBF00148FB000100A0012F227BD001854
63502+:10F200000000000D02002021000030218FBF0014FB
63503+:10F210008FB000100A0012DD27BD00180000000D9D
63504+:10F220008FBF00148FB0001003E0000827BD001846
63505+:10F2300027BDFFE8AFBF00100E000F3C000000002C
63506+:10F24000AF4001808FBF0010000020210A000FE7AF
63507+:10F2500027BD00183084FFFF30A5FFFF00001821F4
63508+:10F260001080000700000000308200011040000202
63509+:10F2700000042042006518210A0013AB0005284055
63510+:10F2800003E000080060102110C0000624C6FFFF44
63511+:10F290008CA2000024A50004AC8200000A0013B573
63512+:10F2A0002484000403E000080000000010A000080F
63513+:10F2B00024A3FFFFAC860000000000000000000057
63514+:10F2C0002402FFFF2463FFFF1462FFFA248400047A
63515+:10F2D00003E0000800000000308300FF30A500FFBD
63516+:10F2E00030C600FF274701808F4201B80440FFFE6F
63517+:10F2F000000000008F42012834634000ACE20000AF
63518+:10F3000024020001ACE00004A4E30008A0E2000A2B
63519+:10F3100024020002A0E2000B3C021000A4E5001051
63520+:10F32000ACE00024ACE00028A4E6001203E00008F2
63521+:10F33000AF4201B827BDFFE8AFBF00109362003FA6
63522+:10F3400024030012304200FF1043000D00803021E2
63523+:10F350008F620044008210230440000A8FBF001017
63524+:10F360008F620048240400390000282100C21023C5
63525+:10F3700004410004240600120E0013C9000000001E
63526+:10F380008FBF00102402000103E0000827BD001811
63527+:10F3900027BDFFC8AFB20030AFB1002CAFBF003403
63528+:10F3A000AFB0002890C5000D0080902130A400105F
63529+:10F3B0001080000B00C088218CC300088F620054AD
63530+:10F3C0001062000730A20005144000B524040001BB
63531+:10F3D0000E000D21000020210A0014BB0040202156
63532+:10F3E00030A200051040000930A30012108000ACCC
63533+:10F3F000240400018E2300088F620054146200A9C7
63534+:10F400008FBF00340A00142C240400382402001298
63535+:10F41000146200A3240400010220202127A500106B
63536+:10F420000E000CB2AFA000101040001102402021CD
63537+:10F430008E220008AF620084AF6000400E0013020D
63538+:10F44000000000009362007D024020213442002031
63539+:10F450000E00130BA362007D0E000CA902402021B8
63540+:10F46000240400382405008D0A0014B82406001274
63541+:10F470009362003E304200081040000F8FA200103F
63542+:10F4800030420100104000078FA300148F6200601B
63543+:10F490000062102304430008AF6300600A001441B7
63544+:10F4A00000000000AF6000609362003E2403FFF79D
63545+:10F4B00000431024A362003E9362003E30420008E5
63546+:10F4C000144000022406000300003021936200343F
63547+:10F4D000936300378F640084304200FF306300FF85
63548+:10F4E00000661821000318800043282100A4202B67
63549+:10F4F0001080000B000000009763003C8F620084C6
63550+:10F500003063FFFF004510230062182B14600004D5
63551+:10F51000000000008F6200840A00145D0045802313
63552+:10F520009762003C3050FFFF8FA300103062000450
63553+:10F5300010400004000628808FA2001C0A001465F9
63554+:10F540000202102B2E02021850400003240202185F
63555+:10F550000A00146E020510233063000410600003DB
63556+:10F56000004510238FA2001C00451023004080217D
63557+:10F570002C42008054400001241000800E00130231
63558+:10F580000240202124020001AF62000C9362003E81
63559+:10F59000001020403042007FA362003E8E22000413
63560+:10F5A00024420001AF620040A770003C8F6200500F
63561+:10F5B0009623000E00431021AF6200588F62005066
63562+:10F5C00000441021AF62005C8E220004AF6200187C
63563+:10F5D0008E220008AF62001C8FA20010304200088B
63564+:10F5E0005440000A93A20020A360003693620036C4
63565+:10F5F0002403FFDFA36200359362003E0043102422
63566+:10F60000A362003E0A0014988E220008A36200350F
63567+:10F610008E220008AF62004C8F6200248F6300408E
63568+:10F6200000431021AF6200489362000024030050A1
63569+:10F63000304200FF144300122403FF803C02080004
63570+:10F640008C4231A00242102100431024AF42002816
63571+:10F650003C0208008C4231A08E2400083C03000CC0
63572+:10F66000024210213042007F03421021004310214A
63573+:10F67000AC4400D88E230008AF820014AC4300DCF9
63574+:10F680000E00130B02402021240400380000282122
63575+:10F690002406000A0E0013C9000000002404000123
63576+:10F6A0008FBF00348FB200308FB1002C8FB0002894
63577+:10F6B0000080102103E0000827BD003827BDFFF8B7
63578+:10F6C00027420180AFA20000308A00FF8F4201B8BC
63579+:10F6D0000440FFFE000000008F4601283C020800A5
63580+:10F6E0008C4231A02403FF80AF86004800C2102165
63581+:10F6F00000431024AF4200243C0208008C4231A099
63582+:10F700008FA900008FA8000000C210213042007FA6
63583+:10F71000034218213C02000A00621821946400D4BC
63584+:10F720008FA700008FA5000024020002AF83001401
63585+:10F73000A0A2000B8FA30000354260003084FFFFC1
63586+:10F74000A4E200083C021000AD260000AD04000455
63587+:10F75000AC60002427BD0008AF4201B803E00008F8
63588+:10F76000240200018F88003C938200288F830014BC
63589+:10F770003C07080024E7779800481023304200FF38
63590+:10F78000304900FC246500888F860040304A000321
63591+:10F790001120000900002021248200048CA3000015
63592+:10F7A000304400FF0089102AACE3000024A50004C7
63593+:10F7B0001440FFF924E70004114000090000202153
63594+:10F7C0002482000190A30000304400FF008A102B27
63595+:10F7D000A0E3000024A500011440FFF924E7000184
63596+:10F7E00030C20003144000048F85003C3102000346
63597+:10F7F0001040000D0000000010A0000900002021B2
63598+:10F800002482000190C30000304400FF0085102BCB
63599+:10F81000A0E3000024C600011440FFF924E7000122
63600+:10F8200003E00008000000001100FFFD000020219F
63601+:10F83000248200048CC30000304400FF0088102B99
63602+:10F84000ACE3000024C600041440FFF924E70004E0
63603+:10F8500003E00008000000008F83003C9382002832
63604+:10F8600030C600FF30A500FF00431023304300FFE7
63605+:10F870008F820014008038210043102114C0000240
63606+:10F88000244800880083382130E20003144000053A
63607+:10F8900030A2000314400003306200031040000D4A
63608+:10F8A0000000000010A000090000202124820001B7
63609+:10F8B00090E30000304400FF0085102BA1030000FE
63610+:10F8C00024E700011440FFF92508000103E00008C7
63611+:10F8D0000000000010A0FFFD000020212482000491
63612+:10F8E0008CE30000304400FF0085102BAD030000C6
63613+:10F8F00024E700041440FFF92508000403E0000891
63614+:10F90000000000000080482130AAFFFF30C600FF41
63615+:10F9100030E7FFFF274801808F4201B80440FFFE17
63616+:10F920008F820048AD0200008F420124AD02000426
63617+:10F930008D220020A5070008A102000A240200165B
63618+:10F94000A102000B934301208D2200088D240004A6
63619+:10F95000306300FF004310219783003A00441021D8
63620+:10F960008D250024004310233C0308008C6331A044
63621+:10F970008F840014A502000C246300E82402FFFF1A
63622+:10F98000A50A000EA5030010A5060012AD0500187B
63623+:10F99000AD020024948201142403FFF73042FFFFDC
63624+:10F9A000AD0200288C820118AD02002C3C02100030
63625+:10F9B000AD000030AF4201B88D220020004310247A
63626+:10F9C00003E00008AD2200208F82001430E7FFFF23
63627+:10F9D00000804821904200D330A5FFFF30C600FFD1
63628+:10F9E0000002110030420F0000E238252748018054
63629+:10F9F0008F4201B80440FFFE8F820048AD02000034
63630+:10FA00008F420124AD0200048D220020A5070008CA
63631+:10FA1000A102000A24020017A102000B9343012057
63632+:10FA20008D2200088D240004306300FF0043102164
63633+:10FA30009783003A004410218F8400140043102360
63634+:10FA40003C0308008C6331A0A502000CA505000E44
63635+:10FA5000246300E8A5030010A5060012AD00001401
63636+:10FA60008D220024AD0200188C82005CAD02001CC7
63637+:10FA70008C820058AD0200202402FFFFAD0200245A
63638+:10FA8000948200E63042FFFFAD02002894820060BD
63639+:10FA9000948300BE30427FFF3063FFFF00021200FC
63640+:10FAA00000431021AD02002C3C021000AD000030DC
63641+:10FAB000AF4201B8948200BE2403FFF700A21021D8
63642+:10FAC000A48200BE8D2200200043102403E0000821
63643+:10FAD000AD220020274301808F4201B80440FFFE81
63644+:10FAE0008F8200249442001C3042FFFF000211C0AC
63645+:10FAF000AC62000024020019A062000B3C0210005E
63646+:10FB0000AC60003003E00008AF4201B88F87002CE2
63647+:10FB100030C300FF8F4201B80440FFFE8F820048CF
63648+:10FB200034636000ACA2000093820044A0A20005F0
63649+:10FB30008CE20010A4A20006A4A300088C8200207E
63650+:10FB40002403FFF7A0A2000A24020002A0A2000BD7
63651+:10FB50008CE20000ACA200108CE20004ACA2001405
63652+:10FB60008CE2001CACA200248CE20020ACA2002895
63653+:10FB70008CE2002CACA2002C8C820024ACA20018D9
63654+:10FB80003C021000AF4201B88C82002000431024D8
63655+:10FB900003E00008AC8200208F86001427BDFFE838
63656+:10FBA000AFBF0014AFB0001090C20063304200201D
63657+:10FBB0001040000830A500FF8CC2007C2403FFDF4A
63658+:10FBC00024420001ACC2007C90C2006300431024B8
63659+:10FBD000A0C2006310A000238F830014275001806F
63660+:10FBE000020028210E0015D6240600828F82001400
63661+:10FBF000904200633042004050400019A38000440E
63662+:10FC00008F83002C8F4201B80440FFFE8F82004892
63663+:10FC1000AE02000024026082A60200082402000254
63664+:10FC2000A202000B8C620008AE0200108C62000C75
63665+:10FC3000AE0200148C620014AE0200188C62001830
63666+:10FC4000AE0200248C620024AE0200288C620028E0
63667+:10FC5000AE02002C3C021000AF4201B8A380004469
63668+:10FC60008F8300148FBF00148FB000109062006368
63669+:10FC700027BD00183042007FA06200639782003ADF
63670+:10FC80008F86003C8F850014938300280046102344
63671+:10FC9000A782003AA4A000E490A400638F820040F1
63672+:10FCA000AF83003C2403FFBF0046102100832024C3
63673+:10FCB000AF820040A0A400638F820014A04000BD6A
63674+:10FCC0008F82001403E00008A44000BE8F8A001455
63675+:10FCD00027BDFFE0AFB10014AFB000108F88003C2B
63676+:10FCE000AFBF00189389001C954200E430D100FF9B
63677+:10FCF0000109182B0080802130AC00FF3047FFFF46
63678+:10FD00000000582114600003310600FF012030215B
63679+:10FD1000010958239783003A0068102B1440003CD7
63680+:10FD20000000000014680007240200018E02002079
63681+:10FD30002403FFFB34E7800000431024AE020020C0
63682+:10FD40002402000134E70880158200053165FFFFB9
63683+:10FD50000E001554020020210A00169102002021F5
63684+:10FD60000E001585020020218F8400482743018062
63685+:10FD70008F4201B80440FFFE24020018AC6400006A
63686+:10FD8000A062000B8F840014948200E6A46200102D
63687+:10FD90003C021000AC600030AF4201B894820060B9
63688+:10FDA00024420001A4820060948200603C030800A9
63689+:10FDB0008C63318830427FFF5443000F02002021C2
63690+:10FDC000948200602403800000431024A482006019
63691+:10FDD0009082006090830060304200FF000211C2F8
63692+:10FDE00000021027000211C03063007F0062182556
63693+:10FDF000A083006002002021022028218FBF00186C
63694+:10FE00008FB100148FB000100A0015F927BD002033
63695+:10FE1000914200632403FF8000431025A142006348
63696+:10FE20009782003A3048FFFF110000209383001CA6
63697+:10FE30008F840014004B1023304600FF948300E4AD
63698+:10FE40002402EFFF0168282B00621824A48300E439
63699+:10FE500014A000038E020020010058210000302170
63700+:10FE60002403FFFB34E7800000431024AE0200208F
63701+:10FE700024020001158200053165FFFF0E001554B4
63702+:10FE8000020020210A0016B99783003A0E0015855A
63703+:10FE9000020020219783003A8F82003CA780003A1D
63704+:10FEA00000431023AF82003C9383001C8F82001418
63705+:10FEB0008FBF00188FB100148FB0001027BD002035
63706+:10FEC00003E00008A04300BD938200442403000126
63707+:10FED00027BDFFE8004330042C420020AFB00010E3
63708+:10FEE000AFBF00142410FFFE10400005274501801D
63709+:10FEF0003C0208008C4231900A0016D600461024BD
63710+:10FF00003C0208008C423194004610241440000743
63711+:10FF1000240600848F8300142410FFFF9062006287
63712+:10FF20003042000F34420040A06200620E0015D63D
63713+:10FF300000000000020010218FBF00148FB00010DD
63714+:10FF400003E0000827BD00188F83002427BDFFE0D1
63715+:10FF5000AFB20018AFB10014AFB00010AFBF001CBB
63716+:10FF60009062000D00A0902130D100FF3042007F50
63717+:10FF7000A062000D8F8500148E4300180080802140
63718+:10FF80008CA2007C146200052402000E90A2006383
63719+:10FF9000344200200A0016FFA0A200630E0016C51E
63720+:10FFA000A38200442403FFFF104300472404FFFF03
63721+:10FFB00052200045000020218E4300003C0200102A
63722+:10FFC00000621024504000043C020008020020217E
63723+:10FFD0000A00170E24020015006210245040000988
63724+:10FFE0008E45000002002021240200140E0016C5D8
63725+:10FFF000A38200442403FFFF104300332404FFFFC7
63726+:020000021000EC
63727+:100000008E4500003C02000200A2102410400016A1
63728+:100010003C0200048F8600248CC200148CC30010A4
63729+:100020008CC40014004310230044102B50400005E2
63730+:10003000020020218E43002C8CC2001010620003AD
63731+:10004000020020210A00173F240200123C02000493
63732+:1000500000A210245040001C00002021020020219A
63733+:100060000A00173F2402001300A2102410400006CB
63734+:100070008F8300248C620010504000130000202168
63735+:100080000A001739020020218C6200105040000441
63736+:100090008E42002C020020210A00173F240200118A
63737+:1000A00050400009000020210200202124020017F6
63738+:1000B0000E0016C5A38200442403FFFF1043000274
63739+:1000C0002404FFFF000020218FBF001C8FB2001806
63740+:1000D0008FB100148FB000100080102103E00008E1
63741+:1000E00027BD00208F83001427BDFFD8AFB40020A8
63742+:1000F000AFB3001CAFB20018AFB10014AFB0001026
63743+:10010000AFBF0024906200638F91002C2412FFFF88
63744+:100110003442004092250000A06200638E2200104D
63745+:100120000080982130B0003F105200060360A021EB
63746+:100130002402000D0E0016C5A38200441052005484
63747+:100140002404FFFF8F8300148E2200188C63007C30
63748+:1001500010430007026020212402000E0E0016C585
63749+:10016000A38200442403FFFF104300492404FFFF3F
63750+:1001700024040020120400048F83001490620063A2
63751+:1001800034420020A06200638F85003410A000205C
63752+:1001900000000000560400048F8200140260202139
63753+:1001A0000A0017902402000A9683000A9442006015
63754+:1001B0003042FFFF144300048F8200202404FFFD1F
63755+:1001C0000A0017B7AF82003C3C0208008C42318C19
63756+:1001D0000045102B14400006026020210000282159
63757+:1001E0000E001646240600010A0017B70000202161
63758+:1001F0002402002D0E0016C5A38200442403FFFF35
63759+:10020000104300232404FFFF0A0017B70000202139
63760+:10021000160400058F8400148E2300142402FFFFAF
63761+:100220005062001802602021948200602442000184
63762+:10023000A4820060948200603C0308008C633188D3
63763+:1002400030427FFF5443000F0260202194820060FF
63764+:100250002403800000431024A48200609082006088
63765+:1002600090830060304200FF000211C2000210279C
63766+:10027000000211C03063007F00621825A083006077
63767+:10028000026020210E0015F9240500010000202144
63768+:100290008FBF00248FB400208FB3001C8FB20018D2
63769+:1002A0008FB100148FB000100080102103E000080F
63770+:1002B00027BD00288F83001427BDFFE8AFB00010D2
63771+:1002C000AFBF0014906200638F87002C00808021F4
63772+:1002D000344200408CE60010A06200633C0308003A
63773+:1002E0008C6331B030C23FFF0043102B1040004EF2
63774+:1002F0008F8500302402FF8090A3000D004310245E
63775+:10030000304200FF504000490200202100061382C5
63776+:10031000304800032402000255020044020020215C
63777+:1003200094A2001C8F85001424030023A4A20114AE
63778+:100330008CE60000000616023042003F1043001019
63779+:100340003C0300838CE300188CA2007C1062000642
63780+:100350002402000E0E0016C5A38200442403FFFFF2
63781+:10036000104300382404FFFF8F8300149062006361
63782+:1003700034420020A06200630A0017FC8F8300242F
63783+:1003800000C31024144300078F83002490A200624E
63784+:100390003042000F34420020A0A20062A38800383F
63785+:1003A0008F8300249062000D3042007FA062000D18
63786+:1003B0008F83003410600018020020218F840030E9
63787+:1003C0008C8200100043102B1040000924020018FA
63788+:1003D000020020210E0016C5A38200442403FFFF63
63789+:1003E000104300182404FFFF0A00182400002021F5
63790+:1003F0008C820010240500010200202100431023FC
63791+:100400008F830024240600010E001646AC62001003
63792+:100410000A001824000020210E0015F9240500010F
63793+:100420000A00182400002021020020212402000DCF
63794+:100430008FBF00148FB0001027BD00180A0016C52A
63795+:10044000A38200448FBF00148FB0001000801021E1
63796+:1004500003E0000827BD001827BDFFC8AFB2002089
63797+:10046000AFBF0034AFB60030AFB5002CAFB400283A
63798+:10047000AFB30024AFB1001CAFB000188F46012805
63799+:100480003C0308008C6331A02402FF80AF86004843
63800+:1004900000C318213065007F03452821006218241D
63801+:1004A0003C02000AAF43002400A2282190A200626F
63802+:1004B00000809021AF850014304200FF000211023D
63803+:1004C000A382003890A200BC304200021440000217
63804+:1004D00024030034240300308F820014A3830028F7
63805+:1004E000938300388C4200C0A3800044AF82003C5C
63806+:1004F000240200041062031C8F84003C8E4400041C
63807+:10050000508003198F84003C8E4200103083FFFF1F
63808+:10051000A784003A106002FFAF8200408F8400146D
63809+:100520002403FF809082006300621024304200FFA9
63810+:10053000144002CF9785003A9383003824020002CA
63811+:1005400030B6FFFF14620005000088219382002866
63812+:100550002403FFFD0A001B19AF82003C8F82003C80
63813+:1005600002C2102B144002A18F8400400E0014EC34
63814+:1005700000000000938300283C040800248477983E
63815+:10058000240200341462002EAF84002C3C0A0800C0
63816+:100590008D4A77C82402FFFFAFA2001000803821E7
63817+:1005A0002405002F3C09080025297398240800FF22
63818+:1005B0002406FFFF90E2000024A3FFFF00062202B2
63819+:1005C00000C21026304200FF0002108000491021B6
63820+:1005D0008C420000306500FF24E7000114A8FFF5FD
63821+:1005E0000082302600061027AFA20014AFA2001030
63822+:1005F0000000282127A7001027A6001400C51023FB
63823+:100600009044000324A2000100A71821304500FFF8
63824+:100610002CA200041440FFF9A06400008FA2001077
63825+:100620001142000724020005024020210E0016C5D9
63826+:10063000A38200442403FFFF104300642404FFFF4F
63827+:100640003C0208009042779C104000098F82001401
63828+:10065000024020212402000C0E0016C5A382004493
63829+:100660002403FFFF104300592404FFFF8F8200146E
63830+:10067000A380001C3C0308008C63779C8C440080A2
63831+:100680003C0200FF3442FFFF006218240083202B4D
63832+:1006900010800008AF83003402402021240200199A
63833+:1006A0000E0016C5A38200442403FFFF1043004739
63834+:1006B0002404FFFF8F87003C9782003A8F85003427
63835+:1006C000AF8700200047202310A0003BA784003AFA
63836+:1006D0008F86001430A200030002102390C300BCD8
63837+:1006E0003050000300B0282100031882307300014D
63838+:1006F0000013108000A228213C0308008C6331A065
63839+:100700008F8200483084FFFF0085202B004310219A
63840+:1007100010800011244200888F84002C1082000E6B
63841+:100720003C033F013C0208008C42779800431024B0
63842+:100730003C0325001443000630E500FF8C820000D6
63843+:10074000ACC200888C8200100A0018E9ACC2009884
63844+:100750000E001529000030219382001C8F850014A3
63845+:100760008F830040020238218F82003CA387001C47
63846+:1007700094A400E4006218218F82003434841000B5
63847+:10078000AF83004000503021A4A400E41260000EAA
63848+:10079000AF86003C24E20004A382001C94A200E483
63849+:1007A00024C30004AF83003C34422000A4A200E430
63850+:1007B0000A001906000020218F820040AF80003C13
63851+:1007C00000471021AF820040000020212414FFFFC9
63852+:1007D000109402112403FFFF3C0808008D0877A83D
63853+:1007E0003C0208008C4231B03C03080090637798CB
63854+:1007F00031043FFF0082102B1040001B3067003F88
63855+:100800003C0208008C4231A88F83004800042180FC
63856+:1008100000621821006418213062007F0342282101
63857+:100820003C02000C00A228213C020080344200015E
63858+:100830003066007800C230252402FF800062102458
63859+:10084000AF42002830640007AF4208048F820014D2
63860+:100850000344202124840940AF460814AF850024B6
63861+:10086000AF840030AC4301189383003824020003A6
63862+:10087000146201CF240200012402002610E201D1FB
63863+:1008800028E2002710400013240200322402002234
63864+:1008900010E201CC28E200231040000824020024CA
63865+:1008A0002402002010E201B82402002110E20147D6
63866+:1008B000024020210A001AFB2402000B10E201C1B1
63867+:1008C0002402002510E20010024020210A001AFB39
63868+:1008D0002402000B10E201AE28E2003310400006B3
63869+:1008E0002402003F2402003110E2009A024020213D
63870+:1008F0000A001AFB2402000B10E201A5024020218D
63871+:100900000A001AFB2402000B8F90002C3C03080005
63872+:100910008C6331B08F8500308E0400100000A82158
63873+:100920008CB3001430823FFF0043102B8CB10020A9
63874+:100930005040018F0240202190A3000D2402FF802F
63875+:1009400000431024304200FF504001890240202122
63876+:10095000000413823042000314400185024020212C
63877+:1009600094A3001C8F8200148E040028A443011459
63878+:100970008CA20010026218231064000302402021A0
63879+:100980000A00197C2402001F8F82003400621021AB
63880+:100990000262102B104000088F83002402402021A7
63881+:1009A000240200180E0016C5A382004410540174DE
63882+:1009B0002404FFFF8F8300248F8400348C62001096
63883+:1009C0000224882100441023AC6200108F8200149E
63884+:1009D000AC7100208C4200680051102B10400009BF
63885+:1009E0008F830030024020212402001D0E0016C516
63886+:1009F000A38200442403FFFF104301612404FFFF8E
63887+:100A00008F8300308E0200248C6300241043000783
63888+:100A1000024020212402001C0E0016C5A3820044BF
63889+:100A20002403FFFF104301562404FFFF8F8400249A
63890+:100A30008C82002424420001AC8200241233000482
63891+:100A40008F8200148C4200685622000E8E02000035
63892+:100A50008E0200003C030080004310241440000D6F
63893+:100A60002402001A024020210E0016C5A382004471
63894+:100A70002403FFFF104301422404FFFF0A0019BAB8
63895+:100A80008E0200143C0300800043102450400003F9
63896+:100A90008E020014AC8000208E0200142411FFFF8F
63897+:100AA0001051000E3C0308003C0208008C423190BB
63898+:100AB000004310242403001B14400007A3830044B8
63899+:100AC0000E0016C5024020211051012D2404FFFF05
63900+:100AD0000A0019CB8E030000A38000448E0300009F
63901+:100AE0003C02000100621024104000123C02008011
63902+:100AF0000062102414400008024020212402001A41
63903+:100B00000E0016C5A38200442403FFFF1043011CFE
63904+:100B10002404FFFF02402021020028210E0016E5D8
63905+:100B2000240600012403FFFF104301152404FFFFE6
63906+:100B3000241500018F83002402A0302102402021CF
63907+:100B40009462003624050001244200010A001ADFE5
63908+:100B5000A46200368F90002C3C0308008C6331B0F7
63909+:100B60008E13001032623FFF0043102B10400089AB
63910+:100B70008F8400302402FF809083000D00431024F6
63911+:100B8000304200FF104000842402000D0013138245
63912+:100B900030420003240300011443007F2402000DAF
63913+:100BA0009082000D30420008544000048F820034CF
63914+:100BB000024020210A001A102402002450400004A0
63915+:100BC0008E03000C024020210A001A102402002784
63916+:100BD0008C82002054620006024020218E0300080F
63917+:100BE0008C820024506200098E02001402402021F1
63918+:100BF000240200200E0016C5A38200441054007188
63919+:100C00002403FFFF0A001A458F8400242411FFFFEC
63920+:100C1000145100048F860014024020210A001A405B
63921+:100C2000240200258E0300188CC2007C1062000391
63922+:100C30002402000E0A001A40024020218E030024E4
63923+:100C40008C82002810620003240200210A001A404E
63924+:100C5000024020218E0500288C82002C10A2000367
63925+:100C60002402001F0A001A40024020218E03002C9B
63926+:100C700014600003240200230A001A4002402021CD
63927+:100C80008CC200680043102B104000032402002691
63928+:100C90000A001A40024020218C82001400651821AD
63929+:100CA0000043102B104000088F84002402402021B4
63930+:100CB000240200220E0016C5A382004410510041F8
63931+:100CC0002403FFFF8F8400242403FFF79082000D8C
63932+:100CD00000431024A082000D8F8600143C030800FE
63933+:100CE0008C6331AC8F82004894C400E08F8500246F
63934+:100CF0000043102130847FFF000420400044102175
63935+:100D00003043007F034320213C03000E0083202159
63936+:100D10002403FF8000431024AF42002CA493000062
63937+:100D20008CA2002824420001ACA200288CA2002C36
63938+:100D30008E03002C00431021ACA2002C8E02002C4C
63939+:100D4000ACA200308E020014ACA2003494A2003A8F
63940+:100D500024420001A4A2003A94C600E03C0208002C
63941+:100D60008C4231B024C4000130837FFF1462000F35
63942+:100D700000803021240280000082302430C2FFFF36
63943+:100D8000000213C2304200FF000210270A001A7E40
63944+:100D9000000233C02402000D024020210E0016C5BF
63945+:100DA000A38200440A001A84004018218F82001494
63946+:100DB00002402021240500010E0015F9A44600E0A0
63947+:100DC000000018210A001B16006088218F90002C5B
63948+:100DD0003C0308008C6331B08E05001030A23FFF49
63949+:100DE0000043102B104000612402FF808F840030EC
63950+:100DF0009083000D00431024304200FF5040005CFF
63951+:100E0000024020218F8200341040000B0005138225
63952+:100E10008F8200149763000A944200603042FFFF03
63953+:100E200014430005000513828F8200202404FFFD77
63954+:100E30000A001AF3AF82003C304200031440000E57
63955+:100E40000000000092020002104000058E03002402
63956+:100E500050600015920300030A001AAF02402021DF
63957+:100E60008C82002450620010920300030240202173
63958+:100E70000A001AB72402000F9082000D30420008C9
63959+:100E80005440000992030003024020212402001074
63960+:100E90000E0016C5A38200442403FFFF1043003850
63961+:100EA0002404FFFF92030003240200025462000C9A
63962+:100EB000920200038F820034544000099202000322
63963+:100EC000024020212402002C0E0016C5A3820044FB
63964+:100ED0002403FFFF1043002A2404FFFF92020003B3
63965+:100EE0000200282102402021384600102CC60001B3
63966+:100EF0002C4200010E0016E5004630252410FFFFAD
63967+:100F00001050001F2404FFFF8F8300341060001373
63968+:100F1000024020213C0208008C42318C0043102BFF
63969+:100F200014400007000000000000282124060001F2
63970+:100F30000E001646000000000A001AF300002021EF
63971+:100F40002402002D0E0016C5A38200441050000C90
63972+:100F50002404FFFF0A001AF3000020210E0015F9F7
63973+:100F6000240500010A001AF300002021024020217C
63974+:100F70002402000D0E0016C5A3820044004020216B
63975+:100F80000A001B16008088211514000E00000000C6
63976+:100F90000E00174C024020210A001B160040882139
63977+:100FA0000E0016C5A38200440A001B1600408821CB
63978+:100FB00014620017022018212402002314E2000505
63979+:100FC0002402000B0E0017C0024020210A001B164D
63980+:100FD0000040882102402021A38200440E0016C553
63981+:100FE0002411FFFF0A001B170220182130A500FF63
63982+:100FF0000E001529240600019783003A8F82003CD9
63983+:10100000A780003A00431023AF82003C0220182141
63984+:101010001220003E9782003A2402FFFD5462003EF7
63985+:101020008E4300208E4200048F830014005610234C
63986+:10103000AE420004906200633042007FA062006311
63987+:101040008E4200208F840014A780003A34420002B0
63988+:10105000AE420020A48000E4908200632403FFBF1E
63989+:1010600000431024A08200630A001B598E43002015
63990+:101070009082006300621024304200FF1040002381
63991+:101080009782003A90820088908300BD2485008872
63992+:101090003042003F2444FFE02C820020A383001C48
63993+:1010A00010400019AF85002C2402000100821804B2
63994+:1010B000306200191440000C3C02800034420002EF
63995+:1010C000006210241440000B306200201040000F1A
63996+:1010D0009782003A90A600010240202124050001D9
63997+:1010E0000A001B5330C60001024020210A001B5297
63998+:1010F00024050001024020210000282124060001CF
63999+:101100000E001646000000009782003A1440FD04CD
64000+:101110008F8400148E4300203062000410400012BF
64001+:101120008F84003C2402FFFB00621024AE420020AA
64002+:10113000274301808F4201B80440FFFE8F820048A0
64003+:10114000AC6200008F420124AC6200042402608380
64004+:10115000A462000824020002A062000B3C021000FE
64005+:10116000AF4201B88F84003C8F8300148FBF0034DE
64006+:101170008FB600308FB5002C8FB400288FB30024B9
64007+:101180008FB200208FB1001C8FB000182402000124
64008+:1011900027BD003803E00008AC6400C030A500FFA4
64009+:1011A0002403000124A900010069102B1040000C49
64010+:1011B00000004021240A000100A31023004A380443
64011+:1011C00024630001308200010069302B10400002CE
64012+:1011D000000420420107402554C0FFF800A310235B
64013+:1011E00003E00008010010213C020800244260A432
64014+:1011F0003C010800AC22738C3C02080024425308D6
64015+:101200003C010800AC2273902402000627BDFFE0D9
64016+:101210003C010800A02273943C021EDCAFB200180F
64017+:10122000AFB10014AFBF001CAFB0001034526F411B
64018+:1012300000008821240500080E001B7A02202021CE
64019+:10124000001180803C07080024E773980002160014
64020+:1012500002071821AC6200000000282124A200012E
64021+:101260003045FFFF8C6200002CA6000804410002FC
64022+:10127000000220400092202614C0FFF8AC64000059
64023+:10128000020780218E0400000E001B7A2405002036
64024+:10129000262300013071FFFF2E2301001460FFE5BB
64025+:1012A000AE0200008FBF001C8FB200188FB1001477
64026+:1012B0008FB0001003E0000827BD002027BDFFD835
64027+:1012C000AFB3001CAFB20018AFBF0020AFB1001425
64028+:1012D000AFB000108F5101408F48014800089402C0
64029+:1012E000324300FF311300FF8F4201B80440FFFE7C
64030+:1012F00027500180AE1100008F420144AE0200046D
64031+:1013000024020002A6120008A202000B240200140C
64032+:10131000AE1300241062002528620015104000085A
64033+:101320002402001524020010106200302402001272
64034+:10133000106200098FBF00200A001CB58FB3001C8B
64035+:101340001062007024020022106200378FBF00205C
64036+:101350000A001CB58FB3001C3C0208008C4231A06F
64037+:101360002403FF800222102100431024AF420024F6
64038+:101370003C0208008C4231A0022210213042007F42
64039+:10138000034218213C02000A00621821166000BCCA
64040+:10139000AF830014906200623042000F344200308C
64041+:1013A000A06200620A001CB48FBF00203C046000F1
64042+:1013B0008C832C083C02F0033442FFFF00621824A7
64043+:1013C000AC832C083C0208008C4231A08C832C0892
64044+:1013D000244200740002108200021480006218256A
64045+:1013E000AC832C080A001CB48FBF00203C0208000C
64046+:1013F0008C4231A02403FF800222102100431024DC
64047+:10140000AF4200243C0208008C4231A03C03000A99
64048+:10141000022210213042007F03421021004310219C
64049+:101420000A001CB3AF8200143C0208008C4231A0B9
64050+:101430002405FF800222102100451024AF42002421
64051+:101440003C0208008C4231A0022210213042007F71
64052+:10145000034218213C02000A0062182190620063D6
64053+:1014600000A21024304200FF10400085AF8300141A
64054+:1014700024620088944300123C0208008C4231A888
64055+:1014800030633FFF00031980022210210043102126
64056+:101490003043007F03432021004510243C03000C0F
64057+:1014A00000832021AF4200289082000D00A210246A
64058+:1014B000304200FF10400072AF8400249082000D83
64059+:1014C000304200101440006F8FBF00200E0015C87E
64060+:1014D000000000008F4201B80440FFFE0000000041
64061+:1014E000AE1100008F420144AE020004240200024B
64062+:1014F000A6120008A202000BAE1300240A001CB4BE
64063+:101500008FBF00202406FF8002261024AF42002057
64064+:101510003C0208008C4231A031043FFF00042180CE
64065+:101520000222102100461024AF4200243C03080090
64066+:101530008C6331A83C0208008C4231A03227007F26
64067+:101540000223182102221021006418213042007F5A
64068+:101550003064007F034228213C02000A0066182400
64069+:1015600000A22821034420213C02000C00822021FB
64070+:10157000AF4300283C020008034718210062902175
64071+:10158000AF850014AF8400240E0015C8010080212F
64072+:101590008F4201B80440FFFE8F8200248F84001424
64073+:1015A000274501809042000DACB10000A4B00006B8
64074+:1015B000000216000002160300021027000237C2C4
64075+:1015C00014C00016248200889442001232033FFFA8
64076+:1015D00030423FFF14430012240260829083006374
64077+:1015E0002402FF8000431024304200FF5040000CD2
64078+:1015F00024026082908200623042000F3442004038
64079+:10160000A082006224026084A4A200082402000DCB
64080+:10161000A0A200050A001C9E3C0227002402608252
64081+:10162000A4A20008A0A000053C02270000061C00A0
64082+:101630000062182524020002A0A2000BACA3001037
64083+:10164000ACA00014ACA00024ACA00028ACA0002CDE
64084+:101650008E42004C8F840024ACA200189083000DB1
64085+:101660002402FF8000431024304200FF1040000598
64086+:101670008FBF00209082000D3042007FA082000DBD
64087+:101680008FBF00208FB3001C8FB200188FB10014E1
64088+:101690008FB000103C02100027BD002803E00008B6
64089+:1016A000AF4201B80800343008003430080033A8D5
64090+:1016B000080033E0080034140800343808003438D7
64091+:1016C00008003438080033180A0001240000000024
64092+:1016D000000000000000000D747061362E322E33C1
64093+:1016E00000000000060203010000000000000000EE
64094+:1016F00000000000000000000000000000000000EA
64095+:1017000000000000000000000000000000000000D9
64096+:1017100000000000000000000000000000000000C9
64097+:1017200000000000000000000000000000000000B9
64098+:1017300000000000000000000000000000000000A9
64099+:101740000000000000000000000000000000000099
64100+:101750000000000000000000000000001000000376
64101+:10176000000000000000000D0000000D3C02080019
64102+:1017700024421C003C03080024632094AC40000079
64103+:101780000043202B1480FFFD244200043C1D080070
64104+:1017900037BD2FFC03A0F0213C1008002610049058
64105+:1017A0003C1C0800279C1C000E00015C000000008F
64106+:1017B0000000000D3084FFFF308200078F85001885
64107+:1017C00010400002248300073064FFF800853021B8
64108+:1017D00030C41FFF03441821247B4000AF85001C48
64109+:1017E000AF84001803E00008AF4400843084FFFF9A
64110+:1017F000308200078F8500208F860028104000026D
64111+:10180000248300073064FFF8008520210086182B10
64112+:1018100014600002AF8500240086202303442821A1
64113+:1018200034068000AF840020AF44008000A6202151
64114+:1018300003E00008AF84003827BDFFD8AFB3001C19
64115+:10184000AFB20018AFB00010AFBF0024AFB400209B
64116+:10185000AFB100143C0860088D1450002418FF7FBD
64117+:101860003C1A8000029898243672380CAD12500051
64118+:101870008F5100083C07601C3C08600036300001B6
64119+:10188000AF500008AF800018AF400080AF40008428
64120+:101890008CE600088D0F08083C0760168CEC0000F1
64121+:1018A00031EEFFF039CA00103C0DFFFF340B800011
64122+:1018B0003C030080034B48212D440001018D282466
64123+:1018C0003C0253533C010800AC230420AF8900388C
64124+:1018D000AF860028AF840010275B400014A20003ED
64125+:1018E00034E37C008CF90004032818218C7F007CF1
64126+:1018F0008C6500783C0280003C0B08008D6B048CEA
64127+:101900003C0A08008D4A048834520070AF85003CC0
64128+:10191000AF9F00403C13080026731C440240A021E6
64129+:101920008E4800008F46000038C30001306400017B
64130+:1019300010800017AF880034028048218D2F0000EE
64131+:101940003C0508008CA5045C3C1808008F1804585E
64132+:1019500001E8102300A280210000C8210202402BD0
64133+:1019600003198821022838213C010800AC30045CAE
64134+:101970003C010800AC2704588F4E000039CD00010F
64135+:1019800031AC00011580FFED01E04021AF8F003444
64136+:101990008E5100003C0708008CE7045C3C0D0800F9
64137+:1019A0008DAD04580228802300F0602100007021D2
64138+:1019B0000190302B01AE1821006620213C01080067
64139+:1019C000AC2C045C3C010800AC2404588F46010890
64140+:1019D0008F47010030C92000AF860000AF87000CA0
64141+:1019E0001120000A00C040213C1808008F18042C68
64142+:1019F000270800013C010800AC28042C3C184000DA
64143+:101A0000AF5801380A000196000000009749010410
64144+:101A100000002821014550213122FFFF0162582199
64145+:101A20000162F82B015F502130D902003C0108000F
64146+:101A3000AC2B048C3C010800AC2A0488172000154C
64147+:101A400024040F0010E400130000000024080D001F
64148+:101A500010E8023B30CD000611A0FFE93C18400021
64149+:101A6000936E00002409001031C400F01089027147
64150+:101A700024020070108202E58F880014250F0001F7
64151+:101A8000AF8F00143C184000AF5801380A0001968F
64152+:101A900000000000974C01041180FFD93C18400061
64153+:101AA00030C34000146000A1000000008F460178A0
64154+:101AB00004C0FFFE8F87003824100800240F0008A0
64155+:101AC0008CE30008AF500178A74F0140A7400142C6
64156+:101AD000974E01048F86000031C9FFFF30CD000111
64157+:101AE00011A002E1012040212531FFFE241800024F
64158+:101AF000A75801463228FFFFA75101483C190800AA
64159+:101B00008F39043C172002D08F8C000C30DF00206E
64160+:101B100017E00002240400092404000130C20C0074
64161+:101B2000240504005045000134840004A744014A00
64162+:101B30003C1108008E3104203C1800483C10000184
64163+:101B40000238182530CF00020070282511E000046B
64164+:101B5000000018213C19010000B9282524030001C8
64165+:101B600030DF000453E00005AF8300083C0600109E
64166+:101B700000A6282524030001AF830008AF4510000C
64167+:101B80000000000000000000000000000000000055
64168+:101B90008F83000810600023000000008F451000B4
64169+:101BA00004A1FFFE000000001060001E0000000005
64170+:101BB0008F4410003C0C0020008C102410400019B1
64171+:101BC0008F8E000031CD000211A000160000000031
64172+:101BD000974F101415E000130000000097591008EB
64173+:101BE0003338FFFF271100060011188200033080F0
64174+:101BF00000C7282132300001322300031200032CD9
64175+:101C00008CA200000000000D00C7F821AFE2000028
64176+:101C10003C0508008CA5043024A600013C01080006
64177+:101C2000AC2604308F6D00003402FFFFAF8D00043E
64178+:101C30008CEC0000118202A6000020218CED000037
64179+:101C400031AC01001180028A000000003C02080053
64180+:101C50008C4204743C0308008C63044C3C1F080055
64181+:101C60008FFF04703C1808008F1804480048382182
64182+:101C70000068802100E8282B03E430210208402B73
64183+:101C80000304882100C57021022878213C01080046
64184+:101C9000AC30044C3C010800AC2F04483C01080067
64185+:101CA000AC2704743C010800AC2E04708F8400182B
64186+:101CB0000120302131290007249F000833F91FFF3C
64187+:101CC00003594021AF84001CAF990018251B400028
64188+:101CD000AF590084112000038F83002024C2000725
64189+:101CE0003046FFF88F84002800C3282100A4302B41
64190+:101CF00014C00002AF83002400A428230345602100
64191+:101D0000340D8000018D10213C0F1000AF850020A4
64192+:101D1000AF820038AF450080AF4F01788F88001444
64193+:101D2000250F00010A0001EFAF8F00148F62000839
64194+:101D30008F670000240500300007760231C300F0F1
64195+:101D4000106500A7240F0040546FFF4C8F880014CB
64196+:101D50008F4B01780560FFFE0000000030CA0200D2
64197+:101D600015400003000612820000000D00061282DA
64198+:101D7000304D0003000D4900012D18210003808023
64199+:101D8000020D402100086080019380218E1F000019
64200+:101D900017E00002000000000000000D8F6E00043C
64201+:101DA00005C202BD92070006920E000592020004D1
64202+:101DB0003C090001000E18800070F8218FED00181A
64203+:101DC000277100082448000501A96021000830821D
64204+:101DD000AFEC0018022020210E00059E26050014FD
64205+:101DE000920A00068F7900043C0B7FFF000A2080D6
64206+:101DF000009178218DF800043566FFFF0326282422
64207+:101E000003053821ADE70004920E0005920D000491
64208+:101E1000960C0008000E10800051C8218F2300008E
64209+:101E2000974901043C07FFFF006758243128FFFF52
64210+:101E3000010DF82103EC50233144FFFF01643025EC
64211+:101E4000AF260000920300072418000110780275E5
64212+:101E5000240F0003106F0285000000008E050010A3
64213+:101E60002419000AA7590140A7450142921800040D
64214+:101E70008F860000240F0001A7580144A7400146A7
64215+:101E80009747010430D100023C050041A7470148B3
64216+:101E900000001821A74F014A1220000330CB000494
64217+:101EA0003C0501412403000151600005AF83000897
64218+:101EB0003C06001000A6282524030001AF8300087B
64219+:101EC000AF4510000000000000000000000000000E
64220+:101ED000000000008F8A000811400004000000008C
64221+:101EE0008F4410000481FFFE000000008F6B000093
64222+:101EF000920800043C1108008E310444AF8B0004AA
64223+:101F000097590104311800FF3C0E08008DCE0440A3
64224+:101F10003325FFFF0305382102276021000010212F
64225+:101F2000250F000A31E8FFFF0187482B01C2682115
64226+:101F300001A9F821311000073C010800AC2C044431
64227+:101F40003C010800AC3F0440120000038F8C0018D5
64228+:101F50002506000730C8FFF8010C682131BF1FFFBC
64229+:101F6000AF8C001CAF9F0018AF5F00849744010442
64230+:101F7000035F80213084FFFF308A00071140000397
64231+:101F8000261B4000248900073124FFF88F8200209F
64232+:101F90008F850028008220210085702B15C000024B
64233+:101FA000AF820024008520233C0B08008D6B048C3D
64234+:101FB0003C0A08008D4A04880344882134038000C9
64235+:101FC000022310213C0F1000AF840020AF820038A4
64236+:101FD000AF440080AF4F01780A0002968F8800144A
64237+:101FE0008F5001780600FFFE30D10200162000035A
64238+:101FF000000612820000000D00061282305F00030E
64239+:10200000001F1900007F302100062080009FC8219A
64240+:1020100000194880013380218E180000130000024F
64241+:10202000000000000000000D8F6C000C058001FB1B
64242+:102030008F870038240E0001AE0E00008CE30008EC
64243+:10204000A20000078F65000400055402314D00FF17
64244+:1020500025A80005000830822CCB00411560000245
64245+:10206000A20A00040000000D8F7800043C03FFFF6B
64246+:1020700000E02821330BFFFF256C000B000C1082C1
64247+:1020800000022080008748218D3F000026040014B4
64248+:10209000A618000803E3C8240E00059EAD39000011
64249+:1020A0008F4F01083C11100001F1382410E001AB02
64250+:1020B00000000000974D01049208000725AAFFECDC
64251+:1020C000350600023144FFFFA2060007960600080D
64252+:1020D0002CC7001354E0000592030007921100077B
64253+:1020E000362F0001A20F00079203000724180001F9
64254+:1020F000107801C224090003106901D58F880038C7
64255+:1021000030CBFFFF257100020011788331E400FF1E
64256+:1021100000042880A20F000500A848218D2D000092
64257+:10212000974A01043C0EFFFF01AEF8243143FFFF44
64258+:10213000006B1023244CFFFE03ECC825AD390000D2
64259+:10214000920600053C03FFF63462FFFF30D800FF23
64260+:102150000018388000F08821922F00143C04FF7F83
64261+:102160003487FFFF31EE000F01C65821316500FFB3
64262+:1021700000055080015068218DAC00200148F821F5
64263+:10218000A20B00060182C824AE0C000CAFF9000CB3
64264+:10219000920900068E11000C032778240009C080E4
64265+:1021A0000310702195C60026030828210227202449
64266+:1021B000AE04000CADCF0020ADC60024ACA60010CC
64267+:1021C0008F8800003C0B08008D6B048C3C0A0800D3
64268+:1021D0008D4A0488241F001024190002A75F0140C3
64269+:1021E000A7400142A7400144A7590146974901046D
64270+:1021F00024070001310600022538FFFEA7580148D8
64271+:102200003C050009A747014A10C00003000018213F
64272+:102210003C05010924030001310C00045180000534
64273+:10222000AF8300083C08001000A828252403000103
64274+:10223000AF830008AF451000000000000000000060
64275+:1022400000000000000000009205000424AE00021F
64276+:1022500031CD0007000D182330620007AE020010D8
64277+:102260008F90000812000004000000008F4F100043
64278+:1022700005E1FFFE000000008F7100008F8E001846
64279+:102280003C0308008C630444AF91000497450104AB
64280+:1022900025CF001031E61FFF30A2FFFFAF8E001CDC
64281+:1022A000AF860018AF4600842449FFFE3C0C0800AE
64282+:1022B0008D8C0440974D010401208021000947C303
64283+:1022C0000070C02131A9FFFF0310F82B0188C8213D
64284+:1022D000033F202103463821313100073C0108002B
64285+:1022E000AC3804443C010800AC2404401220000334
64286+:1022F00024FB40002527000730E9FFF88F860020E7
64287+:102300008F8400280126382100E4C02B170000022A
64288+:10231000AF86002400E438230347202134198000CD
64289+:10232000009910213C0F1000AF870020AF820038C9
64290+:10233000AF470080AF4F01780A0002968F880014E3
64291+:102340009747010410E0FDAE3C1840008F5801781B
64292+:102350000700FFFE30C5400010A000033C1F00082E
64293+:102360000000000D3C1F0008AF5F01402410080072
64294+:102370008F860000AF5001789744010430D90001E6
64295+:10238000132000ED3086FFFF24CCFFFE240D000259
64296+:10239000A74D0146A74C01488F9100182408000D55
64297+:1023A000A748014A8F630000262F000831E21FFF73
64298+:1023B0000342702130C90007AF830004AF91001CB5
64299+:1023C000AF82001800C03821AF4200841120000302
64300+:1023D00025DB400024D800073307FFF88F85002055
64301+:1023E0008F84002800E5302100C4382B14E000025F
64302+:1023F000AF85002400C430238F8400140346F821E5
64303+:10240000340C8000AF86002003EC8021AF460080B2
64304+:10241000249900013C0610003C184000AF460178AA
64305+:10242000AF900038AF990014AF5801380A000196F8
64306+:10243000000000008F630000975101043067FFFF28
64307+:102440003228FFFF8F4F017805E0FFFE30EC0007D8
64308+:10245000000CF82333F0000724F9FFFE2404000ADF
64309+:10246000A7440140A7500142A7590144A740014693
64310+:10247000A74801488F45010830B800201700000226
64311+:10248000240300092403000130CD0002A743014AC0
64312+:102490003C04004111A00003000018213C0401414C
64313+:1024A0002403000130C9000451200005AF83000857
64314+:1024B0003C0600100086202524030001AF8300089D
64315+:1024C000AF44100000000000000000000000000009
64316+:1024D000000000008F8E000811C000040000000002
64317+:1024E0008F4210000441FFFE000000008F7F0000BB
64318+:1024F000276400088F91003CAF9F0004948500087A
64319+:102500009490000A9499000C30AFFFFF0010C400B3
64320+:102510003323FFFF11F100A6030320253C0E080022
64321+:102520008DCE04443C0C08008D8C044000E88821CA
64322+:102530002626FFFE01C628210000682100A6F82BF0
64323+:10254000018D2021009F80213C010800AC2504441E
64324+:102550003C010800AC30044024E200083042FFFF98
64325+:102560003047000710E000038F830018244F000756
64326+:1025700031E2FFF83106FFFF30C800070043802139
64327+:1025800032191FFF0359C021AF83001CAF990018F7
64328+:10259000271B4000AF590084110000038F8C0020DE
64329+:1025A00024C5000730A6FFF88F84002800CC28211E
64330+:1025B00000A4F82B17E00002AF8C002400A428230D
64331+:1025C000AF850020AF4500803C0408008C840434B3
64332+:1025D00003454821340E8000012E6821108000053B
64333+:1025E000AF8D0038939100172406000E12260011BB
64334+:1025F0002407043F3C021000AF4201788F8800148A
64335+:10260000250F00010A0001EFAF8F00140E0005C472
64336+:1026100000E020218F8800143C0B08008D6B048C97
64337+:102620003C0A08008D4A0488250F00010A0001EFCA
64338+:10263000AF8F00143C021000A7470148AF42017859
64339+:102640000A0004CE8F88001424040F001184003D7A
64340+:1026500030CE002015C0000224030009240300012D
64341+:102660000A00021AA743014A0A00020DA7400146C8
64342+:1026700094EF000894F1000A94F0000C8F8C003C59
64343+:10268000001174003207FFFF31EDFFFF11AC00377E
64344+:1026900001C720253C1808008F1804443C0F08008F
64345+:1026A0008DEF0440000080210308682101A8382B29
64346+:1026B00001F0702101C760213C010800AC2D0444E9
64347+:1026C0003C010800AC2C04400A00027A8F840018F8
64348+:1026D0003C0208008C42047C3C0308008C630454D8
64349+:1026E0003C1F08008FFF04783C1808008F18045026
64350+:1026F000004838210068802100E8282B03E43021BD
64351+:102700000208402B0304882100C57021022878218B
64352+:102710003C010800AC3004543C010800AC2F0450CC
64353+:102720003C010800AC27047C3C010800AC2E047876
64354+:102730000A00027A8F840018A74001460A00043577
64355+:102740008F91001830CD002015A0FFC52403000D87
64356+:10275000240300050A00021AA743014A974E010408
64357+:1027600025C5FFF00A00038130A4FFFF8F980040C9
64358+:102770001498FFC8000010213C0508008CA5046CCB
64359+:102780003C1F08008FFF046800A8C8210328302BD5
64360+:1027900003E22021008640213C010800AC39046C92
64361+:1027A0003C010800AC2804680A00027A8F840018F3
64362+:1027B0008F8C0040148CFF5900E8C8213C18080099
64363+:1027C0008F18046C3C1108008E3104682723FFFE2B
64364+:1027D00003034821000010210123302B0222702125
64365+:1027E00001C668213C010800AC29046C3C010800CA
64366+:1027F000AC2D04680A0004A524E200088F88003884
64367+:102800003C03FFFF8D02000C0043F82403E4C825BD
64368+:10281000AD19000C0A00038F30CBFFFF0A0003C381
64369+:10282000AE000000974A0104920400048E26000CBA
64370+:10283000014458212579FFF200C7C0243325FFFF4A
64371+:1028400003053825AE27000C0A0002E68E050010AD
64372+:102850003C0DFFFF8D0A0010014D582401646025D6
64373+:10286000AD0C00100A00038F30CBFFFF974301042B
64374+:10287000920E00048E290010006E1021244DFFEEF0
64375+:102880000127602431A8FFFF0188F825AE3F001022
64376+:102890000A0002E68E0500108E0F000CAE0000004C
64377+:1028A00000078880023028210A0002B8ACAF00205F
64378+:1028B0001460000D3058FFFF3C04FFFF0044682403
64379+:1028C00001A47026000E602B000D102B004CF82484
64380+:1028D00013E00002000000000000000D8CAF0000BB
64381+:1028E0000A00025001E410253B03FFFF0003882B80
64382+:1028F0000018802B0211202410800002000000002C
64383+:102900000000000D8CB900000A0002503722FFFFC2
64384+:102910003084FFFF30A5FFFF108000070000182162
64385+:10292000308200011040000200042042006518219E
64386+:102930001480FFFB0005284003E000080060102120
64387+:1029400010C00007000000008CA2000024C6FFFF9A
64388+:1029500024A50004AC82000014C0FFFB2484000402
64389+:1029600003E000080000000010A0000824A3FFFFFF
64390+:10297000AC86000000000000000000002402FFFF01
64391+:102980002463FFFF1462FFFA2484000403E00008BC
64392+:1029900000000000308EFFFF30D8FFFF00057C00F4
64393+:1029A00001F8602539CDFFFF01AC5021014C582BB7
64394+:1029B000014B4821000944023127FFFF00E8302184
64395+:1029C0000006240230C5FFFF00A418213862FFFF73
64396+:1029D00003E000083042FFFF3C0C08008D8C0484AB
64397+:1029E000240BFF8027BDFFD001845021014B4824D8
64398+:1029F000AF4900203C0808008D080484AFB20020D5
64399+:102A0000AFB00018AFBF0028AFB30024AFB1001CB7
64400+:102A1000936600040104382130E4007F009A1021FD
64401+:102A20003C0300080043902130C500200360802152
64402+:102A30003C080111277B000814A000022646007004
64403+:102A40002646006C9213000497510104920F000473
64404+:102A50003267000F322EFFFF31ED004001C72823FF
64405+:102A600011A0000500004821925900BC3338000431
64406+:102A70001700009000000000924300BC307F00046B
64407+:102A800013E0000F0000000010A0000D0000000087
64408+:102A9000960E0002240AFF8000A7602125CDFFFECC
64409+:102AA000A74D1016920B0004014B2024308200FF2A
64410+:102AB00010400085010C40253C0F0400010F40250B
64411+:102AC0008F5301780660FFFE2404000AA7440140EA
64412+:102AD000960D00022404000931AC0007000C5823B5
64413+:102AE000316A0007A74A0142960200022443FFFE12
64414+:102AF000A7430144A7400146975F0104A75F01482F
64415+:102B00008F590108333800205300000124040001CC
64416+:102B1000920F000431EE001015C000023483001043
64417+:102B200000801821A743014A0000000000000000B7
64418+:102B30000000000000000000AF481000000000008E
64419+:102B40000000000000000000000000008F51100095
64420+:102B50000621FFFE3113FFFF12600003000000009A
64421+:102B60008F481018ACC8000096030006307FFFFFA6
64422+:102B700027F900020019988200138880023B302157
64423+:102B80008CD800001520005700183402920300046E
64424+:102B90002405FF8000A3F82433F100FF1220002C4D
64425+:102BA00000000000924700BC30F2000212400028F2
64426+:102BB00000000000974B100C2562FFFEA742101684
64427+:102BC000000000003C0A040035490030AF49100005
64428+:102BD00000000000000000000000000000000000F5
64429+:102BE0008F4C10000581FFFE000000009749100C7B
64430+:102BF0008F51101C00C020213127FFFF24F200302C
64431+:102C0000001218820003288000BBF8213226FFFF43
64432+:102C1000AFF100000E0005B300112C020013C880B4
64433+:102C2000033B98218E78000000027400AFB80010BA
64434+:102C30008FA80010310FFFFFAFAF00108FA400105E
64435+:102C400001C46825AFAD00108FA60010AE6600006D
64436+:102C500097730008976D000A9766000C8F8A003CF6
64437+:102C6000000D5C0030CCFFFF3262FFFF104A0036DF
64438+:102C7000016C2025960600023C10100024D30008A9
64439+:102C80000E00013B3264FFFF974C01040E00014926
64440+:102C90003184FFFFAF5001788FBF00288FB300242D
64441+:102CA0008FB200208FB1001C8FB0001803E0000825
64442+:102CB00027BD003010A0FF700000000024A5FFFC1D
64443+:102CC0000A0005EC240900048CD10000AF51101853
64444+:102CD0008F5301780660FF7A2404000A0A00060177
64445+:102CE0000000000000A7C8218F8800388F4E101CFC
64446+:102CF0000019C0820018788001E82021AC8E000005
64447+:102D0000000E2C0200C020210E0005B331C6FFFFCB
64448+:102D1000023B28218CAD000000025400004030210D
64449+:102D2000AFAD00108FAC0010318BFFFFAFAB0010C8
64450+:102D30008FA2001001424825AFA900108FA70010F4
64451+:102D40000A000631ACA700008F8F0040148FFFC926
64452+:102D50000000000097420104960B00023C050800A9
64453+:102D60008CA5046C3049FFFF316AFFFF3C1108005D
64454+:102D70008E310468012A382124F2FFFE00B240217E
64455+:102D80000012FFC30112C82B023FC02103192021EA
64456+:102D90003C010800AC28046C3C010800AC24046829
64457+:102DA0000A00066B0000000000A4102B1040000970
64458+:102DB000240300010005284000A4102B04A00003F8
64459+:102DC000000318405440FFFC000528401060000735
64460+:102DD000000000000085302B14C0000200031842E0
64461+:102DE000008520231460FFFB0005284203E0000853
64462+:102DF000008010218F85002C27BDFFE800053027BB
64463+:102E00002CC300012CA400020083102510400003F5
64464+:102E1000AFBF00102405007FAF85002C00052827D8
64465+:102E200030A5FFFF0E000592240426F58F830030A5
64466+:102E3000240402BD004030210083382B10E000093B
64467+:102E400024050001000420400083102B04800003AF
64468+:102E5000000528405440FFFC0004204010A000085A
64469+:102E600000C350210064402B1500000200052842D9
64470+:102E70000064182314A0FFFB0004204200C350216B
64471+:102E80008FBF0010000A4C02312200FF27BD00183E
64472+:102E9000AF8A002C03E00008AF8900300A00002A46
64473+:102EA00000000000000000000000000D7478703683
64474+:102EB0002E322E3300000000060203000000000046
64475+:102EC000000001360000EA60000000000000000081
64476+:102ED00000000000000000000000000000000000F2
64477+:102EE00000000000000000000000000000000000E2
64478+:102EF00000000000000000000000000000000016BC
64479+:102F000000000000000000000000000000000000C1
64480+:102F100000000000000000000000000000000000B1
64481+:102F200000000000000000000000000000000000A1
64482+:102F3000000000000000138800000000000005DC15
64483+:102F4000000000000000000010000003000000006E
64484+:102F50000000000D0000000D3C02080024423C204F
64485+:102F60003C03080024633DD4AC4000000043202B08
64486+:102F70001480FFFD244200043C1D080037BD7FFC87
64487+:102F800003A0F0213C100800261000A83C1C0800FB
64488+:102F9000279C3C200E0002BA000000000000000D3B
64489+:102FA0008F8300383C088000350700708CE50000F6
64490+:102FB000008330253C02900000C22025AF85003000
64491+:102FC000AF4400208F4900200520FFFE3C03800015
64492+:102FD000346200708C4500008F8600303C19080078
64493+:102FE0008F39007C3C0E08008DCE007800A620238F
64494+:102FF00003245821000078210164682B01CF60214F
64495+:10300000018D50213C010800AC2B007C3C010800E4
64496+:10301000AC2A007803E00008000000000A0000412C
64497+:10302000240400018F8400383C05800034A2000194
64498+:103030000082182503E00008AF43002003E00008E9
64499+:10304000000010213084FFFF30A5FFFF1080000733
64500+:1030500000001821308200011040000200042042CC
64501+:10306000006518211480FFFB0005284003E00008DC
64502+:103070000060102110C00007000000008CA20000BA
64503+:1030800024C6FFFF24A50004AC82000014C0FFFB8F
64504+:103090002484000403E000080000000010A00008E1
64505+:1030A00024A3FFFFAC860000000000000000000029
64506+:1030B0002402FFFF2463FFFF1462FFFA248400044C
64507+:1030C00003E0000800000000308AFFFF93A800130F
64508+:1030D000A74A014497490E1630C600FF3C02100073
64509+:1030E000A7490146AF450148A3460152A748015AE6
64510+:1030F000AF4701608FA400188FA30014A7440158A4
64511+:10310000AF43015403E00008AF42017803E0000838
64512+:10311000000000003C038000346200708C49000015
64513+:103120008F8800002484000727BDFFF83084FFF853
64514+:10313000AF890030974D008A31ACFFFFAFAC000083
64515+:103140008FAB0000016850232547FFFF30E61FFFCB
64516+:1031500000C4282B14A0FFF73C0C8000358B0070B6
64517+:103160008D6A00003C0708008CE700843C060800DC
64518+:103170008CC6008000081082014918230002788064
64519+:1031800000E370210000202101C3C82B00C4C0212E
64520+:1031900001FA4021031948212502400027BD0008FB
64521+:1031A0003C010800AC2E00843C010800AC290080E2
64522+:1031B00003E00008000000008F8200002486000762
64523+:1031C00030C5FFF800A2182130641FFF03E000089B
64524+:1031D000AF8400008F8700388F8A004027BDFFB87A
64525+:1031E0008F860044AFB60040AFBF0044AFB5003C8F
64526+:1031F000AFB40038AFB30034AFB20030AFB1002C81
64527+:10320000AFB000288F4501048D4900ACAF47008066
64528+:103210008CC8002000A938230000B021AF480E1050
64529+:103220008F440E1000004821AF440E148CC20024BD
64530+:10323000AF420E188F430E18AF430E1C10E001254D
64531+:103240002D230001936B0008116000D400000000E2
64532+:10325000976E001031CDFFFF00ED602B158000CF81
64533+:103260000000000097700010320FFFFFAF4F0E00FC
64534+:103270008F520000325100081220FFFD00000000B4
64535+:1032800097540E088F460E043285FFFF30B30001BD
64536+:1032900012600132000000000000000D30B8A040B4
64537+:1032A00024150040131500C030A9A0001120012DE5
64538+:1032B00000000000937F000813E0000800000000F9
64539+:1032C00097630010306BFFFF00CB402B1100000311
64540+:1032D00030AC00401180012300000000A785003CB5
64541+:1032E000AF8600349366000800E02821AFA70020D5
64542+:1032F00014C0012427B30020AF60000C9782003C6B
64543+:103300003047400014E00002240300162403000E9E
64544+:1033100024194007A363000AAF790014938A003E82
64545+:103320008F740014315800070018AA4002959025A8
64546+:10333000AF7200149784003C8F700014309100101D
64547+:1033400002117825AF6F0014978E003C31CD000834
64548+:1033500011A00147000028218F6700143C021000D3
64549+:103360003C0C810000E22825AF65001497460E0A48
64550+:103370002408000E3405FFFC30C3FFFF006C582505
64551+:10338000AF6B0004A3680002937F000A27E90004E2
64552+:10339000A369000A9786003C9363000A30CC1F00A3
64553+:1033A000000C598301634021251F0028A37F0009D9
64554+:1033B00097490E0CA769001093790009272A00028B
64555+:1033C000315800070018A82332B10007A371000B81
64556+:1033D00093740009976400108F910034978F003C1C
64557+:1033E000329200FF024480210205702131ED00403D
64558+:1033F00011A0000531C4FFFF0091282B3C12800072
64559+:1034000010A000140000A0210224382B14E0011B9E
64560+:103410008FA500208F4D0E14AF4D0E108F420E1C45
64561+:10342000AF420E18AF440E008F4F000031EE00087F
64562+:1034300011C0FFFD0000000097540E080080882195
64563+:1034400000009021A794003C8F500E04241400012A
64564+:10345000AF900034976400103095FFFF8E68000035
64565+:103460000111F82317E00009AE7F00008F650014FA
64566+:103470008F8B004434A60040AF6600148F4C0E10B2
64567+:10348000AD6C00208F430E18AD63002493670008D5
64568+:1034900014E000D2000000000E00009E2404001082
64569+:1034A0008F8900483C08320000402821312600FF67
64570+:1034B0000006FC0003E8502525390001AF990048BB
64571+:1034C000AC4A0000937800099370000A330400FFAF
64572+:1034D00000047400320F00FF01CF6825AC4D0004DA
64573+:1034E0008F820048064000EAACA20008ACA0000CA5
64574+:1034F0009783003C306B0008156000022628000608
64575+:1035000026280002974E0E148F450E1C8F6700046C
64576+:10351000936D000231C4FFFF31A200FFAFA2001083
64577+:103520008F6C0014AFA800180E00008BAFAC001415
64578+:10353000240400100E0000C7000000008E7200007E
64579+:1035400016400005000000008F6400142405FFBF32
64580+:1035500000859824AF7300148F79000C033538214F
64581+:10356000AF67000C9375000816A00008000000006B
64582+:1035700012800006000000008F7F00143C0BEFFF5C
64583+:103580003568FFFE03E84824AF690014A3740008FF
64584+:103590008FA500200A00024602202021AF470E001E
64585+:1035A0000A0000F5000000008F5901780720FFFE97
64586+:1035B000241F08008F840000AF5F0178974B008ABA
64587+:1035C000316AFFFF014448232528FFFF31021FFF16
64588+:1035D0002C4300081460FFF9000000008F8E0048A3
64589+:1035E0008F8D003800C048210344202125C60001EA
64590+:1035F000240C0F00AF86004800E9382324864000E1
64591+:1036000031CA00FF11AC0005240800019391003E6F
64592+:103610003230000700107A4035E80001000AAC00A3
64593+:103620003C18010002B8A025AC9440008F930048DC
64594+:1036300030B2003630A40008ACD3000410800097EC
64595+:1036400001123025974E0E0A8F8D00003C0281003A
64596+:1036500031CCFFFF25AB0008018240253C03100060
64597+:1036600031651FFF25390006241F000EAF48016099
64598+:1036700000C33025A75F015AAF850000A759015844
64599+:1036800014E0000A8F93003824120F0052720002D7
64600+:103690002416000134C600408F580E108F94004449
64601+:1036A000AE9800208F550E18AE9500248F450E144D
64602+:1036B000AF4501448F590E1CAF590148A34A01522E
64603+:1036C0003C0A1000AF460154AF4A017814E0FEDD19
64604+:1036D0002D2300010076A025128000178FBF004423
64605+:1036E0008F84003824160F0010960084000000001C
64606+:1036F0008F45017804A0FFFE24150F001095006E81
64607+:10370000000000008F470E14240202403C1F1000EE
64608+:10371000AF4701448F440E1CAF440148A3400152FF
64609+:10372000A740015AAF400160A7400158AF42015481
64610+:10373000AF5F01788FBF00448FB600408FB5003C6B
64611+:103740008FB400388FB300348FB200308FB1002CAB
64612+:103750008FB0002803E0000827BD004814C0FED049
64613+:1037600030B8A0408F420E148F84004400004821DE
64614+:10377000AC8200208F510E1CAC9100240A00020E76
64615+:103780002D2300018F910034978A003C3C12800069
64616+:103790000220A821315800401700FF300000A0216E
64617+:1037A000976900108F9200343139FFFF13320035D2
64618+:1037B00000002021008048211480FEA000A03821B4
64619+:1037C0008F420E148F840044AC8200208F510E1C57
64620+:1037D000AC9100240A00020E2D230001936A000917
64621+:1037E0009378000B315000FF330F00FF020F702160
64622+:1037F00025C2000A3050FFFF0E00009E020020216B
64623+:103800008F8600483C1F410024CD0001AF8D004849
64624+:10381000936C000930C600FF00064400318300FFAE
64625+:10382000246B0002010B4825013FC825AC5900005C
64626+:103830008F67000C97440E1400F22825AC45000455
64627+:103840008F450E1C8F670004936A00023084FFFFCF
64628+:10385000315800FFAFB800108F6F0014AFB10018DF
64629+:103860000E00008BAFAF00140A0001A60200202159
64630+:10387000AF6000040A00013EA36000020A00024695
64631+:1038800000002021000090210A0001702414000192
64632+:103890003C1280000A000195ACB2000C8F91000030
64633+:1038A00025240002A744015826300008320F1FFFCC
64634+:1038B0000A0001F9AF8F0000AF40014C1120002C2D
64635+:1038C000000000008F590E10AF5901448F430E18AD
64636+:1038D000240200403C1F1000AF430148A3400152A6
64637+:1038E000A740015AAF400160A7400158AF420154C0
64638+:1038F000AF5F01780A0002278FBF00441120000645
64639+:103900000000000097460E0830CC004015800002F1
64640+:10391000000000000000000D8F4D017805A0FFFEA3
64641+:103920000000000097530E103C120500240E2000EA
64642+:10393000326AFFFF0152C025AF58014C8F4F0E1461
64643+:103940003C021000AF4F01448F500E1CAF50014895
64644+:10395000A34001528F840038A740015AAF40016054
64645+:10396000A7400158AF4E01540A000215AF4201783A
64646+:103970008F490E14AF4901448F430E1C0A00028E7A
64647+:10398000240200403C0E20FF27BDFFE03C1A8000CF
64648+:103990003C0F800835CDFFFDAFBF001CAFB2001853
64649+:1039A000AFB10014AFB00010AF8F0040AF4D0E00AC
64650+:1039B0000000000000000000000000000000000007
64651+:1039C000000000003C0C00FF358BFFFDAF4B0E00EC
64652+:1039D0003C0660048CC95000240AFF7F3C11600043
64653+:1039E000012A40243507380CACC750008E24043817
64654+:1039F00024050009AF4500083083FFFF38622F71AE
64655+:103A00002450C0B3AF8000480E000068AF800000B3
64656+:103A100052000001AE20442C0E0004353C11800001
64657+:103A20000E000ED9363000708F8A00403C1208001C
64658+:103A300026523C88020088218E0800008F5F00001B
64659+:103A40003BF900013338000113000017AF88003044
64660+:103A5000022048218D2700003C0F08008DEF006CEC
64661+:103A60003C0C08008D8C006800E8C02301F8282178
64662+:103A70000000682100B8302B018D582101664021DB
64663+:103A80003C010800AC25006C3C010800AC28006833
64664+:103A90008F44000038830001306200011440FFEDC4
64665+:103AA00000E04021AF8700308E0C00003C0508008C
64666+:103AB0008CA5006C3C0408008C84006801883023CD
64667+:103AC00000A638210000102100E6402B00821821BA
64668+:103AD0000068F8213C010800AC27006C3C0108009C
64669+:103AE000AC3F00688F49010025590088AF99004418
64670+:103AF000AF890038AF4900208E070000AF87003043
64671+:103B00008F4D017805A0FFFE000000008E0600002A
64672+:103B10003C0B08008D6B00743C0408008C84007022
64673+:103B200000C728230165F8210000102103E5402B80
64674+:103B30000082382100E8C821240908003C0108005F
64675+:103B4000AC3F00743C010800AC390070AF4901780B
64676+:103B500093580108A398003E938F003E31EE000178
64677+:103B600015C000158F830038240E0D00106E00194B
64678+:103B7000240F0F00106F001D00000000915900007D
64679+:103B800024180050332900FF113800043C1F400066
64680+:103B9000AF5F01380A0002E7000000000E00090EC6
64681+:103BA000000000008F8A00403C1F4000AF5F0138DA
64682+:103BB0000A0002E700000000938D003E31AC0006D1
64683+:103BC000000C51000E0000CE0152D8210A00034320
64684+:103BD0008F8A00403C1B0800277B3D080E0000CE6A
64685+:103BE000000000000A0003438F8A00403C1B0800CD
64686+:103BF000277B3D280E0000CE000000000A00034392
64687+:103C00008F8A004090AA00018FAB00108CAC00108E
64688+:103C10003C0300FF8D680004AD6C00208CAD0014E7
64689+:103C200000E060213462FFFFAD6D00248CA7001816
64690+:103C30003C09FF000109C024AD6700288CAE001CC0
64691+:103C40000182C82403197825AD6F0004AD6E002CE5
64692+:103C50008CAD0008314A00FFAD6D001C94A9000234
64693+:103C60003128FFFFAD68001090A70000A56000029A
64694+:103C7000A1600004A167000090A30002306200FF71
64695+:103C80000002198210600005240500011065000E75
64696+:103C90000000000003E00008A16A00018CD80028A1
64697+:103CA000354A0080AD7800188CCF0014AD6F001439
64698+:103CB0008CCE0030AD6E00088CC4002CA16A0001CF
64699+:103CC00003E00008AD64000C8CCD001CAD6D001845
64700+:103CD0008CC90014AD6900148CC80024AD680008BC
64701+:103CE0008CC70020AD67000C8CC200148C8300646C
64702+:103CF0000043C82B13200007000000008CC20014F2
64703+:103D0000144CFFE400000000354A008003E0000886
64704+:103D1000A16A00018C8200640A000399000000007F
64705+:103D200090AA000027BDFFF88FA9001CA3AA0000DD
64706+:103D30008FAE00003C0FFF808FA8001835E2FFFF18
64707+:103D40008CCD002C01C26024AFAC0000A120000487
64708+:103D500000E06021A7A000028FB800008D270004BA
64709+:103D60000188182100A0582100C05021006D28268C
64710+:103D70003C06FF7F3C0F00FF2CAD000135EEFFFF3E
64711+:103D800034D9FFFF3C02FF0003193024000D1DC091
64712+:103D9000010EC82400E2C02400C370250319782551
64713+:103DA000AD2E0000AD2F00048D450024AFAE000005
64714+:103DB000AD2500088D4D00202405FFFFAD2D000C22
64715+:103DC000956800023107FFFFAD27001091660018CB
64716+:103DD00030C200FF000219C2506000018D4500345E
64717+:103DE000AD2500148D67000827BD0008AD27001C15
64718+:103DF0008C8B00CCAD2C0028AD20002CAD2B0024EA
64719+:103E0000AD20001803E00008AD20002027BDFFE032
64720+:103E1000AFB20018AFB10014AFB00010AFBF001CBC
64721+:103E20009098000000C088213C0D00FF330F007FF8
64722+:103E3000A0CF0000908E000135ACFFFF3C0AFF00D0
64723+:103E4000A0CE000194A6001EA22000048CAB00149A
64724+:103E50008E29000400A08021016C2824012A40241E
64725+:103E60000080902101052025A6260002AE24000432
64726+:103E700026050020262400080E00007624060002F5
64727+:103E800092470000260500282624001400071E0083
64728+:103E90000003160324060004044000032403FFFF6C
64729+:103EA000965900023323FFFF0E000076AE23001068
64730+:103EB000262400248FBF001C8FB200188FB100147D
64731+:103EC0008FB0001024050003000030210A0000809C
64732+:103ED00027BD002027BDFFD8AFB1001CAFB0001830
64733+:103EE000AFBF002090A80000240200018FB0003C6A
64734+:103EF0003103003F00808821106200148FAA00382F
64735+:103F0000240B0005506B0016AFAA001000A0202162
64736+:103F100000C028210E0003DC02003021922400BCE6
64737+:103F2000308300021060000326060030ACC00000A1
64738+:103F300024C600048FBF00208FB1001C8FB0001872
64739+:103F400000C0102103E0000827BD002801403821EF
64740+:103F50000E00035AAFB000100A0004200000000059
64741+:103F60000E0003A1AFB000140A00042000000000FE
64742+:103F70003C02000A034218213C04080024843D6CE2
64743+:103F80002405001A000030210A000080AF8300548D
64744+:103F90003C038000346200708C48000000A058216F
64745+:103FA00000C04821308A00FFAF8800308F4401787C
64746+:103FB0000480FFFE3C0C8000358600708CC500003C
64747+:103FC0003C0308008C6300743C1808008F180070D4
64748+:103FD00000A82023006468210000C82101A4782BD8
64749+:103FE0000319702101CF60213C010800AC2D007441
64750+:103FF0003C010800AC2C00708F480E14AF480144FF
64751+:10400000AF47014CA34A0152A74B01589346010800
64752+:1040100030C5000854A0000135291000934B090059
64753+:1040200024070050316A00FF11470007000000001C
64754+:104030008F450E1CAF450148AF4901543C091000A3
64755+:1040400003E00008AF490178934D010831A800084A
64756+:104050001100001000000000934F010831EE001025
64757+:1040600051C00001352900083C04080090843DD06F
64758+:10407000A34401508F4309A4AF4301488F4209A0D4
64759+:10408000AF420144AF4901543C09100003E000086D
64760+:10409000AF4901783C1908008F393D8C333800084E
64761+:1040A0005700FFF1352900080A00047300000000E2
64762+:1040B00024070040AF470814AF4008108F4209445E
64763+:1040C0008F4309508F4409548F45095C8F46094C32
64764+:1040D000AF820064AF830050AF84004CAF85005CBA
64765+:1040E00003E00008AF8600609346010930C5007FF9
64766+:1040F000000518C0000521400083102103E00008DE
64767+:10410000244200883C09080091293D9124A800021E
64768+:104110003C05110000093C0000E8302500C51825C9
64769+:1041200024820008AC83000003E00008AC80000497
64770+:104130009347010B8F4A002C974F09083C18000E3B
64771+:104140000358482131EEFFFF000E41C0AF48002C5C
64772+:1041500097430908952C001A008040212403000190
64773+:10416000318BFFFFAC8B00008D2D001C00A058216F
64774+:1041700000C06021AC8D00048D24002030E7004099
64775+:10418000AD04000891220019304400031083004858
64776+:104190002885000214A00062240600021086005642
64777+:1041A00024190003109900660000000010E0003A96
64778+:1041B000000000003C07080094E73D8624E200016F
64779+:1041C000934F0934934709219525002A31EE00FFCA
64780+:1041D000000E488230ED00FF978700580009360036
64781+:1041E000000D1C003044FFFF00C310250044C02513
64782+:1041F00000A778213C19400003197025000F4C00DE
64783+:10420000AD090004AD0E0000934D09203C030006EB
64784+:1042100025090014000D360000C32025AD04000858
64785+:104220008F59092C24E5000130A27FFFAD19000C45
64786+:104230008F580930A782005825020028AD180010B9
64787+:104240008F4F0938AD0F0014AD2B00048F4E09407D
64788+:10425000AD2E0008934D09373C05080090A53D9010
64789+:104260008F4409488F46094031A700FF00EC182110
64790+:10427000008678230003C7000005CC0003196025E1
64791+:1042800031E8FFFC01885825AD2B000CAD20001053
64792+:1042900003E00008AF4A002C3C0D080095AD3D86B8
64793+:1042A0003C0E080095CE3D800A0004C901AE1021E5
64794+:1042B0003C05080094A53D8A3C06080094C63D8054
64795+:1042C0003C18080097183D7C952E002400A6782104
64796+:1042D00001F86823000E240025A2FFF200821825B1
64797+:1042E00024190800AD03000CAD190014AD00001036
64798+:1042F0000A0004C4250800189526002495250028E6
64799+:104300000006C40000057C00370E810035ED080072
64800+:10431000AD0E000CAD0D00100A0004C425080014F9
64801+:104320001480FFA200000000952400240004140063
64802+:1043300034430800AD03000C0A0004C42508001033
64803+:104340003C03080094633D8A3C05080094A53D8029
64804+:104350003C06080094C63D7C953900249538002819
64805+:10436000006520210086782300196C000018740075
64806+:1043700025E2FFEE01C2202535A3810024190800A3
64807+:10438000AD03000CAD040010AD190018AD00001411
64808+:104390000A0004C42508001C03E00008240201F4FC
64809+:1043A00027BDFFE8AFB00010AFBF00140E000060E3
64810+:1043B0000080802124050040AF4508148F83005001
64811+:1043C0008F84004C8F85005C0070182100641023DE
64812+:1043D00018400004AF830050AF6300548F66005450
64813+:1043E000AF86004C1200000C000000008F440074E7
64814+:1043F000936800813409FA002D07000710E00005DA
64815+:1044000000891021936C0081240B01F4018B50046E
64816+:1044100001441021AF62000C8F4E095C01C5682376
64817+:1044200019A000048FBF00148F4F095CAF8F005C90
64818+:104430008FBF00148FB000100A00006227BD001863
64819+:104440008F8400648F8300508F82004CAF640044DF
64820+:10445000AF63005003E00008AF6200543C038000EB
64821+:10446000346200708C43000027BDFFF8308700FFE6
64822+:1044700030A900FF30C800FFAF8300308F440178BF
64823+:104480000480FFFE3C028000345900708F38000029
64824+:10449000A3A700033C0708008CE700748FAC000062
64825+:1044A0003C0608008CC60070030378233C0E7FFF97
64826+:1044B00000EFC82135CDFFFF00005021018D2824D9
64827+:1044C00000CA1821000847C0032F202B00A8102580
64828+:1044D0000064C021AFA200003C010800AC390074A8
64829+:1044E0003C010800AC380070934F010AA3A0000201
64830+:1044F0003C0E80FFA3AF00018FAC0000312B007F8A
64831+:1045000035CDFFFF018D4824000B5600012A4025C0
64832+:10451000240730002406FF803C05100027BD00085A
64833+:10452000AF48014CAF470154A7400158A346015280
64834+:1045300003E00008AF45017827BDFFE8AFBF0014D6
64835+:10454000AFB000108F6500743C068000309000FF13
64836+:1045500000A620250E000060AF6400749363000580
64837+:10456000346200080E000062A362000502002021F0
64838+:104570008FBF00148FB00010240500052406000131
64839+:104580000A00057027BD001827BDFFE03C0380002E
64840+:10459000AFB00010AFBF0018AFB1001434620070AC
64841+:1045A0008C470000309000FF30A800FFAF8700303C
64842+:1045B0008F4401780480FFFE3C18800037110070A2
64843+:1045C0008E2F00003C0D08008DAD00743C0A0800E1
64844+:1045D0008D4A007001E7702301AE282100005821A8
64845+:1045E00000AE302B014B4821012638213C01080048
64846+:1045F000AC250074000088213C010800AC27007045
64847+:104600001100000F000000008F6200742619FFFFE8
64848+:104610003208007F0002FE0233E5007F150000062D
64849+:10462000332200FF2407FF800207202624A3FFFF78
64850+:1046300000838025320200FF0040802124111008F1
64851+:104640000E000060000000008F49081831250004AA
64852+:1046500014A0FFFD3218007F001878C000187140C8
64853+:1046600001CF682125AC0088AF4C0818274A098083
64854+:104670008D4B0020AF4B01448D460024AF460148CE
64855+:10468000A35001500E000062A740015802201021E3
64856+:104690008FBF00188FB100148FB0001003E0000826
64857+:1046A00027BD002027BDFFE8308400FFAFBF00100A
64858+:1046B0000E0005BB30A500FF8F8300508FBF001098
64859+:1046C000344500402404FF903C02100027BD001830
64860+:1046D000AF43014CA3440152AF45015403E000082D
64861+:1046E000AF4201789343093E306200081040000D4C
64862+:1046F0003C0901013528080AAC8800008F47007486
64863+:10470000AC8700043C06080090C63D9030C5001000
64864+:1047100050A00006AC8000088F6A0060AC8A0008D8
64865+:104720002484000C03E00008008010210A00062207
64866+:104730002484000C27BDFFE8AFBF0014AFB0001009
64867+:104740009346093F00A050210005288000853823AA
64868+:1047500030C200FF240300063C09080095293D866D
64869+:1047600024E8FFD824050004104300372406000283
64870+:104770009750093C3C0F020400063400320EFFFF44
64871+:1047800001CF6825AC8D0000934C093E318B002091
64872+:104790001160000800000000934309363C02010349
64873+:1047A000345F0300307900FF033FC0252405000873
64874+:1047B000AC98000493430934935909210005F88209
64875+:1047C000306200FF0002C082332F00FF00186E002D
64876+:1047D000000F740001AE6025018920253C094000CE
64877+:1047E00000898025ACF0FFD8934309378F4F0948E3
64878+:1047F0008F580940306200FF004AC821033F7021F2
64879+:1048000001F86023000E6F0001A650253185FFFCE2
64880+:10481000001F58800145482501683821AD09002056
64881+:104820000E00006024F00028240400040E00006242
64882+:10483000A364003F020010218FBF00148FB000104E
64883+:1048400003E0000827BD00180A0006352406001200
64884+:1048500027BDFFD024090010AFB60028AFB5002453
64885+:10486000AFB40020AFB10014AFB000103C0108009D
64886+:10487000A0293D90AFBF002CAFB3001CAFB2001811
64887+:1048800097480908309400FF3C02000E3107FFFFF3
64888+:10489000000731C0AF46002C974409089344010B30
64889+:1048A00030B500FF03428021308300300000B0218A
64890+:1048B0001060012500008821240C00043C01080040
64891+:1048C000A02C3D90934B093E000B5600000A2E038E
64892+:1048D00004A0016000000000AF400048934F010BAE
64893+:1048E00031EE002011C00006000000009358093E80
64894+:1048F00000189E0000139603064001890000000086
64895+:104900009344010B30830040106000038F930050EC
64896+:104910008F8200502453FFFF9347093E30E6000882
64897+:1049200014C0000224120003000090219619002CEC
64898+:1049300093580934934F0937A7990058330C00FF57
64899+:1049400031EE00FF024E6821000D5880016C5021AD
64900+:10495000015140213C010800A4283D869205001821
64901+:1049600030A900FF010918213C010800A4233D885B
64902+:104970009211001816200002000000000000000D37
64903+:104980003C010800A4233D8A3C010800A4203D808E
64904+:104990003C010800A4203D7C935F010B3063FFFFC6
64905+:1049A00033F00040120000022464000A2464000B6B
64906+:1049B0003091FFFF0E00009E022020219358010B32
64907+:1049C0003C08080095083D8A0040202100185982C3
64908+:1049D000316700010E00049A01072821934C010B56
64909+:1049E0008F4B002C974E09083C0F000E034F4021BF
64910+:1049F00031CDFFFF000D51C0AF4A002C974309088D
64911+:104A00009505001A004038212404000130A9FFFF59
64912+:104A1000AC4900008D06001C00404821318A00404E
64913+:104A2000AC4600048D020020ACE20008910300199E
64914+:104A300030630003106400EC28790002172001188D
64915+:104A4000241000021070010C241F0003107F011EAF
64916+:104A500000000000114000DE000000003C090800DA
64917+:104A600095293D8625220001935F0934934E092143
64918+:104A70009504002A33F900FF0019C08231CF00FFEE
64919+:104A8000978E005800184600000F6C00010D80251D
64920+:104A90003045FFFF02051025008E50213C034000E9
64921+:104AA00000433025000A6400ACEC0004ACE60000D2
64922+:104AB000935F09203C19000624EC0014001FC60077
64923+:104AC00003197825ACEF00088F48092C25CD00018B
64924+:104AD00031A57FFFACE8000C8F500930A785005846
64925+:104AE00024E80028ACF000108F4409380100802130
64926+:104AF000ACE40014AD9300048F530940AD9300085B
64927+:104B0000934A09373C19080093393D908F4309486F
64928+:104B10008F460940314200FF0052F82100667023A1
64929+:104B2000001F7F000019C40001F8282531CDFFFCCB
64930+:104B300000AD2025AD84000CAD800010AF4B002CE3
64931+:104B4000934B093E317300081260000D3C060101D1
64932+:104B500034CC080AACEC00288F530074AD13000469
64933+:104B60003C0B0800916B3D903167001050E0000352
64934+:104B7000AD0000088F6A0060AD0A00082510000C27
64935+:104B800012C0003D000000009343093F24160006B8
64936+:104B900024060004306200FF105600C924070002FA
64937+:104BA0009758093C3C0F0204330DFFFF01AF40252D
64938+:104BB000AE0800009345093E30A400201080000894
64939+:104BC00000000000935309363C0B0103357F0300BE
64940+:104BD000327900FF033F7025AE0E00042406000862
64941+:104BE000934F093493480921312AFFFF31ED00FF2B
64942+:104BF000000D1082310300FF0002B60000032C00FC
64943+:104C000002C56025018A9825001220803C094000D9
64944+:104C10000204502302695825AD4BFFD8935F093732
64945+:104C20008F4F09488F58094033F900FF0332702134
64946+:104C30000006B08201D668210007440001F828234D
64947+:104C4000000D1F000068302530A2FFFC2547FFD86B
64948+:104C500000C260250016808002074821ACEC0020CD
64949+:104C6000253000280E00006024120004A372003FCB
64950+:104C70000E000062000000009347010B30F200407C
64951+:104C8000124000053C1900FF8E180000372EFFFF70
64952+:104C9000030E3024AE0600000E0000C702202021C3
64953+:104CA0003C10080092103D90321100031220000FBA
64954+:104CB00002A028218F89005025330001AF930050B6
64955+:104CC000AF7300508F6B00540173F8231BE0000298
64956+:104CD000026020218F640054AF6400548F4C007434
64957+:104CE000258401F4AF64000C02A028210280202159
64958+:104CF000A76000680E0005BB3C1410008F850050B3
64959+:104D000034550006AF45014C8F8A00488FBF002CF8
64960+:104D10008FB3001C25560001AF9600488FB20018D3
64961+:104D2000A34A01528FB60028AF5501548FB1001429
64962+:104D3000AF5401788FB500248FB400208FB00010DD
64963+:104D400003E0000827BD00309358093E00189E007C
64964+:104D500000139603064200362411000293440923EF
64965+:104D6000308300021060FEDD8F8600608F8200506D
64966+:104D700014C2FEDA000000000E0000600000000017
64967+:104D80009369003F24070016312800FF1107000C2B
64968+:104D9000240500083C0C0800918C3D90358B0001E7
64969+:104DA0003C010800A02B3D90936A003F314300FF77
64970+:104DB00010650065240D000A106D005E2402000CD1
64971+:104DC0000E000062000000000A00069000000000D3
64972+:104DD0003C09080095293D863C0A0800954A3D801B
64973+:104DE0000A0006F3012A10213C09080095293D8A92
64974+:104DF0003C04080094843D803C06080094C63D7C39
64975+:104E000095030024012410210046F8230003CC0060
64976+:104E100027F0FFF20330C025240F0800ACF8000C87
64977+:104E2000ACEF0014ACE000100A0006EE24E7001816
64978+:104E30003C010800A0313D90935F093E241600011B
64979+:104E400033F900201720FEA5241100080A0006905F
64980+:104E5000241100048F6E00848F4D094011A0FE9E26
64981+:104E6000AF8E0050240F00143C010800A02F3D908D
64982+:104E70000A00068F00000000950E0024950D002802
64983+:104E8000000E6400000D2C003589810034A6080056
64984+:104E9000ACE9000CACE600100A0006EE24E70014B2
64985+:104EA0001460FEEC000000009502002400021C00CB
64986+:104EB00034640800ACE4000C0A0006EE24E700109D
64987+:104EC0000A000741240700123C02080094423D8A70
64988+:104ED0003C06080094C63D803C03080094633D7C7A
64989+:104EE00095100024951900280046F82103E3C023FB
64990+:104EF00000106C0000197400270FFFEE01CF282569
64991+:104F000035AC8100ACEC000CACE5001024070800C7
64992+:104F1000AD2700182527001C0A0006EEAD2000145E
64993+:104F20008F7F004CAF7F00548F7900540A000699A0
64994+:104F3000AF790050A362003F0E0000620000000045
64995+:104F40000A00069000000000240200140A0008274E
64996+:104F5000A362003F27BDFFE8308400FFAFBF001011
64997+:104F60000E0005BB30A500FF9378007E9379007F8B
64998+:104F7000936E00809368007A332F00FF001866005C
64999+:104F8000000F6C0031CB00FF018D4825000B520053
65000+:104F90008FBF0010012A3825310600FF344470000D
65001+:104FA00000E628252402FF813C03100027BD0018DD
65002+:104FB000AF45014CAF440154A342015203E0000845
65003+:104FC000AF43017827BDFFD8AFB20018AFB10014CE
65004+:104FD000AFB00010AFBF0020AFB3001C9342010977
65005+:104FE000308600FF30B000FF000618C23204000215
65006+:104FF0003071000114800005305200FF93670005F6
65007+:1050000030E5000810A0000D30C80010024020213B
65008+:105010000E0005A702202821240400018FBF0020D4
65009+:105020008FB3001C8FB200188FB100148FB0001026
65010+:105030000080102103E0000827BD00281500003281
65011+:105040000000000093430109000028213062007F26
65012+:10505000000220C00002F94003E49821267900886C
65013+:10506000033B98218E7800248E6F0008130F0046B2
65014+:10507000000000008F640084241800020004FD82F8
65015+:1050800033F900031338007C0000000093660083AE
65016+:10509000934A0109514600043205007C10A00060CB
65017+:1050A000000000003205007C14A0005302402021C3
65018+:1050B00016200006320400018E7F00248F5901045F
65019+:1050C00017F9FFD600002021320400011080000AE9
65020+:1050D000024020218F4209408F9300641053000644
65021+:1050E000000000000E00066D022028218F430940B9
65022+:1050F000AF630044024020210E0006020220282156
65023+:105100000A000860240400013C0908008D2900649D
65024+:10511000252600013C010800AC26006416000012A0
65025+:10512000000000008F6D00843C0E00C001AE6024C2
65026+:1051300015800005024020210E00082E02202821A3
65027+:105140000A00086024040001240500040E00057014
65028+:1051500024060001024020210E00082E02202821F2
65029+:105160000A000860240400010E000041240400012C
65030+:10517000936B007D020B50250E000062A36A007D38
65031+:105180000A0008A38F6D00848F6600748F480104A5
65032+:105190008E67002400064E021507FFB63126007FF9
65033+:1051A000936B008326440001308A007F1146004340
65034+:1051B000316300FF5464FFB08F6400842645000112
65035+:1051C00030B1007F30A200FF122600042405000148
65036+:1051D000004090210A00087624110001240FFF806E
65037+:1051E000024F702401CF9026324200FF00409021F0
65038+:1051F0000A000876241100010E00066D0220282105
65039+:10520000321800301300FFAA321000820240202121
65040+:105210000E0005A7022028210A00086024040001CE
65041+:105220008F6E00743C0F80002405000301CF902591
65042+:10523000AF72007493710083240600010E000570A4
65043+:10524000322400FF0E00004124040001936D007D14
65044+:10525000020D60250E000062A36C007D3C0B08006F
65045+:105260008D6B0054257000013C010800AC300054E7
65046+:105270000A000860240400018F6800743C09800063
65047+:105280002405000401093825AF6700749363008387
65048+:10529000240600010E000570306400FF0E0000417E
65049+:1052A000240400019362007D020298250E00006232
65050+:1052B000A373007D0A00086024040001324D0080C1
65051+:1052C00039AC0080546CFF6C8F6400840A0008C9FC
65052+:1052D0002645000127BDFFC83C0A0008AFBF0030CB
65053+:1052E000AFB5002CAFB40028AFB30024AFB200209C
65054+:1052F000AFB1001CAFB00018034AD8212409004008
65055+:10530000AF490814AF4008108F4209448F43095039
65056+:105310008F4609548F47095C8F48094C9344010814
65057+:105320009345010BAF820064308400FF30A500FF7D
65058+:10533000AF830050AF86004CAF87005C0E00084A78
65059+:10534000AF8800601440017D8FBF0030A760006807
65060+:10535000934D0900240B00503C15080026B53D482C
65061+:1053600031AC00FF3C12080026523D58118B00035F
65062+:10537000000000000000A8210000902193510109C5
65063+:105380008F9F005024040010322E007F000E68C052
65064+:10539000000E6140018D282124B40088AF54081804
65065+:1053A0008F4901048F4A09A43C0B000E034BC02116
65066+:1053B000012A10233C010800AC223D6C8F430958A0
65067+:1053C0003C010800A0243D9097470908007F302346
65068+:1053D0003C010800AC263D7030E8FFFF0008C9C062
65069+:1053E0003C010800AC3F3D94AF59002C974209089E
65070+:1053F0009710002C8EB10000930F001803749821B1
65071+:10540000A7900058AF9300440220F80931F000FF44
65072+:10541000304E000215C001B2304F000111E0014FC3
65073+:10542000000000009343093E3066000814C00002EB
65074+:10543000241400030000A0218F5809A424130001A4
65075+:105440003C010800AC383D98934F0934935109371B
65076+:1054500031EC00FF322E00FF028E6821000D288003
65077+:1054600000AC5021015058213C010800A42B3D887C
65078+:105470003C010800A42A3D8693490934312200FFEB
65079+:1054800002022021249000103C010800A4303D8439
65080+:10549000240700068F9F00503C010800AC273D8C7C
65081+:1054A0008F88005C8F59095800008021011F282334
65082+:1054B00004A00149033F20230480014700A4302BAE
65083+:1054C00010C00149000000003C010800AC253D70FF
65084+:1054D0008E4200000040F809000000003043000246
65085+:1054E000146000F80040882130440001548000100E
65086+:1054F0008E4200043C0908008D293D743C0AC0001E
65087+:10550000012A8025AF500E008F45000030AB000807
65088+:105510001160FFFD00000000974D0E0824100001EF
65089+:10552000A78D003C8F4C0E04AF8C00348E420004DB
65090+:105530000040F8090000000002228825322E0002F7
65091+:1055400015C00180000000003C09080095293D7C41
65092+:105550003C06080094C63D883C0A0800954A3D7EFA
65093+:105560003C1908008F393D74012660213C18080061
65094+:105570008F183D983C03080094633D92018A2021D6
65095+:105580008F4E09400329F821248F000203E32821CC
65096+:10559000031968213C010800A42C3D8AAF8E0064E9
65097+:1055A0003C010800AC2D3D983C010800A4253D803D
65098+:1055B0000E00009E31E4FFFF8F870048004020214D
65099+:1055C0003C010800A0273D918E42000824E800011C
65100+:1055D000AF8800480040F809000000009344010B28
65101+:1055E0008F4C002C974A09083C0B000E034B4021BE
65102+:1055F0003149FFFF000919C08F8B0050AF43002CC9
65103+:10560000974309089506001A00403821308A004067
65104+:1056100030DFFFFFAC5F00008D19001C0040482107
65105+:10562000AC5900048D180020AC580008910F0019E7
65106+:1056300031E30003107300F0000000002862000254
65107+:105640001440010924050002106500FD240D00032B
65108+:10565000106D010D00000000114000D90000000095
65109+:105660003C0A0800954A3D8625420001934D0934C5
65110+:1056700093580921950E002A31A300FF00032082D0
65111+:10568000331F00FF9798005800047E00001FCC00D5
65112+:1056900001F940253049FFFF0109102501D83021CB
65113+:1056A0003C0540000045502500066C00ACED0004B0
65114+:1056B000ACEA0000934309203C04000624ED0014EA
65115+:1056C0000003FE0003E4C825ACF900088F49092C4B
65116+:1056D000270F000131EE7FFFACE9000C8F48093045
65117+:1056E000A78E005824E90028ACE800108F4509383F
65118+:1056F00001204021ACE50014ADAB00048F4209400D
65119+:10570000ADA20008934B09373C1F080093FF3D9062
65120+:105710008F4309488F4A0940316600FF00D4202199
65121+:10572000006A78230004C700001FCC000319282555
65122+:1057300031EEFFFC00AE1025ADA2000CADA00010B4
65123+:10574000AF4C002C934C093E318B00085160000F88
65124+:105750008E58000C3C06010134CA080AACEA002845
65125+:105760008F4B0074AD2B00043C0C0800918C3D90D5
65126+:105770003187001050E00003AD2000088F62006008
65127+:10578000AD2200082528000C8E58000C0300F809F3
65128+:10579000010020213C19080097393D8A3C1F080070
65129+:1057A00097FF3D7E033F782125E900020E0000C7E8
65130+:1057B0003124FFFF3C0E08008DCE3D6C3C080800F4
65131+:1057C0008D083D7401C828233C010800AC253D6CC0
65132+:1057D00014A00006000000003C0308008C633D8C10
65133+:1057E000346400403C010800AC243D8C1200007081
65134+:1057F0008F8C00448F470E108F900044AE0700201E
65135+:105800008F4D0E18AE0D00243C10080096103D8000
65136+:105810000E0000600000000024020040AF420814A7
65137+:105820008F8600508F8A004C00D01821006A5823C0
65138+:1058300019600004AF830050AF6300548F650054BB
65139+:10584000AF85004C1200000C000000008F44007473
65140+:10585000936800813409FA002D0E000711C000057D
65141+:1058600000891821937F0081241901F403F9780439
65142+:1058700001E41821AF63000C8F44095C8F83005C46
65143+:105880000083C0231B000003000000008F50095C50
65144+:10589000AF90005C0E000062000000008F8C005092
65145+:1058A0008E4700103C010800AC2C3D9400E0F80944
65146+:1058B000000000003C0D08008DAD3D6C55A0FEF5CC
65147+:1058C000240700068F450024975909088F8B006430
65148+:1058D0008F9400503C0F001F978200588F86005411
65149+:1058E0008F93004C3328FFFF35E9FF8000A9502437
65150+:1058F000000871C032320100AF4E0024A4C2002C57
65151+:10590000AF4A0024AF6B0044AF740050AF73005433
65152+:105910001640008032380010570000868EA4000424
65153+:10592000322300405460001B8EB100088EB0000C82
65154+:105930000200F809000000008FBF00308FB5002C76
65155+:105940008FB400288FB300248FB200208FB1001CC9
65156+:105950008FB0001803E0000827BD00389347010905
65157+:105960008F8800380007FE0003E8C825AF59008083
65158+:105970008F5809A08F5309A4AFB80010AF580E1468
65159+:105980008FB40010AF540E10AF530E1C0A00096202
65160+:10599000AF530E180220F809000000008EB0000C72
65161+:1059A0000200F809000000000A000AA88FBF0030BA
65162+:1059B000A5800020A59300220A000A5BAD93002475
65163+:1059C0003C09080095293D863C06080094C63D80A8
65164+:1059D0000A0009F4012610213C010800AC203D70AA
65165+:1059E0000A00098E8E4200003C010800AC243D7084
65166+:1059F0000A00098E8E4200003C03080094633D8A31
65167+:105A00003C04080094843D803C1F080097FF3D7CC7
65168+:105A1000951800240064C821033F782300186C0007
65169+:105A200025EEFFF201AE2825AC45000C240208004B
65170+:105A3000ACE20014ACE000100A0009EF24E7001803
65171+:105A400095060024950900280006240000091C0082
65172+:105A5000349F810034790800ACFF000CACF90010D1
65173+:105A60000A0009EF24E700141460FEFB00000000A8
65174+:105A70009518002400187C0035EE0800ACEE000CF0
65175+:105A80000A0009EF24E700103C07080094E73D8076
65176+:105A90003C04080094843D8A3C03080094633D7CE8
65177+:105AA00095190024951800280087F82103E378232E
65178+:105AB0002407080000192C0000186C0025EEFFEEEA
65179+:105AC00001AE302534A28100AD2700182527001C27
65180+:105AD000AD22000CAD2600100A0009EFAD20001425
65181+:105AE00093520109000028210E000602324400FFF3
65182+:105AF0008FBF00308FB5002C8FB400288FB30024E7
65183+:105B00008FB200208FB1001C8FB0001803E0000896
65184+:105B100027BD0038935F010933E400FF0E00066DD6
65185+:105B200000002821323800105300FF7E322300404D
65186+:105B30008EA400040080F809000000000A000AA2F8
65187+:105B4000322300401200FF5F000000008F540E144B
65188+:105B50008F920044AE5400208F530E1C0A000A8A14
65189+:105B6000AE5300248F82001C008040213C040100C1
65190+:105B70009047008530E3002010600009000000001D
65191+:105B80003C0708008CE73D948F83001800E3202336
65192+:105B9000048000089389000414E30003010020211D
65193+:105BA00003E00008008010213C04010003E000082D
65194+:105BB000008010211120000B006738238F8C0020FB
65195+:105BC00024090034918B00BC316A0002514000016D
65196+:105BD0002409003000E9682B15A0FFF10100202105
65197+:105BE00000E938232419FFFC00B9C02400F9782407
65198+:105BF00000F8702B15C0FFEA01E8202130C2000335
65199+:105C00000002182314C00012306900030000302184
65200+:105C100000A9702101C6682100ED602B1180FFE012
65201+:105C20003C0401002D2F00010006482B01053821FE
65202+:105C300001E9302414C0FFDA24E4FFFC2419FFFC3E
65203+:105C400000B9C0240308202103E0000800801021CF
65204+:105C50008F8B002024060004916A00BC31440004AC
65205+:105C60001480FFEC00A970210A000B5E00003021B7
65206+:105C700027BDFFE8AFBF00108F460100934A01091E
65207+:105C80003C1F08008FFF00902407FF80314F00FF6A
65208+:105C900031E8007F0008614003E6C821032CC021E1
65209+:105CA00027090120012770243C010800A02F3DD0C6
65210+:105CB000AF4E080C3C0D08008DAD00903C040080F8
65211+:105CC0003482000301A65821016C182124650120AB
65212+:105CD00030AA007801424025AF48081C3C1F08004C
65213+:105CE0008FFF00908F88004003E6C0213319000722
65214+:105CF00003074824033A7821AF49002825E909C061
65215+:105D0000952E00023C0D08008DAD008C3C0A080069
65216+:105D10008D4A009031CC3FFF01A61821000C59801C
65217+:105D2000006B282100A72024AF44002C95220002FC
65218+:105D30003C1F08008FFF008C9107008530593FFF02
65219+:105D400003E678210019C1800146702101F868211D
65220+:105D500031CC007F31AB007F019A2821017A50219C
65221+:105D60003C03000C3C04000E00A328210144102138
65222+:105D700030E6002027470980AF82002CAF88001C46
65223+:105D8000AF890024AF85002010C00006AF8700282F
65224+:105D90008D0200508CA4010C0044302318C0007701
65225+:105DA00000000000910C0085240DFFDF018D3824D8
65226+:105DB000A10700858F8B001C8F8900248F87002806
65227+:105DC0008D65004CAF850018912F000D31EE00203D
65228+:105DD00011C000170000000024090001A38900047D
65229+:105DE000AF80000C8CE400248F85000C240A00088E
65230+:105DF000AF800008AF8000103C010800A42A3D7E5F
65231+:105E00003C010800A4203D920E000B32000030211E
65232+:105E10008F8500248FBF0010AF82001490A8000D62
65233+:105E200027BD00180008394203E0000830E20001F5
65234+:105E3000913F00022418000133F900FF001921826C
65235+:105E400010980039240800021088005B8F86002C0F
65236+:105E50008CE5002414A0001B8F9F002091220000DD
65237+:105E6000240A00053046003F10CA00472404000100
65238+:105E70008F860008A3840004AF860010AF86000C54
65239+:105E80008CE400248F85000C240A00083C010800E3
65240+:105E9000A42A3D7E3C010800A4203D920E000B3256
65241+:105EA000000000008F8500248FBF0010AF82001417
65242+:105EB00090A8000D27BD00180008394203E0000833
65243+:105EC00030E200018CF800088CF900248FEE00C449
65244+:105ED000A38000048CE40024AF8E000C8F85000C9E
65245+:105EE0008F86000803197823240A0008AF8F00105A
65246+:105EF0003C010800A42A3D7E3C010800A4203D92FC
65247+:105F00000E000B32000000008F8500248FBF0010B0
65248+:105F1000AF82001490A8000D27BD00180008394278
65249+:105F200003E0000830E20001912300003062003FEE
65250+:105F3000104400278F8500208CE400241480002169
65251+:105F4000000000008D2E00183C187FFF8F85002078
65252+:105F5000370FFFFF01CF1824AF8300088F9F000881
65253+:105F60008CA8008403E8C82B1720000203E020213E
65254+:105F70008CA400840A000BEDAF8400088CA3010CF4
65255+:105F80000A000BCBAF8300188D2C00188F860008F9
65256+:105F90003C0D7FFF8F89002035A3FFFF018358242C
65257+:105FA00024040001AF8B0010AD2000CCA3840004BA
65258+:105FB0000A000BF9AF86000C8CCA00140A000BED26
65259+:105FC000AF8A00088CA300C80A000C30AF83000819
65260+:105FD0008F84002C8CAC00648C8D0014018D582BA8
65261+:105FE00011600004000000008CA200640A000C3064
65262+:105FF000AF8200088C8200140A000C30AF820008C7
65263+:106000008F85000C27BDFFE0AFBF0018AFB10014B3
65264+:1060100014A00007AFB000108F86002424020005F2
65265+:1060200090C400003083003F106200B68F840020CF
65266+:106030008F91000800A080218F8C00283C0508006B
65267+:106040008CA53D708D8B000431663FFF00C5502B41
65268+:106050005540000100C02821938D000411A0007359
65269+:1060600000B0F82B8F98002024040034930F00BC5C
65270+:1060700031EE000251C000012404003000A4C82BFE
65271+:10608000172000D10000000000A4282300B0F82B46
65272+:106090003C010800A4243D7C17E000680200202198
65273+:1060A0003C0308008C633D6C0083102B54400001BE
65274+:1060B000008018218F8800243C010800AC233D7427
65275+:1060C000000048219104000D308300205060000141
65276+:1060D0008F490E188F8300140123382B10E00059CC
65277+:1060E000000000003C0408008C843D7400895821A5
65278+:1060F000006B502B114000560090602B006930233C
65279+:1061000000C020213C010800AC263D7412000003B1
65280+:10611000241FFFFC1090008A32270003009FC82430
65281+:106120003C010800AC393D743C010800A4203D92BC
65282+:106130008F84000C120400078F830020AF910008A9
65283+:10614000020020218C7100CCAF90000C26300001A1
65284+:10615000AC7000CC3C0208008C423D748F8A001069
65285+:10616000240700180082202301422823AF84000C5A
65286+:1061700010800002AF850010240700108F86001CDD
65287+:106180003C010800A0273D902407004090CC0085EA
65288+:10619000318B00C0116700408F8D001414A00015D2
65289+:1061A00000002021934A01098F420974314500FF04
65290+:1061B0000002260224A300013090007F3071007F8E
65291+:1061C0001230007A2407FF80A0C300833C09080036
65292+:1061D0008D293D8C8F880024240D0002352C000869
65293+:1061E0003C010800A02D3DD13C010800AC2C3D8CA9
65294+:1061F00024040010910E000D31C6002010C00005CF
65295+:1062000000801821240800013C010800AC283D74DE
65296+:10621000348300018FBF00188FB100148FB00010BD
65297+:106220000060102103E0000827BD00203C010800A9
65298+:10623000A4203D7C13E0FF9A020020210A000C817B
65299+:1062400000A020213C0408008C843D740090602B49
65300+:106250001180FFAE000000003C0F080095EF3D7C70
65301+:1062600001E4702101C6682B11A000072C820004F4
65302+:106270003C1F60008FF954043338003F1700FFE5DE
65303+:10628000240300422C8200041040FFA0240300429B
65304+:106290000A000CDF8FBF0018152DFFC000000000A2
65305+:1062A0008CDF00743C0380002405FF8003E3C825D5
65306+:1062B000ACD9007490D80085240E0004240400108A
65307+:1062C000330F003F01E54025A0C800858F880024DA
65308+:1062D0003C010800A02E3DD1240300019106000DD1
65309+:1062E00030C9002015200003000000003C03080016
65310+:1062F0008C633D743C010800AC233D6C0A000CD655
65311+:10630000000000008F8700108C88008400E8282B94
65312+:1063100014A0000200E088218C910084240900016F
65313+:10632000A38900048F440E18022028210E000B328E
65314+:1063300002203021022080210A000C67AF82001465
65315+:1063400000071823306600033C010800A4263D9294
65316+:10635000122000058F8C0020918B00BC316A000454
65317+:106360001540001524CD00043C0F080095EF3D9228
65318+:1063700001E4702100AE302B50C0FF6E8F84000C02
65319+:106380002C85000514A0FFA32403004230980003CD
65320+:1063900017000002009818232483FFFC3C0108002A
65321+:1063A000AC233D740A000CA30000000000A7582491
65322+:1063B0000A000CCB016718263C010800A42D3D9271
65323+:1063C0000A000D33000000003C010800AC203D74C1
65324+:1063D0000A000CDE240300428F83001014600007C3
65325+:1063E000000010218F88002424050005910600007C
65326+:1063F00030C400FF108500030000000003E0000827
65327+:1064000000000000910A0018314900FF000939C25C
65328+:1064100014E0FFFA8F85001C3C04080094843D7C46
65329+:106420003C0308008C633D943C1908008F393D748F
65330+:106430003C0F080095EF3D920064C0218CAD0054E4
65331+:106440000319702101CF6021018D58231960001DAF
65332+:1064500000000000910E001C8F8C002C974B0E103A
65333+:1064600031CD00FF8D850004016D30238D88000043
65334+:1064700030CEFFFF000E510000AAC82100003821D5
65335+:1064800001072021032A182B0083C021AD990004A5
65336+:10649000AD980000918F000A01CF6821A18D000AFC
65337+:1064A0008F88002C974B0E12A50B0008950A003818
65338+:1064B00025490001A50900389107000D34E60008C0
65339+:1064C000A106000D03E000080000000027BDFFE06A
65340+:1064D000938700048F8F00248FAD00143C0E7FFF44
65341+:1064E0008F89000C35C8FFFFAFBF001CAFB000188C
65342+:1064F00001A8182491EA000D000717C03C1FBFFF38
65343+:10650000006258252D2E00018F90001837F9FFFFEB
65344+:106510003C1808008F183D943C0F080095EF3D8A09
65345+:1065200001796824000E47803C07EFFF3C05F0FF2F
65346+:1065300001A818253149002034E2FFFF34ACFFFFE9
65347+:106540000310582327A500102406000225EA0002A4
65348+:1065500000621824008080211520000200004021E4
65349+:106560008F480E1CA7AA0012056000372407000000
65350+:1065700030FF00FF001FCF008F8B001C00793825F3
65351+:10658000AFA70014916F00853C08080091083D9169
65352+:106590003C18DFFF31EE00C0370AFFFF000E182B5A
65353+:1065A0003C1F080097FF3D8400EA6824A3A800115F
65354+:1065B0000003174001A248258FB90010AFA90014AD
65355+:1065C0003C0A0800914A3D93A7BF00168FA800140B
65356+:1065D000032CC0243C0B01003C0F0FFF030B1825BC
65357+:1065E0003147000335EEFFFF010C68240007160059
65358+:1065F000006EF8243C09700001A2C82503E9582563
65359+:10660000AFB90014AFAB00100E000076A3A00015C8
65360+:106610008F8C0024260200089186000D30C40020D3
65361+:10662000108000068FBF001C3C05080094A53D802B
65362+:1066300024B0FFFF3C010800A4303D808FB000185B
65363+:1066400003E0000827BD00208F9800140118502B8C
65364+:106650005540FFC7240700010A000DB630FF00FFB8
65365+:106660009382000427BDFFE0AFBF00181040000F69
65366+:10667000008050218F880024240B00058F8900089A
65367+:10668000910700008F8400200100282130E3003FA3
65368+:106690008F86002C106B000800003821AFA9001075
65369+:1066A0000E00040EAFAA0014A38000048FBF0018D0
65370+:1066B00003E0000827BD00208D1900183C0F0800DA
65371+:1066C0008DEF3D748F9800103C027FFF8D08001401
65372+:1066D000345FFFFF033F682401F8702101AE60239F
65373+:1066E00001883821AFA900100E00040EAFAA0014D3
65374+:1066F0000A000E04A38000048F8700243C050800D4
65375+:1067000094A53D923C0208008C423D8C90E6000D21
65376+:106710000005240030C300201060002C00444025F8
65377+:106720008F85001C00006021240B000190A30085D0
65378+:1067300000004821240A00013C0F800035EE007063
65379+:106740008DC70000AF8700308F5801780700FFFE2B
65380+:106750003C038000347900708F3800003C0508004D
65381+:106760008CA500743C0D08008DAD007003077823E4
65382+:1067700000AF38210000102100EF302B01A22021B2
65383+:10678000008618213C010800AC2700743C01080079
65384+:10679000AC230070AF4B01483C1908008F393D9481
65385+:1067A000A7490144A74A0146AF59014C3C0B0800D8
65386+:1067B000916B3D91A34B0152AF4801543C0810002E
65387+:1067C000A74C015803E00008AF4801788F4B0E1C1E
65388+:1067D0003C0A08008D4A3D7497490E16974D0E14D9
65389+:1067E00001456021312AFFFF0A000E2731A9FFFF72
65390+:1067F0008F8300249064000D308200201040002917
65391+:10680000000000000000482100005021000040214D
65392+:106810003C07800034EB00708D670000AF870030CC
65393+:106820008F4C01780580FFFE3C0D800035AC007078
65394+:106830008D8B00003C0508008CA500743C0408000A
65395+:106840008C8400700167302300A67821000010219D
65396+:1068500001E6C82B0082C021031970213C01080009
65397+:10686000AC2F00743C010800AC2E0070AF49014809
65398+:106870003C0D08008DAD3D94A7480144240900401B
65399+:10688000A74A01463C081000240AFF91AF4D014C75
65400+:10689000A34A0152AF490154A740015803E0000840
65401+:1068A000AF4801788F490E1897460E1297450E1083
65402+:1068B00030CAFFFF0A000E5D30A8FFFF8F8300245F
65403+:1068C00027BDFFF89064000D308200201040003A90
65404+:1068D00000000000240B000100004821240A0001F0
65405+:1068E0003C088000350700708CE30000AF83003067
65406+:1068F0008F4C01780580FFFE3C0E80003C040800B0
65407+:1069000090843DD035C700708CEC00003C05080039
65408+:106910008CA50074A3A400033C1908008F390070F3
65409+:106920008FAD00000183302300A638210000102124
65410+:106930000322782100E6C02B01F8602101AE40253A
65411+:10694000AFA800003C010800AC2700743C0108001F
65412+:10695000AC2C00709346010A3C04080090843DD1A1
65413+:10696000A3A00002A3A600018FA300003C0580FFA6
65414+:106970003099007F34A2FFFF006278240019C6001E
65415+:1069800001F87025240D3000AF4E014C27BD0008E2
65416+:10699000AF4D0154A7400158AF4B0148A7490144EE
65417+:1069A000A74A01463C091000240AFF80A34A01526D
65418+:1069B00003E00008AF4901788F4B0E1897460E127E
65419+:1069C00097450E1030CAFFFF0A000E9130A9FFFF55
65420+:1069D0008F85001C2402008090A40085308300C0B5
65421+:1069E000106200058F8600208F8800088F87000CBA
65422+:1069F000ACC800C8ACC700C403E000080000000039
65423+:106A00003C0A0800254A39543C09080025293A2047
65424+:106A10003C08080025082DD43C07080024E73B3437
65425+:106A20003C06080024C637C43C05080024A5353CB4
65426+:106A30003C040800248431643C0308002463385C6F
65427+:106A40003C020800244236303C010800AC2A3D508C
65428+:106A50003C010800AC293D4C3C010800AC283D48F5
65429+:106A60003C010800AC273D543C010800AC263D64C5
65430+:106A70003C010800AC253D5C3C010800AC243D58BD
65431+:106A80003C010800AC233D683C010800AC223D609D
65432+:086A900003E000080000000013
65433+:00000001FF
65434diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65435new file mode 100644
65436index 0000000..43d7c4f
65437--- /dev/null
65438+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65439@@ -0,0 +1,6496 @@
65440+:10000000080001180800000000005594000000C816
65441+:1000100000000000000000000000000008005594EF
65442+:10002000000000380000565C080000A00800000036
65443+:100030000000574400005694080059200000008436
65444+:100040000000ADD808005744000001C00000AE5CBD
65445+:100050000800321008000000000092580000B01C98
65446+:10006000000000000000000000000000080092589E
65447+:100070000000033C000142740800049008000400E2
65448+:10008000000012FC000145B000000000000000006C
65449+:1000900000000000080016FC00000004000158AC3D
65450+:1000A000080000A80800000000003D00000158B052
65451+:1000B00000000000000000000000000008003D00FB
65452+:1000C00000000030000195B00A000046000000006A
65453+:1000D000000000000000000D636F6D362E322E31DF
65454+:1000E00062000000060201020000000000000003A0
65455+:1000F000000000C800000032000000030000000003
65456+:1001000000000000000000000000000000000000EF
65457+:1001100000000010000001360000EA600000000549
65458+:1001200000000000000000000000000000000008C7
65459+:1001300000000000000000000000000000000000BF
65460+:1001400000000000000000000000000000000000AF
65461+:10015000000000000000000000000000000000009F
65462+:10016000000000020000000000000000000000008D
65463+:10017000000000000000000000000000000000007F
65464+:10018000000000000000000000000010000000005F
65465+:10019000000000000000000000000000000000005F
65466+:1001A000000000000000000000000000000000004F
65467+:1001B000000000000000000000000000000000003F
65468+:1001C000000000000000000000000000000000002F
65469+:1001D000000000000000000000000000000000001F
65470+:1001E0000000000010000003000000000000000DEF
65471+:1001F0000000000D3C020800244256083C030800A1
65472+:1002000024635754AC4000000043202B1480FFFDB2
65473+:10021000244200043C1D080037BD9FFC03A0F021D0
65474+:100220003C100800261001183C1C0800279C5608AA
65475+:100230000E000256000000000000000D27BDFFB4B4
65476+:10024000AFA10000AFA20004AFA30008AFA4000C50
65477+:10025000AFA50010AFA60014AFA70018AFA8001CF0
65478+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
65479+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
65480+:10028000AFB90040AFBC0044AFBF00480E001544FA
65481+:10029000000000008FBF00488FBC00448FB90040B1
65482+:1002A0008FB8003C8FAF00388FAE00348FAD003078
65483+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
65484+:1002C0008FA8001C8FA700188FA600148FA5001000
65485+:1002D0008FA4000C8FA300088FA200048FA1000040
65486+:1002E00027BD004C3C1B60108F7A5030377B502864
65487+:1002F00003400008AF7A00008F82002427BDFFE092
65488+:10030000AFB00010AFBF0018AFB100148C42000CAA
65489+:100310003C1080008E110100104000348FBF001887
65490+:100320000E000D84000000008F85002024047FFF54
65491+:100330000091202BACB100008E030104960201084D
65492+:1003400000031C003042FFFF00621825ACA300042C
65493+:100350009202010A96030114304200FF3063FFFF4E
65494+:100360000002140000431025ACA200089603010C03
65495+:100370009602010E00031C003042FFFF00621825A8
65496+:10038000ACA3000C960301109602011200031C009E
65497+:100390003042FFFF00621825ACA300108E02011846
65498+:1003A000ACA200148E02011CACA20018148000083C
65499+:1003B0008F820024978200003C0420050044182509
65500+:1003C00024420001ACA3001C0A0000C6A782000062
65501+:1003D0003C0340189442001E00431025ACA2001CB0
65502+:1003E0000E000DB8240400018FBF00188FB1001457
65503+:1003F0008FB000100000102103E0000827BD00208E
65504+:100400003C0780008CE202B834E50100044100089A
65505+:10041000240300013C0208008C42006024420001D9
65506+:100420003C010800AC22006003E0000800601021DD
65507+:100430003C0208008C42005C8CA4002094A30016AF
65508+:100440008CA6000494A5000E24420001ACE40280B6
65509+:100450002463FFFC3C010800AC22005C3C0210005D
65510+:10046000A4E30284A4E5028600001821ACE6028819
65511+:10047000ACE202B803E000080060102127BDFFE0F5
65512+:100480003C028000AFB0001034420100AFBF001C3E
65513+:10049000AFB20018AFB100148C43000094450008BF
65514+:1004A0002462FE002C42038110400003000381C23D
65515+:1004B0000A00010226100004240201001462000553
65516+:1004C0003C1180003C02800890420004305000FF44
65517+:1004D0003C11800036320100964300143202000FB6
65518+:1004E00000021500004310253C0308008C63004403
65519+:1004F00030A40004AE220080246300013C01080007
65520+:10050000AC2300441080000730A200028FBF001C03
65521+:100510008FB200188FB100148FB000100A0000CE07
65522+:1005200027BD00201040002D0000182130A20080BF
65523+:1005300010400005362200708E44001C0E000C672F
65524+:10054000240500A0362200708C4400008F82000C2D
65525+:10055000008210232C43012C10600004AF82001095
65526+:10056000240300010A000145AF84000C8E42000400
65527+:100570003C036020AF84000CAC6200143C02080015
65528+:100580008C42005850400015000018218C62000475
65529+:10059000240301FE304203FF144300100000182121
65530+:1005A0002E020004104000032E0200080A00014041
65531+:1005B0000000802114400003000000000A000140F8
65532+:1005C0002610FFF90000000D2402000202021004B0
65533+:1005D0003C036000AC626914000018218FBF001C4E
65534+:1005E0008FB200188FB100148FB00010006010217E
65535+:1005F00003E0000827BD00203C0480008C8301003C
65536+:1006000024020100506200033C0280080000000D3B
65537+:100610003C02800890430004000010213063000F6A
65538+:1006200000031D0003E00008AC8300800004188074
65539+:100630002782FF9C00621821000410C00044102390
65540+:100640008C640000000210C03C030800246356E4E0
65541+:10065000004310213C038000AC64009003E00008DC
65542+:10066000AF8200243C0208008C42011410400019A3
65543+:100670003084400030A2007F000231C03C02020002
65544+:100680001080001400A218253C026020AC43001426
65545+:100690003C0408008C8456B83C0308008C630110AD
65546+:1006A0003C02800024050900AC4500200086202182
65547+:1006B000246300013C028008AC4400643C01080053
65548+:1006C000AC2301103C010800AC2456B803E000083C
65549+:1006D000000000003C02602003E00008AC4500146C
65550+:1006E00003E000080000102103E0000800001021D2
65551+:1006F00030A2000810400008240201003C0208005B
65552+:100700008C42010C244200013C010800AC22010C87
65553+:1007100003E0000800000000148200080000000050
65554+:100720003C0208008C4200FC244200013C0108000D
65555+:10073000AC2200FC0A0001A330A200203C02080009
65556+:100740008C420084244200013C010800AC22008459
65557+:1007500030A200201040000830A200103C02080027
65558+:100760008C420108244200013C010800AC2201082F
65559+:1007700003E0000800000000104000080000000036
65560+:100780003C0208008C420104244200013C010800A4
65561+:10079000AC22010403E00008000000003C02080055
65562+:1007A0008C420100244200013C010800AC220100FF
65563+:1007B00003E000080000000027BDFFE0AFB1001417
65564+:1007C0003C118000AFB20018AFBF001CAFB00010EA
65565+:1007D0003632010096500008320200041040000733
65566+:1007E000320300028FBF001C8FB200188FB10014BB
65567+:1007F0008FB000100A0000CE27BD00201060000B53
65568+:10080000020028218E2401000E00018A0000000051
65569+:100810003202008010400003240500A10E000C6786
65570+:100820008E44001C0A0001E3240200018E2301040F
65571+:100830008F82000810430006020028218E24010048
65572+:100840000E00018A000000008E220104AF82000821
65573+:10085000000010218FBF001C8FB200188FB1001450
65574+:100860008FB0001003E0000827BD00202C82000498
65575+:1008700014400002000018212483FFFD240200021E
65576+:10088000006210043C03600003E00008AC626914DD
65577+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
65578+:1008A000AFB000103C048000948201083043700017
65579+:1008B000240220001062000A2862200154400052E5
65580+:1008C0008FBF001C24024000106200482402600018
65581+:1008D0001062004A8FBF001C0A0002518FB200183C
65582+:1008E00034820100904300098C5000189451000C90
65583+:1008F000240200091062001C0000902128620009F7
65584+:10090000144000218F8200242402000A5062001249
65585+:10091000323100FF2402000B1062000F00000000C3
65586+:100920002402000C146200188F8200243C0208008C
65587+:100930008C4256B824030900AC83002000501021DB
65588+:100940003C038008AC6200643C010800AC2256B84D
65589+:100950000A0002508FBF001C0E0001E900102602A1
65590+:100960000A0002308F8200240E0001E900102602E6
65591+:100970003C0380089462001A8C72000C3042FFFF26
65592+:10098000020280258F8200248C42000C5040001E01
65593+:100990008FBF001C0E000D84000000003C02800090
65594+:1009A00034420100944300088F82002400031C009D
65595+:1009B0009444001E8F82002000641825AC50000073
65596+:1009C00024040001AC510004AC520008AC40000CFF
65597+:1009D000AC400010AC400014AC4000180E000DB844
65598+:1009E000AC43001C0A0002508FBF001C0E000440E4
65599+:1009F000000000000A0002508FBF001C0E000C9F78
65600+:100A0000000000008FBF001C8FB200188FB10014CF
65601+:100A10008FB000100000102103E0000827BD002067
65602+:100A200027BDFFD8AFB400203C036010AFBF002447
65603+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
65604+:100A40008C6450002402FF7F3C1408002694563822
65605+:100A5000008220243484380CAC6450003C028000B6
65606+:100A6000240300370E0014B0AC4300083C07080014
65607+:100A700024E70618028010212404001D2484FFFFAF
65608+:100A8000AC4700000481FFFD244200043C02080042
65609+:100A9000244207C83C010800AC2256403C02080032
65610+:100AA000244202303C030800246306203C04080072
65611+:100AB000248403B43C05080024A506F03C06080085
65612+:100AC00024C62C9C3C010800AC2256803C02080045
65613+:100AD000244205303C010800AC2756843C01080044
65614+:100AE000AC2656943C010800AC23569C3C010800FF
65615+:100AF000AC2456A03C010800AC2556A43C010800DB
65616+:100B0000AC2256A83C010800AC23563C3C0108002E
65617+:100B1000AC2456443C010800AC2056603C0108005F
65618+:100B2000AC2556643C010800AC2056703C0108001E
65619+:100B3000AC27567C3C010800AC2656903C010800CE
65620+:100B4000AC2356980E00056E00000000AF80000C2C
65621+:100B50003C0280008C5300008F8300043C0208009C
65622+:100B60008C420020106200213262000700008821C0
65623+:100B70002792FF9C3C100800261056E43C02080017
65624+:100B80008C42002024050001022518040043202483
65625+:100B90008F820004004310245044000C26310001D1
65626+:100BA00010800008AF9000248E4300003C028000BB
65627+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
65628+:100BC00026310001AE00000C263100012E22000269
65629+:100BD000261000381440FFE9265200043C020800A9
65630+:100BE0008C420020AF820004326200071040FFD91F
65631+:100BF0003C028000326200011040002D326200028F
65632+:100C00003C0580008CA2010000002021ACA2002045
65633+:100C10008CA301042C42078110400008ACA300A85B
65634+:100C200094A2010824032000304270001443000302
65635+:100C30003C02800890420005304400FF0E0001593C
65636+:100C4000000000003C0280009042010B304300FF96
65637+:100C50002C62001E54400004000310800E00018628
65638+:100C60000A0002EC00000000005410218C42000039
65639+:100C70000040F80900000000104000043C02800021
65640+:100C80008C4301043C026020AC4300143C02080089
65641+:100C90008C4200343C0440003C03800024420001AC
65642+:100CA000AC6401383C010800AC220034326200021E
65643+:100CB00010400010326200043C1080008E0201409F
65644+:100CC000000020210E000159AE0200200E00038317
65645+:100CD000000000003C024000AE0201783C02080027
65646+:100CE0008C420038244200013C010800AC2200384C
65647+:100CF000326200041040FF973C0280003C108000EC
65648+:100D00008E020180000020210E000159AE02002059
65649+:100D10008E03018024020F00546200073C02800809
65650+:100D20008E0201883C0300E03042FFFF00431025A3
65651+:100D30000A000328AE020080344200809042000086
65652+:100D400024030050304200FF14430007000000005D
65653+:100D50000E000362000000001440000300000000C9
65654+:100D60000E000971000000003C0208008C42003CAB
65655+:100D70003C0440003C03800024420001AC6401B804
65656+:100D80003C010800AC22003C0A0002A33C028000A7
65657+:100D90003C02900034420001008220253C02800089
65658+:100DA000AC4400203C0380008C6200200440FFFE25
65659+:100DB0000000000003E00008000000003C0280008A
65660+:100DC000344300010083202503E00008AC440020E8
65661+:100DD00027BDFFE0AFB10014AFB000100080882144
65662+:100DE000AFBF00180E00033230B000FF8F83FF94B6
65663+:100DF000022020219062002502028025A07000259B
65664+:100E00008C7000183C0280000E00033D020280241A
65665+:100E10001600000B8FBF00183C0480008C8201F884
65666+:100E20000440FFFE348201C024030002AC510000E4
65667+:100E3000A04300043C021000AC8201F88FBF0018F0
65668+:100E40008FB100148FB0001003E0000827BD002010
65669+:100E500027BDFFE83C028000AFBF00103442018094
65670+:100E6000944300048C4400083063020010600005C5
65671+:100E7000000028210E00100C000000000A0003787A
65672+:100E8000240500013C02FF000480000700821824B2
65673+:100E90003C02040014620004240500018F82FF94C8
65674+:100EA00090420008240500018FBF001000A010210F
65675+:100EB00003E0000827BD00188F82FF982405000179
65676+:100EC000A040001A3C028000344201400A00034264
65677+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
65678+:100EE000AFB20018AFB10014AFB0001090A2000074
65679+:100EF000304400FF38830020388200300003182B74
65680+:100F00000002102B0062182410600003240200501D
65681+:100F1000148200A88FBF001C90A20005304200017F
65682+:100F2000104000A48FBF001C3C02800034420140EE
65683+:100F3000904200082443FFFF2C6200051040009EF1
65684+:100F40008FB20018000310803C030800246355ACE6
65685+:100F5000004310218C420000004000080000000007
65686+:100F60003C028000345101400E0003328E24000008
65687+:100F70008F92FF948E2200048E50000C1602000205
65688+:100F800024020001AE42000C0E00033D8E2400003E
65689+:100F90008E220004145000068FBF001C8FB2001870
65690+:100FA0008FB100148FB000100A000F7827BD002009
65691+:100FB0008E42000C0A000419000000003C0480006E
65692+:100FC0003482014094A300108C4200043063FFFF80
65693+:100FD0001443001C0000000024020001A4A2001021
65694+:100FE0008C8202380441000F3C0380003C02003F29
65695+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
65696+:1010000000461824004810240002130200031D8229
65697+:10101000106200583C0280008C8202380440FFF7C6
65698+:101020003C038000346201408C44000034620200C2
65699+:10103000AC4400003C021000AC6202380A00043BE1
65700+:101040008FBF001C94A200100A00041900000000C9
65701+:10105000240200201482000F3C0280003C03800028
65702+:1010600094A20012346301408C6300043042FFFFFD
65703+:10107000146200050000000024020001A4A2001276
65704+:101080000A0004028FBF001C94A200120A00041977
65705+:1010900000000000345101400E0003328E24000095
65706+:1010A0008F92FF948E230004964200123050FFFF6F
65707+:1010B0001603000224020001A64200120E00033DA6
65708+:1010C0008E2400008E220004160200068FBF001C32
65709+:1010D0008FB200188FB100148FB000100A00037C8B
65710+:1010E00027BD0020964200120A00041900000000EB
65711+:1010F0003C03800094A20014346301408C6300041C
65712+:101100003042FFFF14620008240200018FBF001C60
65713+:101110008FB200188FB100148FB00010A4A2001479
65714+:101120000A00146327BD002094A20014144000217B
65715+:101130008FBF001C0A000435000000003C03800043
65716+:1011400094A20016346301408C6300043042FFFF18
65717+:101150001462000D240200018FBF001C8FB2001822
65718+:101160008FB100148FB00010A4A200160A000B1457
65719+:1011700027BD00209442007824420004A4A200105D
65720+:101180000A00043B8FBF001C94A200162403000138
65721+:101190003042FFFF144300078FBF001C3C020800D1
65722+:1011A0008C420070244200013C010800AC22007017
65723+:1011B0008FBF001C8FB200188FB100148FB00010C9
65724+:1011C00003E0000827BD002027BDFFD8AFB20018FC
65725+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
65726+:1011E000AFB000103C028000345101008C5001006F
65727+:1011F0009242000092230009304400FF2402001FA5
65728+:10120000106200AB28620020104000192402003850
65729+:101210002862000A1040000D2402000B286200081A
65730+:101220001040002E8F820024046001042862000216
65731+:101230001440002A8F820024240200061062002637
65732+:101240008FBF00200A00055F8FB3001C1062006092
65733+:101250002862000B144000FA8FBF00202402000E09
65734+:10126000106200788F8200240A00055F8FB3001C93
65735+:10127000106200D2286200391040000A2402008067
65736+:1012800024020036106200E528620037104000C3D7
65737+:1012900024020035106200D98FBF00200A00055FCC
65738+:1012A0008FB3001C1062002D2862008110400006E0
65739+:1012B000240200C824020039106200C98FBF002038
65740+:1012C0000A00055F8FB3001C106200A28FBF0020D0
65741+:1012D0000A00055F8FB3001C8F8200248C42000C33
65742+:1012E000104000D78FBF00200E000D8400000000CA
65743+:1012F0003C038000346301008C6200008F85002075
65744+:10130000946700089466000CACA200008C64000492
65745+:101310008F82002400063400ACA400049448001E10
65746+:101320008C62001800073C0000E83825ACA20008D9
65747+:101330008C62001C24040001ACA2000C9062000A24
65748+:1013400000C23025ACA60010ACA00014ACA0001860
65749+:10135000ACA7001C0A00051D8FBF00208F8200244F
65750+:101360008C42000C104000B68FBF00200E000D8490
65751+:10137000000000008F820024962400089625000CAF
65752+:101380009443001E000422029626000E8F82002045
65753+:10139000000426000083202500052C003C0300806B
65754+:1013A00000A6282500832025AC400000AC400004A6
65755+:1013B000AC400008AC40000CAC450010AC40001440
65756+:1013C000AC400018AC44001C0A00051C24040001B9
65757+:1013D0009622000C14400018000000009242000504
65758+:1013E0003042001014400014000000000E000332D0
65759+:1013F0000200202192420005020020213442001008
65760+:101400000E00033DA242000592420000240300208A
65761+:10141000304200FF10430089020020218FBF0020CE
65762+:101420008FB3001C8FB200188FB100148FB0001062
65763+:101430000A00107527BD00280000000D0A00055E97
65764+:101440008FBF00208C42000C1040007D8FBF002019
65765+:101450000E000D84000000008E2200048F84002006
65766+:101460009623000CAC8200003C0280089445002CBE
65767+:101470008F82002400031C0030A5FFFF9446001E4D
65768+:101480003C02400E0065182500C23025AC830004E4
65769+:10149000AC800008AC80000CAC800010AC80001464
65770+:1014A000AC800018AC86001C0A00051C2404000156
65771+:1014B0000E000332020020218F93FF9802002021AA
65772+:1014C0000E00033DA660000C020020210E00034226
65773+:1014D000240500018F8200248C42000C104000582B
65774+:1014E0008FBF00200E000D84000000009622000C2B
65775+:1014F0008F83002000021400AC700000AC62000476
65776+:10150000AC6000088E4400388F820024AC64000C6C
65777+:101510008E46003C9445001E3C02401FAC66001005
65778+:1015200000A228258E62000424040001AC6200148D
65779+:10153000AC600018AC65001C8FBF00208FB3001C8E
65780+:101540008FB200188FB100148FB000100A000DB8D0
65781+:1015500027BD0028240200201082003A8FB3001C0F
65782+:101560000E000F5E00000000104000358FBF00200D
65783+:101570003C0480008C8201F80440FFFE348201C0EC
65784+:1015800024030002AC500000A04300043C02100001
65785+:10159000AC8201F80A00055E8FBF00200200202106
65786+:1015A0008FBF00208FB3001C8FB200188FB10014C2
65787+:1015B0008FB000100A000EA727BD00289625000C4A
65788+:1015C000020020218FBF00208FB3001C8FB20018B3
65789+:1015D0008FB100148FB000100A000ECC27BD002878
65790+:1015E000020020218FB3001C8FB200188FB10014AD
65791+:1015F0008FB000100A000EF727BD00289225000DBD
65792+:10160000020020218FB3001C8FB200188FB100148C
65793+:101610008FB000100A000F4827BD002802002021CB
65794+:101620008FBF00208FB3001C8FB200188FB1001441
65795+:101630008FB000100A000F1F27BD00288FBF0020A9
65796+:101640008FB3001C8FB200188FB100148FB0001040
65797+:1016500003E0000827BD00283C0580008CA202782A
65798+:101660000440FFFE34A2024024030002AC44000008
65799+:10167000A04300043C02100003E00008ACA2027882
65800+:10168000A380001803E00008A38000193C03800039
65801+:101690008C6202780440FFFE8F82001CAC62024024
65802+:1016A00024020002A06202443C02100003E0000891
65803+:1016B000AC6202783C02600003E000088C425404F3
65804+:1016C0009083003024020005008040213063003FF9
65805+:1016D0000000482114620005000050219082004C57
65806+:1016E0009483004E304900FF306AFFFFAD00000CCC
65807+:1016F000AD000010AD000024950200148D05001C03
65808+:101700008D0400183042FFFF004910230002110031
65809+:10171000000237C3004038210086202300A2102B8E
65810+:101720000082202300A72823AD05001CAD0400186B
65811+:10173000A5090014A5090020A50A001603E0000869
65812+:10174000A50A002203E000080000000027BDFFD822
65813+:10175000AFB200183C128008AFB40020AFB3001C39
65814+:10176000AFB10014AFBF0024AFB00010365101007C
65815+:101770003C0260008C4254049222000C3C1408008D
65816+:10178000929400F7304300FF2402000110620032FF
65817+:101790000080982124020002146200353650008037
65818+:1017A0000E00143D000000009202004C2403FF8054
65819+:1017B0003C0480003042007F000211C024420240FD
65820+:1017C0000262102100431824AC8300949245000863
65821+:1017D0009204004C3042007F3C03800614850007D1
65822+:1017E000004380212402FFFFA22200112402FFFFF8
65823+:1017F000A62200120A0005D22402FFFF9602002052
65824+:10180000A222001196020022A62200128E020024BB
65825+:101810003C048008AE2200143485008090A2004C65
65826+:1018200034830100A06200108CA2003CAC6200185E
65827+:101830008C820068AC6200F48C820064AC6200F0C0
65828+:101840008C82006CAC6200F824020001A0A2006847
65829+:101850000A0005EE3C0480080E001456000000004B
65830+:1018600036420080A04000680A0005EE3C04800873
65831+:10187000A2000068A20000690A0006293C02800854
65832+:10188000348300808C62003834850100AC62006CC7
65833+:1018900024020001A062006990A200D59083000894
65834+:1018A000305100FF3072007F12320019001111C058
65835+:1018B00024420240026210212403FF8000431824C6
65836+:1018C0003C048000AC8300943042007F3C038006DF
65837+:1018D000004380218E02000C1040000D02002021E8
65838+:1018E0000E00057E0000000026220001305100FF9E
65839+:1018F0009203003C023410260002102B0002102339
65840+:101900003063007F022288240A0005F8A203003C0D
65841+:101910003C088008350401008C8200E03507008017
65842+:10192000ACE2003C8C8200E0AD02000090E5004C8F
65843+:10193000908600D590E3004C908400D52402FF806F
65844+:1019400000A228243063007F308400FF00A62825F1
65845+:101950000064182A1060000230A500FF38A500803E
65846+:10196000A0E5004CA10500093C0280089043000E50
65847+:10197000344400803C058000A043000A8C8300189A
65848+:101980003C027FFF3442FFFF00621824AC83001842
65849+:101990008CA201F80440FFFE00000000ACB301C0BF
65850+:1019A0008FBF00248FB400208FB3001C8FB20018AB
65851+:1019B0008FB100148FB0001024020002A0A201C455
65852+:1019C00027BD00283C02100003E00008ACA201F88B
65853+:1019D00090A2000024420001A0A200003C030800E5
65854+:1019E0008C6300F4304200FF144300020080302179
65855+:1019F000A0A0000090A200008F84001C000211C073
65856+:101A00002442024024830040008220212402FF80DF
65857+:101A1000008220243063007F3C02800A006218218B
65858+:101A20003C028000AC44002403E00008ACC300008A
65859+:101A300094820006908300058C85000C8C86001033
65860+:101A40008C8700188C88001C8C8400203C010800C6
65861+:101A5000A42256C63C010800A02356C53C0108003C
65862+:101A6000AC2556CC3C010800AC2656D03C01080001
65863+:101A7000AC2756D83C010800AC2856DC3C010800D5
65864+:101A8000AC2456E003E00008000000003C0280089F
65865+:101A9000344201008C4400343C038000346504006F
65866+:101AA000AC6400388C420038AF850028AC62003C42
65867+:101AB0003C020005AC6200300000000000000000A5
65868+:101AC00003E00008000000003C020006308400FF34
65869+:101AD000008220253C028000AC4400300000000061
65870+:101AE00000000000000000003C0380008C62000049
65871+:101AF000304200101040FFFD3462040003E0000893
65872+:101B0000AF82002894C200003C080800950800CA73
65873+:101B100030E7FFFF0080482101021021A4C200002D
65874+:101B200094C200003042FFFF00E2102B544000013D
65875+:101B3000A4C7000094A200003C0308008C6300CC02
65876+:101B400024420001A4A2000094A200003042FFFF42
65877+:101B5000144300073C0280080107102BA4A00000DA
65878+:101B60005440000101003821A4C700003C02800855
65879+:101B7000344601008CC3002894A200003C0480007D
65880+:101B80003042FFFE000210C000621021AC82003C17
65881+:101B90008C82003C006218231860000400000000E2
65882+:101BA0008CC200240A0006BA244200018CC2002420
65883+:101BB000AC8200383C020050344200103C038000EC
65884+:101BC000AC620030000000000000000000000000D7
65885+:101BD0008C620000304200201040FFFD0000000039
65886+:101BE00094A200003C04800030420001000210C0BA
65887+:101BF000004410218C430400AD2300008C420404F7
65888+:101C0000AD2200043C02002003E00008AC8200305A
65889+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
65890+:101C2000AFBF001C94C2000000C080213C1208001D
65891+:101C3000965200C624420001A6020000960300004E
65892+:101C400094E2000000E03021144300058FB1003021
65893+:101C50000E00068F024038210A0006F10000000045
65894+:101C60008C8300048C82000424420040046100073D
65895+:101C7000AC8200048C8200040440000400000000D8
65896+:101C80008C82000024420001AC8200009602000019
65897+:101C90003042FFFF50520001A600000096220000D3
65898+:101CA00024420001A62200003C02800834420100C8
65899+:101CB000962300009442003C144300048FBF001C94
65900+:101CC00024020001A62200008FBF001C8FB2001862
65901+:101CD0008FB100148FB0001003E0000827BD002072
65902+:101CE00027BDFFE03C028008AFBF0018344201006E
65903+:101CF0008C4800343C03800034690400AC68003830
65904+:101D00008C42003830E700FFAF890028AC62003C0D
65905+:101D10003C020005AC620030000000000000000042
65906+:101D200000000000000000000000000000000000B3
65907+:101D30008C82000C8C82000C97830016AD22000070
65908+:101D40008C82001000604021AD2200048C820018BB
65909+:101D5000AD2200088C82001CAD22000C8CA2001465
65910+:101D6000AD2200108C820020AD220014908200056C
65911+:101D7000304200FF00021200AD2200188CA20018B1
65912+:101D8000AD22001C8CA2000CAD2200208CA2001001
65913+:101D9000AD2200248CA2001CAD2200288CA20020C1
65914+:101DA000AD22002C3402FFFFAD260030AD20003400
65915+:101DB000506200013408FFFFAD28003850E00011E8
65916+:101DC0003C0280083C048008348401009482005066
65917+:101DD0003042FFFFAD22003C9483004494850044D0
65918+:101DE000240200013063FFFF000318C200641821C1
65919+:101DF0009064006430A5000700A210040A00075C8C
65920+:101E00000044102534420100AD20003C94430044BE
65921+:101E1000944400443063FFFF000318C2006218219D
65922+:101E200030840007906500642402000100821004E1
65923+:101E30000002102700451024A0620064000000008A
65924+:101E400000000000000000003C0200063442004098
65925+:101E50003C038000AC620030000000000000000085
65926+:101E6000000000008C620000304200101040FFFDB6
65927+:101E70003C06800834C201503463040034C7014A70
65928+:101E800034C4013434C5014034C60144AFA200104B
65929+:101E90000E0006D2AF8300288FBF001803E00008B1
65930+:101EA00027BD00208F8300143C0608008CC600E884
65931+:101EB0008F82001C30633FFF000319800046102111
65932+:101EC000004310212403FF80004318243C068000B7
65933+:101ED000ACC300283042007F3C03800C004330211B
65934+:101EE00090C2000D30A500FF0000382134420010E0
65935+:101EF000A0C2000D8F8900143C028008344201000A
65936+:101F00009443004400091382304800032402000176
65937+:101F1000A4C3000E1102000B2902000210400005AC
65938+:101F2000240200021100000C240300010A0007A48F
65939+:101F30000000182111020006000000000A0007A49A
65940+:101F4000000018218CC2002C0A0007A424430001C1
65941+:101F50008CC20014244300018CC200180043102BD3
65942+:101F60005040000A240700012402002714A20003A5
65943+:101F70003C0380080A0007B1240700013463010014
65944+:101F80009462004C24420001A462004C00091382B8
65945+:101F9000304300032C620002104000090080282119
65946+:101FA000146000040000000094C200340A0007C15D
65947+:101FB0003046FFFF8CC600380A0007C10080282188
65948+:101FC000000030213C040800248456C00A000706A3
65949+:101FD0000000000027BDFF90AFB60068AFB50064F9
65950+:101FE000AFB40060AFB3005CAFB20058AFB1005403
65951+:101FF000AFBF006CAFB000508C9000000080B021EB
65952+:102000003C0208008C4200E8960400328F83001CDA
65953+:102010002414FF8030843FFF0062182100042180D7
65954+:1020200000641821007410243C13800000A090214B
65955+:1020300090A50000AE620028920400323C02800CA1
65956+:102040003063007F00628821308400C02402004099
65957+:10205000148200320000A8218E3500388E2200182C
65958+:102060001440000224020001AE2200189202003C3B
65959+:10207000304200201440000E8F83001C000511C068
65960+:102080002442024000621821306400783C02008043
65961+:102090000082202500741824AE630800AE64081086
65962+:1020A0008E2200188E03000800431021AE22001873
65963+:1020B0008E22002C8E230018244200010062182B6F
65964+:1020C0001060004300000000924200002442000122
65965+:1020D000A24200003C0308008C6300F4304200FF81
65966+:1020E00050430001A2400000924200008F84001C77
65967+:1020F000000211C024420240248300403063007F6C
65968+:10210000008220213C02800A0094202400621821D1
65969+:10211000AE6400240A0008D2AEC30000920300326D
65970+:102120002402FFC000431024304200FF1440000589
65971+:1021300024020001AE220018962200340A00084250
65972+:102140003055FFFF8E22001424420001AE220018F9
65973+:102150009202003000021600000216030441001C27
65974+:10216000000000009602003227A400100080282101
65975+:10217000A7A20016960200320000302124070001B9
65976+:102180003042FFFFAF8200140E000706AFA0001C14
65977+:10219000960200328F83001C3C0408008C8400E807
65978+:1021A00030423FFF000211800064182100621821B4
65979+:1021B00000741024AE62002C3063007F3C02800E5D
65980+:1021C000006218219062000D3042007FA062000D75
65981+:1021D0009222000D304200105040007892420000E0
65982+:1021E0003C028008344401009482004C8EC30000FD
65983+:1021F0003C130800967300C62442FFFFA482004CE3
65984+:10220000946200329623000E3054FFFF3070FFFFBF
65985+:102210003C0308008C6300D000701807A7A30038A7
65986+:102220009482003E3063FFFF3042FFFF14620007DC
65987+:10223000000000008C8200303C038000244200300B
65988+:10224000AC62003C0A00086A8C82002C9482004038
65989+:102250003042FFFF5462000927A400408C820038FE
65990+:102260003C03800024420030AC62003C8C8200348D
65991+:10227000AC6200380A0008793C03800027A50038CA
65992+:1022800027A60048026038210E00068FA7A000484C
65993+:102290008FA300403C02800024630030AC43003830
65994+:1022A0008FA30044AC43003C3C0380003C0200058B
65995+:1022B000AC6200303C028008344401009482004249
65996+:1022C000346304003042FFFF0202102B1440000769
65997+:1022D000AF8300289482004E9483004202021021B2
65998+:1022E000004310230A00088F3043FFFF9483004E01
65999+:1022F00094820042026318210050102300621823C8
66000+:102300003063FFFF3C028008344401009482003CAB
66001+:102310003042FFFF14430003000000000A00089F42
66002+:10232000240300019482003C3042FFFF0062102B26
66003+:10233000144000058F8200289482003C0062102324
66004+:102340003043FFFF8F820028AC550000AC400004F2
66005+:10235000AC540008AC43000C3C02000634420010B0
66006+:102360003C038000AC620030000000000000000070
66007+:10237000000000008C620000304200101040FFFDA1
66008+:102380003C04800834840100001018C20064182145
66009+:102390009065006432020007240600010046100424
66010+:1023A00000451025A0620064948300429622000E2E
66011+:1023B00050430001A386001892420000244200010D
66012+:1023C000A24200003C0308008C6300F4304200FF8E
66013+:1023D00050430001A2400000924200008F84001C84
66014+:1023E000000211C0244202402483004000822021C8
66015+:1023F0002402FF80008220243063007F3C02800A98
66016+:10240000006218213C028000AC440024AEC30000EE
66017+:102410008FBF006C8FB600688FB500648FB400600A
66018+:102420008FB3005C8FB200588FB100548FB0005052
66019+:1024300003E0000827BD007027BDFFD8AFB3001C24
66020+:10244000AFB20018AFB10014AFB00010AFBF0020A2
66021+:102450000080982100E0802130B1FFFF0E000D8444
66022+:1024600030D200FF0000000000000000000000006B
66023+:102470008F8200208F830024AC510000AC520004F6
66024+:10248000AC530008AC40000CAC400010AC40001451
66025+:10249000AC4000189463001E02038025AC50001C61
66026+:1024A0000000000000000000000000002404000103
66027+:1024B0008FBF00208FB3001C8FB200188FB10014A3
66028+:1024C0008FB000100A000DB827BD002830A5FFFF0F
66029+:1024D0000A0008DC30C600FF3C02800834430100DB
66030+:1024E0009462000E3C080800950800C63046FFFFC5
66031+:1024F00014C000043402FFFF946500EA0A000929B1
66032+:102500008F84001C10C20027000000009462004E5F
66033+:102510009464003C3045FFFF00A6102300A6182B52
66034+:102520003087FFFF106000043044FFFF00C5102318
66035+:1025300000E210233044FFFF0088102B1040000EF3
66036+:1025400000E810233C028008344401002403000109
66037+:1025500034420080A44300162402FFFFA482000E30
66038+:10256000948500EA8F84001C0000302130A5FFFF15
66039+:102570000A0009013C0760200044102A10400009AD
66040+:102580003C0280083443008094620016304200010F
66041+:10259000104000043C0280009442007E244200145B
66042+:1025A000A462001603E000080000000027BDFFE061
66043+:1025B0003C028008AFBF001CAFB0001834420100DD
66044+:1025C000944300429442004C104000193068FFFFD1
66045+:1025D0009383001824020001146200298FBF001C9D
66046+:1025E0003C06800834D00100000810C200501021C1
66047+:1025F000904200643103000734C70148304200FFB5
66048+:10260000006210073042000134C9014E34C4012C6D
66049+:1026100034C5013E1040001634C601420E0006D2F9
66050+:10262000AFA90010960200420A0009463048FFFF99
66051+:102630003C028008344401009483004494820042A8
66052+:102640001043000F8FBF001C94820044A4820042FC
66053+:1026500094820050A482004E8C820038AC820030FC
66054+:1026600094820040A482003E9482004AA4820048E2
66055+:102670008FBF001C8FB000180A00090427BD00207E
66056+:102680008FB0001803E0000827BD002027BDFFA081
66057+:10269000AFB1004C3C118000AFBF0058AFB3005445
66058+:1026A000AFB20050AFB000483626018890C2000398
66059+:1026B0003044007FA3A400108E32018090C200003D
66060+:1026C0003043007F240200031062003BAF92001CE5
66061+:1026D00028620004104000062402000424020002C4
66062+:1026E000106200098FBF00580A000B0F8FB300540F
66063+:1026F0001062004D240200051062014E8FBF005889
66064+:102700000A000B0F8FB30054000411C002421021C5
66065+:102710002404FF8024420240004410242643004049
66066+:10272000AE2200243063007F3C02800A0062182140
66067+:102730009062003CAFA3003C00441025A062003C26
66068+:102740008FA3003C9062003C304200401040016C7E
66069+:102750008FBF00583C108008A3800018361001007D
66070+:102760008E0200E08C63003427A4003C27A50010F3
66071+:10277000004310210E0007C3AE0200E093A2001038
66072+:102780003C038000A20200D58C6202780440FFFE68
66073+:102790008F82001CAC62024024020002A06202444C
66074+:1027A0003C021000AC6202780E0009390000000003
66075+:1027B0000A000B0E8FBF00583C05800890C3000133
66076+:1027C00090A2000B1443014E8FBF005834A4008028
66077+:1027D0008C8200189082004C90A200083C0260009D
66078+:1027E0008C4254048C8300183C027FFF3442FFFF6C
66079+:1027F000006218243C0208008C4200B4AC8300182C
66080+:102800003C038000244200013C010800AC2200B4DB
66081+:102810008C6201F80440FFFE8F82001CAC6201C094
66082+:102820000A000AD6240200023C10800890C300016E
66083+:102830009202000B144301328FBF005827A40018E6
66084+:1028400036050110240600033C0260008C4254044B
66085+:102850000E000E470000000027A40028360501F0F6
66086+:102860000E000E47240600038FA200283603010045
66087+:10287000AE0200648FA2002CAE0200688FA200306E
66088+:10288000AE02006C93A40018906300D52402FF8070
66089+:102890000082102400431025304900FF3084007F5F
66090+:1028A0003122007F0082102A544000013929008023
66091+:1028B000000411C0244202402403FF800242102180
66092+:1028C00000431024AE220094264200403042007F94
66093+:1028D0003C038006004340218FA3001C2402FFFF1D
66094+:1028E000AFA800403C130800927300F71062003359
66095+:1028F00093A2001995030014304400FF3063FFFFDA
66096+:102900000064182B106000100000000095040014F3
66097+:102910008D07001C8D0600183084FFFF0044202323
66098+:102920000004210000E438210000102100E4202BE5
66099+:1029300000C2302100C43021AD07001CAD060018D4
66100+:102940000A000A2F93A20019950400148D07001C99
66101+:102950008D0600183084FFFF008220230004210030
66102+:10296000000010210080182100C2302300E4202B39
66103+:1029700000C4302300E33823AD07001CAD06001867
66104+:1029800093A200198FA30040A462001497A2001A1A
66105+:10299000A46200168FA2001CAC6200108FA2001C63
66106+:1029A000AC62000C93A20019A462002097A2001A46
66107+:1029B000A46200228FA2001CAC6200243C048008A8
66108+:1029C000348300808C6200388FA20020012088218F
66109+:1029D000AC62003C8FA20020AC82000093A20018E1
66110+:1029E000A062004C93A20018A0820009A0600068B9
66111+:1029F00093A20018105100512407FF803229007F54
66112+:102A0000000911C024420240024210213046007FDA
66113+:102A10003C03800000471024AC6200943C02800616
66114+:102A200000C2302190C2003CAFA60040000020212F
66115+:102A300000471025A0C2003C8FA80040950200026C
66116+:102A4000950300148D07001C3042FFFF3063FFFF29
66117+:102A50008D060018004310230002110000E2382107
66118+:102A600000E2102B00C4302100C23021AD07001C51
66119+:102A7000AD06001895020002A5020014A50000167C
66120+:102A80008D020008AD0200108D020008AD02000C9E
66121+:102A900095020002A5020020A50000228D02000878
66122+:102AA000AD0200249102003C304200401040001A68
66123+:102AB000262200013C108008A3A90038A38000183A
66124+:102AC000361001008E0200E08D03003427A4004080
66125+:102AD00027A50038004310210E0007C3AE0200E016
66126+:102AE00093A200383C038000A20200D58C620278D9
66127+:102AF0000440FFFE8F82001CAC62024024020002F0
66128+:102B0000A06202443C021000AC6202780E00093957
66129+:102B100000000000262200013043007F14730004EF
66130+:102B2000004020212403FF8002231024004320269C
66131+:102B300093A200180A000A4B309100FF93A40018DA
66132+:102B40008FA3001C2402FFFF1062000A308900FFDF
66133+:102B500024820001248300013042007F14530005C9
66134+:102B6000306900FF2403FF800083102400431026F7
66135+:102B7000304900FF3C028008904200080120882173
66136+:102B8000305000FF123000193222007F000211C0C5
66137+:102B900002421021244202402403FF8000431824F3
66138+:102BA0003C048000AC8300943042007F3C038006EC
66139+:102BB000004310218C43000C004020211060000BCA
66140+:102BC000AFA200400E00057E000000002623000199
66141+:102BD0002405FF803062007F145300020225202468
66142+:102BE000008518260A000AAF307100FF3C048008F7
66143+:102BF000348400808C8300183C027FFF3442FFFF46
66144+:102C000000621824AC8300183C0380008C6201F839
66145+:102C10000440FFFE00000000AC7201C0240200026C
66146+:102C2000A06201C43C021000AC6201F80A000B0E65
66147+:102C30008FBF00583C04800890C300019082000BB5
66148+:102C40001443002F8FBF0058349000809202000878
66149+:102C500030420040104000200000000092020008B6
66150+:102C60000002160000021603044100050240202164
66151+:102C70000E000ECC240500930A000B0E8FBF0058E7
66152+:102C80009202000924030018304200FF1443000D93
66153+:102C900002402021240500390E000E64000030217E
66154+:102CA0000E0003328F84001C8F82FF9424030012D5
66155+:102CB000A04300090E00033D8F84001C0A000B0E88
66156+:102CC0008FBF0058240500360E000E64000030212E
66157+:102CD0000A000B0E8FBF00580E0003320240202165
66158+:102CE000920200058F84001C344200200E00033D38
66159+:102CF000A20200050E0010758F84001C8FBF0058C3
66160+:102D00008FB300548FB200508FB1004C8FB0004889
66161+:102D100003E0000827BD00603C0280083445010044
66162+:102D20003C0280008C42014094A3000E0000302140
66163+:102D300000402021AF82001C3063FFFF3402FFFF00
66164+:102D4000106200063C0760202402FFFFA4A2000ED0
66165+:102D500094A500EA0A00090130A5FFFF03E000087E
66166+:102D60000000000027BDFFC83C0280003C06800830
66167+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
66168+:102D8000AFB30024AFB20020AFB00018345101003F
66169+:102D900034C501008C4301008E2200148CA400E491
66170+:102DA0000000A821AF83001C0044102318400052EB
66171+:102DB000A38000188E22001400005021ACA200E471
66172+:102DC00090C3000890A200D53073007FA3A200102A
66173+:102DD0008CB200E08CB400E4304200FF1053003BA2
66174+:102DE00093A200108F83001C2407FF80000211C0F3
66175+:102DF0000062102124420240246300400047102456
66176+:102E00003063007F3C0980003C08800A006818217C
66177+:102E1000AD2200248C62003427A4001427A50010E2
66178+:102E2000024280210290102304400028AFA3001426
66179+:102E30009062003C00E21024304200FF1440001970
66180+:102E4000020090219062003C34420040A062003CAD
66181+:102E50008F86001C93A3001024C200403042007FE4
66182+:102E6000004828213C0208008C4200F42463000141
66183+:102E7000306400FF14820002A3A30010A3A000107E
66184+:102E800093A20010AFA50014000211C0244202401A
66185+:102E900000C2102100471024AD2200240A000B4577
66186+:102EA00093A200100E0007C3000000003C0280083F
66187+:102EB00034420100AC5000E093A30010240A00014A
66188+:102EC000A04300D50A000B4593A200102402000184
66189+:102ED000154200093C0380008C6202780440FFFE2A
66190+:102EE0008F82001CAC62024024020002A0620244F5
66191+:102EF0003C021000AC6202789222000B2403000214
66192+:102F0000304200FF144300720000000096220008C7
66193+:102F1000304300FF24020082146200402402008437
66194+:102F20003C028000344901008D22000C95230006EC
66195+:102F3000000216023063FFFF3045003F24020027E5
66196+:102F400010A2000FAF83001428A200281040000830
66197+:102F5000240200312402002110A2000924020025CD
66198+:102F600010A20007938200190A000BBD00000000A8
66199+:102F700010A20007938200190A000BBD0000000098
66200+:102F80000E000777012020210A000C3D0000000000
66201+:102F90003C0380008C6202780440FFFE8F82001C9C
66202+:102FA000AC62024024020002A06202443C02100013
66203+:102FB000AC6202780A000C3D000000009523000678
66204+:102FC000912400058D25000C8D2600108D270018FA
66205+:102FD0008D28001C8D290020244200013C0108009E
66206+:102FE000A42356C63C010800A02456C53C01080095
66207+:102FF000AC2556CC3C010800AC2656D03C0108005C
66208+:10300000AC2756D83C010800AC2856DC3C0108002F
66209+:10301000AC2956E00A000C3DA38200191462000A94
66210+:10302000240200813C02800834420100944500EAF9
66211+:10303000922600058F84001C30A5FFFF30C600FFDC
66212+:103040000A000BFE3C0760211462005C00000000D7
66213+:103050009222000A304300FF306200201040000737
66214+:10306000306200403C02800834420100944500EA8E
66215+:103070008F84001C0A000BFC24060040104000074F
66216+:10308000000316003C02800834420100944500EA27
66217+:103090008F84001C0A000BFC24060041000216036A
66218+:1030A000044100463C02800834420100944500EA95
66219+:1030B0008F84001C2406004230A5FFFF3C076019E6
66220+:1030C0000E000901000000000A000C3D0000000095
66221+:1030D0009222000B24040016304200FF1044000628
66222+:1030E0003C0680009222000B24030017304200FFB0
66223+:1030F000144300320000000034C5010090A2000B10
66224+:10310000304200FF1444000B000080218CA20020FC
66225+:103110008CA400202403FF800043102400021140EF
66226+:103120003084007F004410253C032000004310251C
66227+:10313000ACC2083094A2000800021400000214037C
66228+:10314000044200012410000194A2000830420080D3
66229+:103150005040001A0200A82194A20008304220002A
66230+:10316000504000160200A8218CA300183C021C2D20
66231+:10317000344219ED106200110200A8213C0208003F
66232+:103180008C4200D4104000053C0280082403000457
66233+:1031900034420100A04300FC3C028008344201009C
66234+:1031A000944500EA8F84001C2406000630A5FFFF2A
66235+:1031B0000E0009013C0760210200A8210E00093918
66236+:1031C000000000009222000A304200081040000473
66237+:1031D00002A010210E0013790000000002A01021AF
66238+:1031E0008FBF00308FB5002C8FB400288FB3002420
66239+:1031F0008FB200208FB1001C8FB0001803E00008D0
66240+:1032000027BD00382402FF80008220243C02900069
66241+:1032100034420007008220253C028000AC4400209C
66242+:103220003C0380008C6200200440FFFE0000000090
66243+:1032300003E00008000000003C0380002402FF803F
66244+:10324000008220243462000700822025AC64002024
66245+:103250008C6200200440FFFE0000000003E0000834
66246+:103260000000000027BDFFD8AFB3001CAFB10014B1
66247+:10327000AFB00010AFBF0020AFB200183C1180000B
66248+:103280003C0280088E32002034530100AE2400201E
66249+:10329000966300EA000514003C074000004738250B
66250+:1032A00000A08021000030210E0009013065FFFFE1
66251+:1032B000240200A1160200022402FFFFA2620009FC
66252+:1032C000AE3200208FBF00208FB3001C8FB20018D9
66253+:1032D0008FB100148FB0001003E0000827BD002854
66254+:1032E0003C0280082403000527BDFFE834420100AA
66255+:1032F000A04300FCAFBF00103C0280008C420100E4
66256+:10330000240500A1004020210E000C67AF82001CA4
66257+:103310003C0380008C6202780440FFFE8F82001C18
66258+:103320008FBF001027BD0018AC62024024020002CB
66259+:10333000A06202443C021000AC62027803E0000884
66260+:103340000000000027BDFFE83C068000AFBF001072
66261+:1033500034C7010094E20008304400FF3883008243
66262+:10336000388200842C6300012C4200010062182581
66263+:103370001060002D24020083938200195040003B0E
66264+:103380008FBF00103C020800904256CC8CC4010054
66265+:103390003C06080094C656C63045003F38A30032AC
66266+:1033A00038A2003F2C6300012C4200010062182566
66267+:1033B000AF84001CAF860014A380001914600007BE
66268+:1033C00000E020212402002014A2001200000000CE
66269+:1033D0003402FFFF14C2000F00000000240200208E
66270+:1033E00014A2000500E028218CE300142402FFFF52
66271+:1033F0005062000B8FBF00103C040800248456C0AC
66272+:10340000000030210E000706240700010A000CD638
66273+:103410008FBF00100E000777000000008FBF001064
66274+:103420000A00093927BD001814820004240200850F
66275+:103430008CC501040A000CE1000020211482000662
66276+:103440002482FF808CC50104240440008FBF00103B
66277+:103450000A00016727BD0018304200FF2C4200021D
66278+:1034600010400004240200228FBF00100A000B2726
66279+:1034700027BD0018148200048F8200248FBF001023
66280+:103480000A000C8627BD00188C42000C1040001E5C
66281+:1034900000E0282190E300092402001814620003D0
66282+:1034A000240200160A000CFC240300081462000722
66283+:1034B00024020017240300123C02800834420080DA
66284+:1034C000A04300090A000D0994A7000854620007F0
66285+:1034D00094A700088F82FF942404FFFE9043000508
66286+:1034E00000641824A043000594A7000890A6001BC0
66287+:1034F0008CA4000094A500068FBF001000073C00BC
66288+:103500000A0008DC27BD00188FBF001003E0000888
66289+:1035100027BD00188F8500243C04800094A2002A57
66290+:103520008CA30034000230C02402FFF000C210243B
66291+:1035300000621821AC83003C8CA200303C03800068
66292+:10354000AC8200383C02005034420010AC620030C3
66293+:103550000000000000000000000000008C6200007D
66294+:10356000304200201040FFFD30C20008104000062D
66295+:103570003C0280008C620408ACA200208C62040C27
66296+:103580000A000D34ACA200248C430400ACA300203C
66297+:103590008C420404ACA200243C0300203C028000C6
66298+:1035A000AC4300303C0480008C8200300043102487
66299+:1035B0001440FFFD8F8600243C020040AC820030A6
66300+:1035C00094C3002A94C2002894C4002C94C5002EF1
66301+:1035D00024630001004410213064FFFFA4C20028CE
66302+:1035E00014850002A4C3002AA4C0002A03E0000836
66303+:1035F000000000008F84002427BDFFE83C05800404
66304+:1036000024840010AFBF00100E000E472406000AED
66305+:103610008F840024948200129483002E3042000F85
66306+:10362000244200030043180424027FFF0043102BB0
66307+:1036300010400002AC8300000000000D0E000D13CE
66308+:10364000000000008F8300248FBF001027BD0018EA
66309+:10365000946200149463001A3042000F00021500B7
66310+:10366000006218253C02800003E00008AC4300A083
66311+:103670008F8300243C028004944400069462001A64
66312+:103680008C650000A4640016004410233042FFFF44
66313+:103690000045102B03E00008384200018F8400240D
66314+:1036A0003C0780049486001A8C85000094E2000692
66315+:1036B000A482001694E3000600C310233042FFFFEB
66316+:1036C0000045102B384200011440FFF8A483001677
66317+:1036D00003E00008000000008F8400243C02800406
66318+:1036E000944200069483001A8C850000A482001680
66319+:1036F000006210233042FFFF0045102B38420001CA
66320+:103700005040000D8F850024006030213C0780046C
66321+:1037100094E20006A482001694E3000600C310237E
66322+:103720003042FFFF0045102B384200011440FFF8E3
66323+:10373000A48300168F8500243C03800034620400BB
66324+:103740008CA40020AF820020AC6400388CA200243E
66325+:10375000AC62003C3C020005AC62003003E00008B3
66326+:10376000ACA000048F8400243C0300068C8200047B
66327+:1037700000021140004310253C038000AC62003081
66328+:103780000000000000000000000000008C6200004B
66329+:10379000304200101040FFFD34620400AC80000491
66330+:1037A00003E00008AF8200208F86002427BDFFE0E1
66331+:1037B000AFB10014AFB00010AFBF00188CC300044D
66332+:1037C0008CC500248F820020309000FF94C4001A22
66333+:1037D00024630001244200202484000124A7002047
66334+:1037E000ACC30004AF820020A4C4001AACC70024FC
66335+:1037F00004A100060000882104E2000594C2001A1A
66336+:103800008CC2002024420001ACC2002094C2001AE5
66337+:1038100094C300282E040001004310262C4200010E
66338+:10382000004410245040000594C2001A24020001F4
66339+:10383000ACC2000894C2001A94C300280010202BC8
66340+:10384000004310262C4200010044102514400007BC
66341+:10385000000000008CC20008144000042402001084
66342+:103860008CC300041462000F8F8500240E000DA786
66343+:10387000241100018F820024944300289442001AEE
66344+:1038800014430003000000000E000D1300000000B0
66345+:10389000160000048F8500240E000D840000000037
66346+:1038A0008F85002494A2001E94A4001C24420001D1
66347+:1038B0003043FFFF14640002A4A2001EA4A0001E57
66348+:1038C0001200000A3C02800494A2001494A3001A7F
66349+:1038D0003042000F00021500006218253C028000F3
66350+:1038E000AC4300A00A000E1EACA0000894420006E3
66351+:1038F00094A3001A8CA40000A4A200160062102356
66352+:103900003042FFFF0044102B384200011040000DF0
66353+:1039100002201021006030213C07800494E2000660
66354+:10392000A4A2001694E3000600C310233042FFFF58
66355+:103930000044102B384200011440FFF8A4A30016E5
66356+:10394000022010218FBF00188FB100148FB000101B
66357+:1039500003E0000827BD002003E00008000000008D
66358+:103960008F82002C3C03000600021140004310250A
66359+:103970003C038000AC62003000000000000000004A
66360+:10398000000000008C620000304200101040FFFD7B
66361+:1039900034620400AF82002803E00008AF80002CEE
66362+:1039A00003E000080000102103E000080000000010
66363+:1039B0003084FFFF30A5FFFF0000182110800007B2
66364+:1039C000000000003082000110400002000420428C
66365+:1039D000006518210A000E3D0005284003E000089C
66366+:1039E0000060102110C0000624C6FFFF8CA200005A
66367+:1039F00024A50004AC8200000A000E4724840004C1
66368+:103A000003E000080000000010A0000824A3FFFF4E
66369+:103A1000AC86000000000000000000002402FFFF50
66370+:103A20002463FFFF1462FFFA2484000403E000080B
66371+:103A3000000000003C0280083442008024030001A2
66372+:103A4000AC43000CA4430010A4430012A443001490
66373+:103A500003E00008A44300168F82002427BDFFD88E
66374+:103A6000AFB3001CAFB20018AFB10014AFB000107C
66375+:103A7000AFBF00208C47000C248200802409FF8007
66376+:103A80003C08800E3043007F008080213C0A80008B
66377+:103A9000004920240068182130B100FF30D200FF17
66378+:103AA00010E000290000982126020100AD44002CFE
66379+:103AB000004928243042007F004820219062000005
66380+:103AC00024030050304200FF1443000400000000B3
66381+:103AD000AD45002C948200EA3053FFFF0E000D84A8
66382+:103AE000000000008F8200248F83002000112C0032
66383+:103AF0009442001E001224003484000100A22825F4
66384+:103B00003C02400000A22825AC7000008FBF0020BE
66385+:103B1000AC6000048FB20018AC7300088FB10014C1
66386+:103B2000AC60000C8FB3001CAC6400108FB00010B0
66387+:103B3000AC60001424040001AC60001827BD00280C
66388+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
66389+:103B50008FB200188FB100148FB0001003E000087E
66390+:103B600027BD00283C06800034C201009043000FAE
66391+:103B7000240200101062000E2865001110A000073A
66392+:103B800024020012240200082405003A10620006F4
66393+:103B90000000302103E0000800000000240500358B
66394+:103BA0001462FFFC000030210A000E6400000000D7
66395+:103BB0008CC200748F83FF9424420FA003E000089E
66396+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
66397+:103BD000240500013C0480088FBF0010240200016E
66398+:103BE00034830080A462001227BD00182402000163
66399+:103BF00003E00008A080001A27BDFFE0AFB2001864
66400+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
66401+:103C10000E000332008088213C028008345000806E
66402+:103C20009202000924030004304200FF1443000CF8
66403+:103C30003C028008124000082402000A0E000E5BBD
66404+:103C400000000000920200052403FFFE0043102440
66405+:103C5000A202000524020012A20200093C02800810
66406+:103C600034420080022020210E00033DA0400027A6
66407+:103C700016400003022020210E000EBF00000000AD
66408+:103C800002202021324600FF8FBF001C8FB2001897
66409+:103C90008FB100148FB00010240500380A000E64A4
66410+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
66411+:103CB000AFB10014AFB000100E00033200808021BD
66412+:103CC0000E000E5B000000003C02800834450080BE
66413+:103CD00090A2000924120018305100FF1232000394
66414+:103CE0000200202124020012A0A2000990A20005D7
66415+:103CF0002403FFFE004310240E00033DA0A2000594
66416+:103D00000200202124050020163200070000302187
66417+:103D10008FBF001C8FB200188FB100148FB000103D
66418+:103D20000A00034227BD00208FBF001C8FB200187D
66419+:103D30008FB100148FB00010240500390A000E6402
66420+:103D400027BD002027BDFFE83C028000AFB0001077
66421+:103D5000AFBF0014344201009442000C2405003629
66422+:103D60000080802114400012304600FF0E00033214
66423+:103D7000000000003C02800834420080240300124E
66424+:103D8000A043000990430005346300100E000E5B51
66425+:103D9000A04300050E00033D020020210200202167
66426+:103DA0000E000342240500200A000F3C0000000022
66427+:103DB0000E000E64000000000E00033202002021FD
66428+:103DC0003C0280089043001B2405FF9F0200202135
66429+:103DD000006518248FBF00148FB00010A043001B93
66430+:103DE0000A00033D27BD001827BDFFE0AFBF001844
66431+:103DF000AFB10014AFB0001030B100FF0E000332BD
66432+:103E0000008080213C02800824030012344200809C
66433+:103E10000E000E5BA04300090E00033D02002021AE
66434+:103E200002002021022030218FBF00188FB1001422
66435+:103E30008FB00010240500350A000E6427BD002055
66436+:103E40003C0480089083000E9082000A1443000B0B
66437+:103E5000000028218F82FF942403005024050001D4
66438+:103E600090420000304200FF1443000400000000B4
66439+:103E70009082000E24420001A082000E03E00008A0
66440+:103E800000A010213C0380008C6201F80440FFFE7A
66441+:103E900024020002AC6401C0A06201C43C02100014
66442+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
66443+:103EB0003C128008AFB10014AFBF001CAFB00010BF
66444+:103EC00036510080922200092403000A304200FF8C
66445+:103ED0001443003E000000008E4300048E22003890
66446+:103EE000506200808FBF001C92220000240300500B
66447+:103EF000304200FF144300253C0280008C42014008
66448+:103F00008E4300043642010002202821AC43001CED
66449+:103F10009622005C8E2300383042FFFF00021040E2
66450+:103F200000621821AE23001C8E4300048E2400384A
66451+:103F30009622005C006418233042FFFF0003184300
66452+:103F4000000210400043102A10400006000000004C
66453+:103F50008E4200048E230038004310230A000FAA6B
66454+:103F6000000220439622005C3042FFFF0002204006
66455+:103F70003C0280083443010034420080ACA4002C91
66456+:103F8000A040002424020001A062000C0E000F5E7D
66457+:103F900000000000104000538FBF001C3C02800056
66458+:103FA0008C4401403C0380008C6201F80440FFFE19
66459+:103FB00024020002AC6401C0A06201C43C021000F3
66460+:103FC000AC6201F80A0010078FBF001C92220009A2
66461+:103FD00024030010304200FF144300043C02800020
66462+:103FE0008C4401400A000FEE0000282192220009B3
66463+:103FF00024030016304200FF14430006240200147C
66464+:10400000A22200093C0280008C4401400A001001F9
66465+:104010008FBF001C8E2200388E23003C00431023EB
66466+:10402000044100308FBF001C92220027244200016F
66467+:10403000A2220027922200272C42000414400016DE
66468+:104040003C1080009222000924030004304200FF4B
66469+:10405000144300093C0280008C4401408FBF001CC7
66470+:104060008FB200188FB100148FB000102405009398
66471+:104070000A000ECC27BD00208C440140240500938B
66472+:104080008FBF001C8FB200188FB100148FB00010CA
66473+:104090000A000F4827BD00208E0401400E000332A5
66474+:1040A000000000008E4200042442FFFFAE420004E4
66475+:1040B0008E22003C2442FFFFAE22003C0E00033D56
66476+:1040C0008E0401408E0401408FBF001C8FB2001887
66477+:1040D0008FB100148FB00010240500040A000342C1
66478+:1040E00027BD00208FB200188FB100148FB00010D0
66479+:1040F00003E0000827BD00203C0680008CC2018838
66480+:104100003C038008346500809063000E00021402B6
66481+:10411000304400FF306300FF1464000E3C0280084E
66482+:1041200090A20026304200FF104400098F82FF94C5
66483+:10413000A0A400262403005090420000304200FF5B
66484+:1041400014430006000000000A0005A18CC4018091
66485+:104150003C02800834420080A044002603E00008AE
66486+:104160000000000027BDFFE030E700FFAFB20018FD
66487+:10417000AFBF001CAFB10014AFB0001000809021A1
66488+:1041800014E0000630C600FF000000000000000D33
66489+:10419000000000000A001060240001163C038008A3
66490+:1041A0009062000E304200FF14460023346200800B
66491+:1041B00090420026304200FF1446001F000000001D
66492+:1041C0009062000F304200FF1446001B0000000008
66493+:1041D0009062000A304200FF144600038F90FF9463
66494+:1041E0000000000D8F90FF948F82FF983C1180009B
66495+:1041F000AE05003CAC450000A066000A0E0003328C
66496+:104200008E240100A20000240E00033D8E24010034
66497+:104210003C0380008C6201F80440FFFE240200028F
66498+:10422000AC7201C0A06201C43C021000AC6201F893
66499+:104230000A0010618FBF001C000000000000000D8C
66500+:10424000000000002400013F8FBF001C8FB2001847
66501+:104250008FB100148FB0001003E0000827BD0020CC
66502+:104260008F83FF943C0280008C44010034420100A3
66503+:104270008C65003C9046001B0A00102724070001B3
66504+:104280003C0280089043000E9042000A0043102632
66505+:10429000304200FF03E000080002102B27BDFFE0C2
66506+:1042A0003C028008AFB10014AFB00010AFBF0018DF
66507+:1042B0003450008092020005240300303042003068
66508+:1042C00014430085008088218F8200248C42000CDA
66509+:1042D000104000828FBF00180E000D840000000007
66510+:1042E0008F860020ACD100009202000892030009E2
66511+:1042F000304200FF00021200306300FF004310252F
66512+:10430000ACC200049202004D000216000002160327
66513+:1043100004410005000000003C0308008C630048D5
66514+:104320000A00109F3C1080089202000830420040B2
66515+:10433000144000030000182192020027304300FFC0
66516+:104340003C108008361100809222004D00031E00B0
66517+:10435000304200FF0002140000621825ACC30008C0
66518+:104360008E2400308F820024ACC4000C8E250034D3
66519+:104370009443001E3C02C00BACC50010006218251F
66520+:104380008E22003800002021ACC200148E22003C96
66521+:10439000ACC200180E000DB8ACC3001C8E020004A5
66522+:1043A0008F8400203C058000AC8200008E2200201B
66523+:1043B000AC8200048E22001CAC8200088E220058C1
66524+:1043C0008CA3007400431021AC82000C8E22002CC0
66525+:1043D000AC8200108E2200408E23004400021400A4
66526+:1043E00000431025AC8200149222004D240300806B
66527+:1043F000304200FF1443000400000000AC800018AD
66528+:104400000A0010E38F8200248E23000C2402000196
66529+:104410001062000E2402FFFF92220008304200408A
66530+:104420001440000A2402FFFF8E23000C8CA20074AB
66531+:10443000006218233C0208000062102414400002AD
66532+:10444000000028210060282100051043AC820018DC
66533+:104450008F820024000020219443001E3C02C00CE7
66534+:10446000006218258F8200200E000DB8AC43001C9E
66535+:104470003C038008346201008C4200008F850020DC
66536+:10448000346300808FBF0018ACA20000ACA0000411
66537+:104490008C6400488F8200248FB10014ACA4000803
66538+:1044A000ACA0000CACA00010906300059446001E68
66539+:1044B0003C02400D00031E0000C23025ACA30014D6
66540+:1044C0008FB00010ACA0001824040001ACA6001CA2
66541+:1044D0000A000DB827BD00208FBF00188FB100144F
66542+:1044E0008FB0001003E0000827BD00203C028000D0
66543+:1044F0009443007C3C02800834460100308400FF75
66544+:104500003065FFFF2402000524A34650A0C4000C20
66545+:104510005482000C3065FFFF90C2000D2C42000752
66546+:104520001040000724A30A0090C3000D24020014C9
66547+:104530000062100400A210210A00111F3045FFFF85
66548+:104540003065FFFF3C0280083442008003E0000831
66549+:10455000A44500143C03800834680080AD05003891
66550+:10456000346701008CE2001C308400FF00A210239D
66551+:104570001840000330C600FF24A2FFFCACE2001C80
66552+:1045800030820001504000083C0380088D02003C4E
66553+:1045900000A2102304410012240400058C620004D0
66554+:1045A00010A2000F3C0380088C62000414A2001EBD
66555+:1045B000000000003C0208008C4200D8304200207D
66556+:1045C000104000093C0280083462008090630008BB
66557+:1045D0009042004C144300043C0280082404000470
66558+:1045E0000A00110900000000344300803442010039
66559+:1045F000A040000C24020001A462001410C0000AB4
66560+:104600003C0280008C4401003C0380008C6201F875
66561+:104610000440FFFE24020002AC6401C0A06201C499
66562+:104620003C021000AC6201F803E00008000000004A
66563+:1046300027BDFFE800A61823AFBF00101860008058
66564+:10464000308800FF3C02800834470080A0E000244E
66565+:1046500034440100A0E000278C82001C00A210233B
66566+:1046600004400056000000008CE2003C94E3005C33
66567+:104670008CE4002C004530233063FFFF00C3182179
66568+:104680000083202B1080000400E018218CE2002C15
66569+:104690000A00117800A2102194E2005C3042FFFF72
66570+:1046A00000C2102100A21021AC62001C3C02800854
66571+:1046B000344400809482005C8C83001C3042FFFFF5
66572+:1046C0000002104000A210210043102B10400004F3
66573+:1046D000000000008C82001C0A00118B3C06800840
66574+:1046E0009482005C3042FFFF0002104000A21021C3
66575+:1046F0003C06800834C3010034C70080AC82001C33
66576+:10470000A060000CACE500388C62001C00A21023F5
66577+:104710001840000224A2FFFCAC62001C3102000120
66578+:10472000104000083C0380088CE2003C00A21023EB
66579+:1047300004410012240400058CC2000410A20010E1
66580+:104740008FBF00108C62000414A2004F8FBF0010B6
66581+:104750003C0208008C4200D8304200201040000A81
66582+:104760003C02800834620080906300089042004C54
66583+:10477000144300053C028008240400048FBF00108D
66584+:104780000A00110927BD001834430080344201009B
66585+:10479000A040000C24020001A46200143C0280002E
66586+:1047A0008C4401003C0380008C6201F80440FFFE51
66587+:1047B000240200020A0011D8000000008CE2001C54
66588+:1047C000004610230043102B54400001ACE5001CB0
66589+:1047D00094E2005C3042FFFF0062102B144000079F
66590+:1047E0002402000294E2005C8CE3001C3042FFFFD4
66591+:1047F00000621821ACE3001C24020002ACE5003882
66592+:104800000E000F5EA082000C1040001F8FBF001032
66593+:104810003C0280008C4401003C0380008C6201F863
66594+:104820000440FFFE24020002AC6401C0A06201C487
66595+:104830003C021000AC6201F80A0011F08FBF0010BA
66596+:1048400031020010104000108FBF00103C028008A1
66597+:10485000344500808CA3001C94A2005C00661823E1
66598+:104860003042FFFF006218213C023FFF3444FFFF4B
66599+:104870000083102B544000010080182100C3102138
66600+:10488000ACA2001C8FBF001003E0000827BD001879
66601+:1048900027BDFFE800C0402100A63023AFBF0010B5
66602+:1048A00018C00026308A00FF3C028008344900808E
66603+:1048B0008D24001C8D23002C008820230064182BDD
66604+:1048C0001060000F344701008CE2002000461021E8
66605+:1048D000ACE200208CE200200044102B1440000BBE
66606+:1048E0003C023FFF8CE2002000441023ACE2002099
66607+:1048F0009522005C3042FFFF0A0012100082202146
66608+:10490000ACE00020008620213C023FFF3443FFFF43
66609+:104910000064102B54400001006020213C028008FC
66610+:104920003442008000851821AC43001CA0400024C4
66611+:10493000A04000270A0012623C03800831420010A8
66612+:10494000104000433C0380083C06800834C40080CB
66613+:104950008C82003C004810235840003E34660080A2
66614+:104960009082002424420001A0820024908200242E
66615+:104970003C0308008C630024304200FF0043102BEE
66616+:10498000144000688FBF001034C201008C42001C2C
66617+:1049900000A2102318400063000000008CC3000434
66618+:1049A0009482005C006818233042FFFF0003184324
66619+:1049B000000210400043102A1040000500000000D3
66620+:1049C0008CC20004004810230A0012450002104364
66621+:1049D0009482005C3042FFFF000210403C068008D9
66622+:1049E000AC82002C34C5008094A2005C8CA4002C06
66623+:1049F00094A3005C3042FFFF00021040008220219F
66624+:104A00003063FFFF0083202101041021ACA2001CB1
66625+:104A10008CC2000434C60100ACC2001C2402000297
66626+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
66627+:104A30003C0280008C4401003C0380008C6201F841
66628+:104A40000440FFFE240200020A001292000000004F
66629+:104A500034660080ACC50038346401008C82001CD0
66630+:104A600000A210231840000224A2FFFCAC82001C0C
66631+:104A7000314200015040000A3C0380088CC2003CD7
66632+:104A800000A2102304430014240400058C620004D7
66633+:104A900014A200033C0380080A00128424040005C9
66634+:104AA0008C62000414A2001F8FBF00103C0208009B
66635+:104AB0008C4200D8304200201040000A3C0280089E
66636+:104AC00034620080906300089042004C144300055B
66637+:104AD0003C028008240400048FBF00100A00110962
66638+:104AE00027BD00183443008034420100A040000C70
66639+:104AF00024020001A46200143C0280008C440100E6
66640+:104B00003C0380008C6201F80440FFFE2402000296
66641+:104B1000AC6401C0A06201C43C021000AC6201F8A8
66642+:104B20008FBF001003E0000827BD001827BDFFE875
66643+:104B30003C0A8008AFBF0010354900808D22003C40
66644+:104B400000C04021308400FF004610231840009D23
66645+:104B500030E700FF354701002402000100A63023A2
66646+:104B6000A0E0000CA0E0000DA522001418C0002455
66647+:104B7000308200108D23001C8D22002C0068182329
66648+:104B80000043102B1040000F000000008CE20020BA
66649+:104B900000461021ACE200208CE200200043102BE4
66650+:104BA0001440000B3C023FFF8CE200200043102326
66651+:104BB000ACE200209522005C3042FFFF0A0012C1E7
66652+:104BC00000621821ACE00020006618213C023FFF83
66653+:104BD0003446FFFF00C3102B5440000100C01821D1
66654+:104BE0003C0280083442008000651821AC43001C60
66655+:104BF000A0400024A04000270A00130F3C038008B7
66656+:104C0000104000403C0380088D22003C00481023E7
66657+:104C10005840003D34670080912200242442000166
66658+:104C2000A1220024912200243C0308008C6300246C
66659+:104C3000304200FF0043102B1440009A8FBF001039
66660+:104C40008CE2001C00A21023184000960000000017
66661+:104C50008D4300049522005C006818233042FFFF5A
66662+:104C600000031843000210400043102A10400005C2
66663+:104C7000012020218D420004004810230A0012F276
66664+:104C8000000210439522005C3042FFFF00021040FA
66665+:104C90003C068008AC82002C34C5008094A2005CE5
66666+:104CA0008CA4002C94A3005C3042FFFF0002104053
66667+:104CB000008220213063FFFF0083182101031021AF
66668+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
66669+:104CD000240200020E000F5EA0C2000C1040007102
66670+:104CE0008FBF00103C0280008C4401003C03800018
66671+:104CF0008C6201F80440FFFE240200020A0013390E
66672+:104D00000000000034670080ACE500383466010024
66673+:104D10008CC2001C00A210231840000224A2FFFC39
66674+:104D2000ACC2001C30820001504000083C038008E7
66675+:104D30008CE2003C00A2102304430051240400052F
66676+:104D40008C62000410A2003E3C0380088C620004C8
66677+:104D500054A200548FBF00103C0208008C4200D8BF
66678+:104D600030420020104000063C028008346200807F
66679+:104D7000906300089042004C104300403C028008C1
66680+:104D80003443008034420100A040000C24020001A2
66681+:104D9000A46200143C0280008C4401003C038000AB
66682+:104DA0008C6201F80440FFFE24020002AC6401C0E2
66683+:104DB000A06201C43C021000AC6201F80A00137743
66684+:104DC0008FBF001024020005A120002714E2000A72
66685+:104DD0003C038008354301009062000D2C42000620
66686+:104DE000504000053C0380089062000D2442000101
66687+:104DF000A062000D3C03800834670080ACE50038F9
66688+:104E0000346601008CC2001C00A21023184000026E
66689+:104E100024A2FFFCACC2001C308200015040000AFA
66690+:104E20003C0380088CE2003C00A2102304410014E3
66691+:104E3000240400058C62000414A200033C038008D3
66692+:104E40000A00136E240400058C62000414A20015ED
66693+:104E50008FBF00103C0208008C4200D83042002076
66694+:104E60001040000A3C028008346200809063000811
66695+:104E70009042004C144300053C02800824040004C6
66696+:104E80008FBF00100A00110927BD001834430080AD
66697+:104E900034420100A040000C24020001A46200146E
66698+:104EA0008FBF001003E0000827BD00183C0B8008EE
66699+:104EB00027BDFFE83C028000AFBF00103442010074
66700+:104EC000356A00809044000A356901008C45001461
66701+:104ED0008D4800389123000C308400FF0105102319
66702+:104EE0001C4000B3306700FF2CE20006504000B1C8
66703+:104EF0008FBF00102402000100E2300430C2000322
66704+:104F00005440000800A8302330C2000C144000A117
66705+:104F100030C20030144000A38FBF00100A00143BC1
66706+:104F20000000000018C00024308200108D43001CD7
66707+:104F30008D42002C006818230043102B1040000FF6
66708+:104F4000000000008D22002000461021AD2200202C
66709+:104F50008D2200200043102B1440000B3C023FFF29
66710+:104F60008D22002000431023AD2200209542005CDA
66711+:104F70003042FFFF0A0013AF00621821AD2000206D
66712+:104F8000006618213C023FFF3446FFFF00C3102B90
66713+:104F90005440000100C018213C02800834420080C7
66714+:104FA00000651821AC43001CA0400024A04000274D
66715+:104FB0000A0013FD3C038008104000403C038008B9
66716+:104FC0008D42003C004810231840003D34670080AB
66717+:104FD0009142002424420001A14200249142002475
66718+:104FE0003C0308008C630024304200FF0043102B78
66719+:104FF000144000708FBF00108D22001C00A21023EF
66720+:105000001840006C000000008D6300049542005CB5
66721+:10501000006818233042FFFF0003184300021040CD
66722+:105020000043102A10400005014020218D62000439
66723+:10503000004810230A0013E0000210439542005C70
66724+:105040003042FFFF000210403C068008AC82002C7A
66725+:1050500034C5008094A2005C8CA4002C94A3005C56
66726+:105060003042FFFF00021040008220213063FFFF2A
66727+:105070000083182101031021ACA2001C8CC2000483
66728+:1050800034C60100ACC2001C240200020E000F5EF8
66729+:10509000A0C2000C104000478FBF00103C028000EF
66730+:1050A0008C4401003C0380008C6201F80440FFFE48
66731+:1050B000240200020A00142D000000003467008062
66732+:1050C000ACE50038346601008CC2001C00A210233D
66733+:1050D0001840000224A2FFFCACC2001C3082000178
66734+:1050E0005040000A3C0380088CE2003C00A21023E0
66735+:1050F00004430014240400058C62000414A200037D
66736+:105100003C0380080A00141F240400058C6200047C
66737+:1051100014A200288FBF00103C0208008C4200D867
66738+:10512000304200201040000A3C02800834620080B7
66739+:10513000906300089042004C144300053C02800834
66740+:10514000240400048FBF00100A00110927BD0018B5
66741+:105150003443008034420100A040000C24020001CE
66742+:10516000A46200143C0280008C4401003C038000D7
66743+:105170008C6201F80440FFFE24020002AC6401C00E
66744+:10518000A06201C43C021000AC6201F80A00143BAA
66745+:105190008FBF00108FBF0010010030210A00115A8C
66746+:1051A00027BD0018010030210A00129927BD001800
66747+:1051B0008FBF001003E0000827BD00183C038008E3
66748+:1051C0003464010024020003A082000C8C620004FD
66749+:1051D00003E00008AC82001C3C05800834A300807A
66750+:1051E0009062002734A501002406004324420001F8
66751+:1051F000A0620027906300273C0208008C42004810
66752+:10520000306300FF146200043C07602194A500EAAB
66753+:105210000A00090130A5FFFF03E0000800000000BC
66754+:1052200027BDFFE8AFBF00103C0280000E00144411
66755+:105230008C4401803C02800834430100A060000CD3
66756+:105240008C4200048FBF001027BD001803E0000847
66757+:10525000AC62001C27BDFFE03C028008AFBF001815
66758+:10526000AFB10014AFB000103445008034460100E7
66759+:105270003C0880008D09014090C3000C8CA4003CC8
66760+:105280008CA200381482003B306700FF9502007C3E
66761+:1052900090A30027146000093045FFFF2402000599
66762+:1052A00054E200083C04800890C2000D2442000132
66763+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
66764+:1052C0003C048008348201009042000C2403000555
66765+:1052D000304200FF1443000A24A205DC348300801E
66766+:1052E000906200272C4200075040000524A20A00CB
66767+:1052F00090630027240200140062100400A2102111
66768+:105300003C108008361000803045FFFF012020212E
66769+:105310000E001444A60500149602005C8E030038AB
66770+:105320003C1180003042FFFF000210400062182153
66771+:10533000AE03001C0E0003328E24014092020025B1
66772+:1053400034420040A20200250E00033D8E2401409D
66773+:105350008E2401403C0380008C6201F80440FFFE73
66774+:1053600024020002AC6401C0A06201C43C0210002F
66775+:10537000AC6201F88FBF00188FB100148FB000101D
66776+:1053800003E0000827BD00203C0360103C02080039
66777+:1053900024420174AC62502C8C6250003C048000AA
66778+:1053A00034420080AC6250003C0208002442547C2D
66779+:1053B0003C010800AC2256003C020800244254384C
66780+:1053C0003C010800AC2256043C020002AC840008F8
66781+:1053D000AC82000C03E000082402000100A0302190
66782+:1053E0003C1C0800279C56083C0200023C050400B7
66783+:1053F00000852826008220260004102B2CA5000101
66784+:105400002C840001000210803C0308002463560035
66785+:105410000085202500431821108000030000102182
66786+:10542000AC6600002402000103E000080000000058
66787+:105430003C1C0800279C56083C0200023C05040066
66788+:1054400000852826008220260004102B2CA50001B0
66789+:105450002C840001000210803C03080024635600E5
66790+:105460000085202500431821108000050000102130
66791+:105470003C02080024425438AC62000024020001BF
66792+:1054800003E00008000000003C0200023C030400AE
66793+:1054900000821026008318262C4200012C63000194
66794+:1054A000004310251040000B000028213C1C080080
66795+:1054B000279C56083C0380008C62000824050001EC
66796+:1054C00000431025AC6200088C62000C00441025DB
66797+:1054D000AC62000C03E0000800A010213C1C080096
66798+:1054E000279C56083C0580008CA3000C0004202754
66799+:1054F000240200010064182403E00008ACA3000C9F
66800+:105500003C020002148200063C0560008CA208D018
66801+:105510002403FFFE0043102403E00008ACA208D0DF
66802+:105520003C02040014820005000000008CA208D098
66803+:105530002403FFFD00431024ACA208D003E00008C0
66804+:10554000000000003C02601A344200108C430080CE
66805+:1055500027BDFFF88C440084AFA3000093A3000094
66806+:10556000240200041462001AAFA4000493A20001F4
66807+:105570001040000797A300023062FFFC3C0380004C
66808+:10558000004310218C4200000A001536AFA200042F
66809+:105590003062FFFC3C03800000431021AC4400005B
66810+:1055A000A3A000003C0560008CA208D02403FFFEED
66811+:1055B0003C04601A00431024ACA208D08FA300045E
66812+:1055C0008FA2000034840010AC830084AC82008081
66813+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
66814+:1055E0003C1C0800279C56083C0280008C43000CA1
66815+:1055F0008C420004004318243C0200021060001496
66816+:10560000006228243C0204003C04000210A00005B3
66817+:10561000006210243C0208008C4256000A00155B10
66818+:1056200000000000104000073C0404003C02080099
66819+:105630008C4256040040F809000000000A00156082
66820+:10564000000000000000000D3C1C0800279C5608CC
66821+:105650008FBF001003E0000827BD0018800802403B
66822+:1056600080080100800800808008000000000C8095
66823+:105670000000320008000E9808000EF408000F88A1
66824+:1056800008001028080010748008010080080080BD
66825+:10569000800800000A000028000000000000000050
66826+:1056A0000000000D6370362E322E316200000000C3
66827+:1056B00006020104000000000000000000000000DD
66828+:1056C000000000000000000038003C000000000066
66829+:1056D00000000000000000000000000000000020AA
66830+:1056E00000000000000000000000000000000000BA
66831+:1056F00000000000000000000000000000000000AA
66832+:10570000000000000000000021003800000000013F
66833+:105710000000002B000000000000000400030D400A
66834+:105720000000000000000000000000000000000079
66835+:105730000000000000000000100000030000000056
66836+:105740000000000D0000000D3C020800244259AC8E
66837+:105750003C03080024635BF4AC4000000043202BB2
66838+:105760001480FFFD244200043C1D080037BD9FFC4F
66839+:1057700003A0F0213C100800261000A03C1C0800EB
66840+:10578000279C59AC0E0002F6000000000000000D3E
66841+:1057900027BDFFB4AFA10000AFA20004AFA3000873
66842+:1057A000AFA4000CAFA50010AFA60014AFA700185F
66843+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
66844+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
66845+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
66846+:1057E0000E000820000000008FBF00488FBC00445E
66847+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
66848+:105800008FAD00308FAC002C8FAB00288FAA002406
66849+:105810008FA900208FA8001C8FA700188FA6001446
66850+:105820008FA500108FA4000C8FA300088FA2000486
66851+:105830008FA1000027BD004C3C1B60188F7A5030B0
66852+:10584000377B502803400008AF7A000000A01821E1
66853+:1058500000801021008028213C0460003C0760008B
66854+:105860002406000810600006348420788C42000072
66855+:10587000ACE220088C63000003E00008ACE3200CDD
66856+:105880000A000F8100000000240300403C02600079
66857+:1058900003E00008AC4320003C0760008F86000452
66858+:1058A0008CE520740086102100A2182B14600007DC
66859+:1058B000000028218F8AFDA024050001A1440013C7
66860+:1058C0008F89000401244021AF88000403E0000810
66861+:1058D00000A010218F84FDA08F8500049086001306
66862+:1058E00030C300FF00A31023AF82000403E00008D0
66863+:1058F000A08000138F84FDA027BDFFE8AFB000108B
66864+:10590000AFBF001490890011908700112402002875
66865+:10591000312800FF3906002830E300FF2485002CE1
66866+:105920002CD00001106200162484001C0E00006EB2
66867+:10593000000000008F8FFDA03C05600024020204DF
66868+:1059400095EE003E95ED003C000E5C0031ACFFFF93
66869+:10595000016C5025ACAA2010520000012402000462
66870+:10596000ACA22000000000000000000000000000C9
66871+:105970008FBF00148FB0001003E0000827BD00188F
66872+:105980000A0000A6000028218F85FDA027BDFFD8B2
66873+:10599000AFBF0020AFB3001CAFB20018AFB100140E
66874+:1059A000AFB000100080982190A4001124B0001C1A
66875+:1059B00024B1002C308300FF386200280E000090D4
66876+:1059C0002C5200010E00009800000000020020216F
66877+:1059D0001240000202202821000028210E00006E43
66878+:1059E000000000008F8DFDA03C0880003C05600099
66879+:1059F00095AC003E95AB003C02683025000C4C0095
66880+:105A0000316AFFFF012A3825ACA7201024020202C8
66881+:105A1000ACA6201452400001240200028FBF0020D7
66882+:105A20008FB3001C8FB200188FB100148FB000101C
66883+:105A300027BD002803E00008ACA2200027BDFFE03E
66884+:105A4000AFB20018AFB10014AFB00010AFBF001C70
66885+:105A50003C1160008E2320748F82000430D0FFFF41
66886+:105A600030F2FFFF1062000C2406008F0E00006E63
66887+:105A7000000000003C06801F0010440034C5FF00F9
66888+:105A80000112382524040002AE2720100000302126
66889+:105A9000AE252014AE2420008FBF001C8FB200184A
66890+:105AA0008FB100148FB0001000C0102103E0000877
66891+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
66892+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
66893+:105AD00000102400009180253C036000AC70201071
66894+:105AE0008FBF00188FB100148FB000102402000483
66895+:105AF000AC62200027BD002003E000080000102158
66896+:105B000027BDFFE03C046018AFBF0018AFB1001420
66897+:105B1000AFB000108C8850002403FF7F34028071E6
66898+:105B20000103382434E5380C241F00313C1980006F
66899+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
66900+:105B40000E00054CAF9100400E00050A3C116000AC
66901+:105B50000E00007D000000008E3008083C0F570941
66902+:105B60002418FFF00218602435EEE00035EDF00057
66903+:105B7000018E5026018D58262D4600012D69000109
66904+:105B8000AF86004C0E000D09AF8900503C06601630
66905+:105B90008CC700003C0860148D0500A03C03FFFF8B
66906+:105BA00000E320243C02535300052FC2108200550D
66907+:105BB00034D07C00960201F2A780006C10400003F4
66908+:105BC000A780007C384B1E1EA78B006C960201F844
66909+:105BD000104000048F8D0050384C1E1EA78C007C96
66910+:105BE0008F8D005011A000058F83004C240E0020E3
66911+:105BF000A78E007CA78E006C8F83004C1060000580
66912+:105C00009785007C240F0020A78F007CA78F006C55
66913+:105C10009785007C2CB8008153000001240500808A
66914+:105C20009784006C2C91040152200001240404008C
66915+:105C30001060000B3C0260008FBF00188FB1001491
66916+:105C40008FB0001027BD0020A784006CA785007CC2
66917+:105C5000A380007EA780007403E00008A780009264
66918+:105C60008C4704382419103C30FFFFFF13F9000360
66919+:105C700030A8FFFF1100004624030050A380007EDF
66920+:105C80009386007E50C00024A785007CA780007CFE
66921+:105C90009798007CA780006CA7800074A780009272
66922+:105CA0003C010800AC3800800E00078700000000AF
66923+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
66924+:105CC000260C0388356A00100000482100002821B6
66925+:105CD00001AE20243C105709AF8C0010AF8A004859
66926+:105CE000AF89001810900023AF8500148FBF0018F3
66927+:105CF0008FB100148FB0001027BD002003E0000812
66928+:105D0000AF80005400055080014648218D260004D4
66929+:105D10000A00014800D180219798007CA784006C7C
66930+:105D2000A7800074A78000923C010800AC38008076
66931+:105D30000E000787000000003C0F60008DED080892
66932+:105D4000240EFFF03C0B600E260C0388356A001011
66933+:105D5000000048210000282101AE20243C105709F2
66934+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
66935+:105D7000AF85001424110001AF9100548FBF0018AB
66936+:105D80008FB100148FB0001003E0000827BD002081
66937+:105D90000A00017BA383007E3083FFFF8F880040D1
66938+:105DA0008F87003C000321403C0580003C020050EE
66939+:105DB000008248253C0660003C0A010034AC040027
66940+:105DC0008CCD08E001AA58241160000500000000F5
66941+:105DD0008CCF08E024E7000101EA7025ACCE08E092
66942+:105DE0008D19001001805821ACB900388D180014AD
66943+:105DF000ACB8003CACA9003000000000000000007E
66944+:105E00000000000000000000000000000000000092
66945+:105E100000000000000000003C0380008C640000D3
66946+:105E2000308200201040FFFD3C0F60008DED08E047
66947+:105E30003C0E010001AE18241460FFE100000000D8
66948+:105E4000AF87003C03E00008AF8B00588F8500400F
66949+:105E5000240BFFF03C06800094A7001A8CA90024B4
66950+:105E600030ECFFFF000C38C000EB5024012A402129
66951+:105E7000ACC8003C8CA400248CC3003C00831023DD
66952+:105E800018400033000000008CAD002025A2000166
66953+:105E90003C0F0050ACC2003835EE00103C068000CC
66954+:105EA000ACCE003000000000000000000000000048
66955+:105EB00000000000000000000000000000000000E2
66956+:105EC000000000003C0480008C9900003338002062
66957+:105ED0001300FFFD30E20008104000173C0980006D
66958+:105EE0008C880408ACA800108C83040CACA30014AC
66959+:105EF0003C1900203C188000AF19003094AE001807
66960+:105F000094AF001C01CF3021A4A6001894AD001A54
66961+:105F100025A70001A4A7001A94AB001A94AC001E98
66962+:105F2000118B00030000000003E0000800000000E7
66963+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
66964+:105F40008D240404ACA400140A0002183C1900209B
66965+:105F50008CA200200A0002003C0F00500A0001EE53
66966+:105F60000000000027BDFFE8AFBF00100E000232A6
66967+:105F7000000000008F8900408FBF00103C038000AC
66968+:105F8000A520000A9528000A9527000427BD0018BF
66969+:105F90003105FFFF30E6000F0006150000A22025A6
66970+:105FA00003E00008AC6400803C0508008CA50020DC
66971+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
66972+:105FC00010A300100000802124040001020430040A
66973+:105FD00000A6202400C3102450440006261000010F
66974+:105FE000001018802787FDA41480000A006718217C
66975+:105FF000261000012E0900025520FFF38F83000CAC
66976+:10600000AF85000C8FBF00148FB0001003E00008B4
66977+:1060100027BD00188C6800003C058000ACA8002457
66978+:106020000E000234261000013C0508008CA500205B
66979+:106030000A0002592E0900022405000100851804F7
66980+:106040003C0408008C84002027BDFFC8AFBF00348B
66981+:1060500000831024AFBE0030AFB7002CAFB60028CD
66982+:10606000AFB50024AFB40020AFB3001CAFB200182E
66983+:10607000AFB1001410400051AFB000108F84004049
66984+:10608000948700069488000A00E8302330D5FFFF8B
66985+:1060900012A0004B8FBF0034948B0018948C000A20
66986+:1060A000016C50233142FFFF02A2482B1520000251
66987+:1060B00002A02021004020212C8F000515E00002C5
66988+:1060C00000809821241300040E0001C102602021E9
66989+:1060D0008F87004002609021AF80004494F4000A52
66990+:1060E000026080211260004E3291FFFF3C1670006A
66991+:1060F0003C1440003C1E20003C1760008F99005863
66992+:106100008F380000031618241074004F0283F82BF8
66993+:1061100017E0003600000000107E00478F86004424
66994+:1061200014C0003A2403000102031023022320219B
66995+:106130003050FFFF1600FFF13091FFFF8F870040C6
66996+:106140003C1100203C108000AE11003094EB000A9E
66997+:106150003C178000024B5021A4EA000A94E9000A8F
66998+:1061600094E800043123FFFF3106000F00062D00E4
66999+:106170000065F025AEFE008094F3000A94F6001846
67000+:1061800012D30036001221408CFF00148CF4001052
67001+:1061900003E468210000C02101A4782B029870213B
67002+:1061A00001CF6021ACED0014ACEC001002B238233A
67003+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
67004+:1061C0008FBE00308FB7002C8FB600288FB500240B
67005+:1061D0008FB400208FB3001C8FB200188FB1001451
67006+:1061E0008FB0001003E0000827BD00381477FFCC03
67007+:1061F0008F8600440E000EE202002021004018218C
67008+:106200008F86004410C0FFC9020310230270702360
67009+:106210008F87004001C368210A0002E431B2FFFF0A
67010+:106220008F86004414C0FFC93C1100203C10800040
67011+:106230000A0002AEAE1100300E00046602002021FA
67012+:106240000A0002DB00401821020020210E0009395B
67013+:10625000022028210A0002DB004018210E0001EE76
67014+:10626000000000000A0002C702B2382327BDFFC8A1
67015+:10627000AFB7002CAFB60028AFB50024AFB40020F4
67016+:10628000AFB3001CAFB20018AFB10014AFB0001034
67017+:10629000AFBF00300E00011B241300013C047FFF40
67018+:1062A0003C0380083C0220003C010800AC20007048
67019+:1062B0003496FFFF34770080345200033C1512C03F
67020+:1062C000241400013C1080002411FF800E000245C0
67021+:1062D000000000008F8700488F8B00188F89001402
67022+:1062E0008CEA00EC8CE800E8014B302B01092823F4
67023+:1062F00000A6102314400006014B18231440000E82
67024+:106300003C05800002A3602B1180000B0000000000
67025+:106310003C0560008CEE00EC8CED00E88CA4180CC1
67026+:10632000AF8E001804800053AF8D00148F8F0010C3
67027+:10633000ADF400003C0580008CBF00003BF900017B
67028+:10634000333800011700FFE13C0380008C6201003C
67029+:1063500024060C0010460009000000008C680100B3
67030+:106360002D043080548000103C0480008C690100B2
67031+:106370002D2331811060000C3C0480008CAA0100A8
67032+:1063800011460004000020218CA6010024C5FF81D5
67033+:1063900030A400FF8E0B01000E000269AE0B00243A
67034+:1063A0000A00034F3C0480008C8D01002DAC3300AB
67035+:1063B00011800022000000003C0708008CE70098D4
67036+:1063C00024EE00013C010800AC2E00983C04800043
67037+:1063D0008C8201001440000300000000566000148D
67038+:1063E0003C0440008C9F01008C9801000000982123
67039+:1063F00003F1C82400193940330F007F00EF7025E6
67040+:1064000001D26825AC8D08308C8C01008C85010090
67041+:10641000258B0100017130240006514030A3007F1C
67042+:106420000143482501324025AC8808303C04400037
67043+:10643000AE0401380A00030E000000008C99010030
67044+:10644000240F0020AC99002092F80000330300FFD5
67045+:10645000106F000C241F0050547FFFDD3C048000AF
67046+:106460008C8401000E00154E000000000A00034F4E
67047+:106470003C04800000963824ACA7180C0A000327BF
67048+:106480008F8F00108C8501000E0008F72404008017
67049+:106490000A00034F3C04800000A4102B24030001D9
67050+:1064A00010400009000030210005284000A4102BF6
67051+:1064B00004A00003000318405440FFFC00052840DE
67052+:1064C0005060000A0004182B0085382B54E00004AB
67053+:1064D0000003184200C33025008520230003184222
67054+:1064E0001460FFF9000528420004182B03E000089F
67055+:1064F00000C310213084FFFF30C600FF3C0780003E
67056+:106500008CE201B80440FFFE00064C000124302557
67057+:106510003C08200000C820253C031000ACE00180AE
67058+:10652000ACE50184ACE4018803E00008ACE301B809
67059+:106530003C0660008CC5201C2402FFF03083020062
67060+:10654000308601001060000E00A2282434A500014E
67061+:106550003087300010E0000530830C0034A50004C3
67062+:106560003C04600003E00008AC85201C1060FFFDC7
67063+:106570003C04600034A5000803E00008AC85201C42
67064+:1065800054C0FFF334A500020A0003B03087300086
67065+:1065900027BDFFE8AFB00010AFBF00143C0760009C
67066+:1065A000240600021080001100A080218F83005873
67067+:1065B0000E0003A78C6400188F8200580000202171
67068+:1065C000240600018C45000C0E000398000000001A
67069+:1065D0001600000224020003000010218FBF0014E7
67070+:1065E0008FB0001003E0000827BD00188CE8201CC5
67071+:1065F0002409FFF001092824ACE5201C8F870058EE
67072+:106600000A0003CD8CE5000C3C02600E00804021A6
67073+:1066100034460100240900180000000000000000BA
67074+:10662000000000003C0A00503C0380003547020097
67075+:10663000AC68003834640400AC65003CAC670030E2
67076+:106640008C6C0000318B00201160FFFD2407FFFFE0
67077+:106650002403007F8C8D00002463FFFF248400044A
67078+:10666000ACCD00001467FFFB24C60004000000004E
67079+:10667000000000000000000024A402000085282B78
67080+:106680003C0300203C0E80002529FFFF010540212E
67081+:10669000ADC300301520FFE00080282103E0000892
67082+:1066A000000000008F82005827BDFFD8AFB3001C48
67083+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
67084+:1066C00094460002008098218C5200182CC300814F
67085+:1066D0008C4800048C4700088C51000C8C49001039
67086+:1066E000106000078C4A00142CC4000414800013AE
67087+:1066F00030EB000730C5000310A0001000000000C0
67088+:106700002410008B02002021022028210E00039873
67089+:10671000240600031660000224020003000010217A
67090+:106720008FBF00208FB3001C8FB200188FB10014F0
67091+:106730008FB0001003E0000827BD00281560FFF1AE
67092+:106740002410008B3C0C80003C030020241F00011F
67093+:10675000AD830030AF9F0044000000000000000047
67094+:10676000000000002419FFF024D8000F031978243A
67095+:106770003C1000D0AD88003801F0702524CD000316
67096+:106780003C08600EAD87003C35850400AD8E0030BE
67097+:10679000000D38823504003C3C0380008C6B000007
67098+:1067A000316200201040FFFD0000000010E00008F2
67099+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
67100+:1067C00024A50004AC8800001467FFFB24840004A7
67101+:1067D0003C05600EACA60038000000000000000080
67102+:1067E000000000008F8600543C0400203C0780001D
67103+:1067F000ACE4003054C000060120202102402021DA
67104+:106800000E0003A7000080210A00041D02002021C1
67105+:106810000E0003DD01402821024020210E0003A7C5
67106+:10682000000080210A00041D0200202127BDFFE096
67107+:10683000AFB200183092FFFFAFB10014AFBF001C21
67108+:10684000AFB000101640000D000088210A0004932C
67109+:106850000220102124050003508500278CE5000C40
67110+:106860000000000D262800013111FFFF24E2002066
67111+:106870000232802B12000019AF8200588F82004430
67112+:10688000144000168F8700583C0670003C0320001F
67113+:106890008CE5000000A62024148300108F84006083
67114+:1068A000000544023C09800000A980241480FFE90F
67115+:1068B000310600FF2CCA000B5140FFEB26280001D7
67116+:1068C000000668803C0E080025CE575801AE6021B6
67117+:1068D0008D8B0000016000080000000002201021E4
67118+:1068E0008FBF001C8FB200188FB100148FB0001042
67119+:1068F00003E0000827BD00200E0003982404008454
67120+:106900001600FFD88F8700580A000474AF8000601B
67121+:10691000020028210E0003BF240400018F870058C5
67122+:106920000A000474AF820060020028210E0003BF39
67123+:10693000000020210A0004A38F8700580E000404E1
67124+:10694000020020218F8700580A000474AF82006083
67125+:1069500030AFFFFF000F19C03C0480008C9001B8DD
67126+:106960000600FFFE3C1920043C181000AC83018097
67127+:10697000AC800184AC990188AC9801B80A00047518
67128+:106980002628000190E2000390E30002000020218D
67129+:106990000002FE0000033A0000FF2825240600083C
67130+:1069A0000E000398000000001600FFDC2402000324
67131+:1069B0008F870058000010210A000474AF82006025
67132+:1069C00090E8000200002021240600090A0004C308
67133+:1069D00000082E0090E4000C240900FF308500FF21
67134+:1069E00010A900150000302190F9000290F8000372
67135+:1069F000308F00FF94EB000400196E000018740043
67136+:106A0000000F62000186202501AE5025014B28258C
67137+:106A10003084FF8B0A0004C32406000A90E30002BE
67138+:106A200090FF0004000020210003360000DF28252D
67139+:106A30000A0004C32406000B0A0004D52406008BB8
67140+:106A4000000449C23127003F000443423C02800059
67141+:106A500000082040240316802CE60020AC43002CC4
67142+:106A600024EAFFE02482000114C0000330A900FFE3
67143+:106A700000801021314700FF000260803C0D800043
67144+:106A8000240A0001018D20213C0B000E00EA28049D
67145+:106A9000008B302111200005000538278CCE000026
67146+:106AA00001C5382503E00008ACC700008CD8000001
67147+:106AB0000307782403E00008ACCF000027BDFFE007
67148+:106AC000AFB10014AFB00010AFBF00183C076000BA
67149+:106AD0008CE408083402F0003C1160003083F000C0
67150+:106AE000240501C03C04800E000030211062000625
67151+:106AF000241000018CEA08083149F0003928E00030
67152+:106B00000008382B000780403C0D0200AE2D081411
67153+:106B1000240C16803C0B80008E2744000E000F8B47
67154+:106B2000AD6C002C120000043C02169124050001FB
67155+:106B3000120500103C023D2C345800E0AE384408E9
67156+:106B40003C1108008E31007C8FBF00183C066000AD
67157+:106B500000118540360F16808FB100148FB00010E1
67158+:106B60003C0E020027BD0020ACCF442003E000080B
67159+:106B7000ACCE08103C0218DA345800E0AE384408B5
67160+:106B80003C1108008E31007C8FBF00183C0660006D
67161+:106B900000118540360F16808FB100148FB00010A1
67162+:106BA0003C0E020027BD0020ACCF442003E00008CB
67163+:106BB000ACCE08100A0004EB240500010A0004EB27
67164+:106BC0000000282124020400A7820024A780001CC2
67165+:106BD000000020213C06080024C65A582405FFFF67
67166+:106BE00024890001000440803124FFFF01061821A0
67167+:106BF0002C87002014E0FFFAAC6500002404040098
67168+:106C0000A7840026A780001E000020213C06080063
67169+:106C100024C65AD82405FFFF248D0001000460809B
67170+:106C200031A4FFFF018658212C8A00201540FFFA6D
67171+:106C3000AD650000A7800028A7800020A780002263
67172+:106C4000000020213C06080024C65B582405FFFFF5
67173+:106C5000249900010004C0803324FFFF030678213B
67174+:106C60002C8E000415C0FFFAADE500003C05600065
67175+:106C70008CA73D002403E08F00E31024344601403C
67176+:106C800003E00008ACA63D002487007F000731C266
67177+:106C900024C5FFFF000518C2246400013082FFFFF5
67178+:106CA000000238C0A78400303C010800AC27003047
67179+:106CB000AF80002C0000282100002021000030219E
67180+:106CC0002489000100A728213124FFFF2CA81701E7
67181+:106CD000110000032C8300801460FFF924C600011A
67182+:106CE00000C02821AF86002C10C0001DA786002AF6
67183+:106CF00024CAFFFF000A11423C08080025085B581F
67184+:106D00001040000A00002021004030212407FFFF2E
67185+:106D1000248E00010004688031C4FFFF01A86021B7
67186+:106D20000086582B1560FFFAAD87000030A2001FC7
67187+:106D30005040000800043080240300010043C804D0
67188+:106D400000041080004878212738FFFF03E0000886
67189+:106D5000ADF8000000C820212405FFFFAC8500002D
67190+:106D600003E000080000000030A5FFFF30C6FFFF71
67191+:106D700030A8001F0080602130E700FF0005294295
67192+:106D80000000502110C0001D24090001240B000147
67193+:106D900025180001010B2004330800FF0126782686
67194+:106DA000390E00202DED00012DC2000101A2182591
67195+:106DB0001060000D014450250005C880032C4021BF
67196+:106DC0000100182110E0000F000A20278D040000A8
67197+:106DD000008A1825AD03000024AD00010000402109
67198+:106DE0000000502131A5FFFF252E000131C9FFFF12
67199+:106DF00000C9102B1040FFE72518000103E0000830
67200+:106E0000000000008D0A0000014440240A0005D162
67201+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
67202+:106E2000AFB00010AFBF001430E7FFFF00005021EB
67203+:106E30003410FFFF0000602124AF001F00C0482174
67204+:106E4000241800012419002005E0001601E010219B
67205+:106E50000002F943019F682A0009702B01AE40240B
67206+:106E600011000017000C18800064102110E00005CC
67207+:106E70008C4B000000F840040008382301675824B8
67208+:106E800000003821154000410000402155600016E7
67209+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
67210+:106EA00001E0102124A2003E0002F943019F682A5C
67211+:106EB0000009702B01AE40241500FFEB000C188078
67212+:106EC000154600053402FFFF020028210E0005B51B
67213+:106ED00000003821020010218FBF00148FB0001075
67214+:106EE00003E0000827BD00181520000301601821E9
67215+:106EF000000B1C0224080010306A00FF154000053A
67216+:106F0000306E000F250D000800031A0231A800FFA3
67217+:106F1000306E000F15C00005307F000325100004FF
67218+:106F200000031902320800FF307F000317E000055C
67219+:106F3000386900012502000200031882304800FF72
67220+:106F4000386900013123000110600004310300FFA3
67221+:106F5000250A0001314800FF310300FF000C6940A1
67222+:106F600001A34021240A000110CAFFD53110FFFF00
67223+:106F7000246E000131C800FF1119FFC638C9000195
67224+:106F80002D1F002053E0001C258B0001240D000163
67225+:106F90000A000648240E002051460017258B0001E8
67226+:106FA00025090001312800FF2D0900205120001281
67227+:106FB000258B000125430001010D5004014B1024D5
67228+:106FC000250900011440FFF4306AFFFF3127FFFF5D
67229+:106FD00010EE000C2582FFFF304CFFFF0000502117
67230+:106FE0003410FFFF312800FF2D0900205520FFF24B
67231+:106FF00025430001258B0001014648260A000602B0
67232+:10700000316CFFFF00003821000050210A000654B7
67233+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
67234+:10702000AFB10014001039423211FFE000071080A8
67235+:10703000AFB3001C00B1282330D3FFFFAFB200185C
67236+:1070400030A5FFFF00809021026030210044202104
67237+:10705000AFBF00200E0005E03207001F022288218A
67238+:107060003403FFFF0240202102002821026030216A
67239+:1070700000003821104300093231FFFF02201021A7
67240+:107080008FBF00208FB3001C8FB200188FB1001487
67241+:107090008FB0001003E0000827BD00280E0005E0B7
67242+:1070A0000000000000408821022010218FBF002036
67243+:1070B0008FB3001C8FB200188FB100148FB0001076
67244+:1070C00003E0000827BD0028000424003C03600002
67245+:1070D000AC603D0810A00002348210063482101605
67246+:1070E00003E00008AC623D0427BDFFE0AFB0001034
67247+:1070F000309000FF2E020006AFBF001810400008BD
67248+:10710000AFB10014001030803C03080024635784A2
67249+:1071100000C328218CA400000080000800000000AB
67250+:10712000000020218FBF00188FB100148FB0001015
67251+:107130000080102103E0000827BD00209791002A5D
67252+:1071400016200051000020213C020800904200332C
67253+:107150000A0006BB00000000978D002615A0003134
67254+:10716000000020210A0006BB2402000897870024A3
67255+:1071700014E0001A00001821006020212402000100
67256+:107180001080FFE98FBF0018000429C2004530219C
67257+:1071900000A6582B1160FFE43C0880003C0720004B
67258+:1071A000000569C001A76025AD0C00203C038008E4
67259+:1071B0002402001F2442FFFFAC6000000441FFFDD9
67260+:1071C0002463000424A5000100A6702B15C0FFF560
67261+:1071D000000569C00A0006A58FBF00189787001C2C
67262+:1071E0003C04080024845A58240504000E0006605C
67263+:1071F00024060001978B002424440001308AFFFFFD
67264+:107200002569FFFF2D48040000402821150000409B
67265+:10721000A789002424AC3800000C19C00A0006B964
67266+:10722000A780001C9787001E3C04080024845AD8BD
67267+:10723000240504000E00066024060001979900262C
67268+:10724000244400013098FFFF272FFFFF2F0E04007A
67269+:107250000040882115C0002CA78F0026A780001EA3
67270+:107260003A020003262401003084FFFF0E00068D41
67271+:107270002C4500010011F8C027F00100001021C0CA
67272+:107280000A0006BB240200089785002E978700227B
67273+:107290003C04080024845B580E00066024060001AC
67274+:1072A0009787002A8F89002C2445000130A8FFFF12
67275+:1072B00024E3FFFF0109302B0040802114C0001897
67276+:1072C000A783002AA7800022978500300E000F7543
67277+:1072D00002002021244A05003144FFFF0E00068DE4
67278+:1072E000240500013C05080094A500320E000F752E
67279+:1072F00002002021244521003C0208009042003376
67280+:107300000A0006BB000521C00A0006F3A784001E80
67281+:1073100024AC3800000C19C00A0006B9A784001C70
67282+:107320000A00070DA7850022308400FF27BDFFE873
67283+:107330002C820006AFBF0014AFB000101040001543
67284+:1073400000A03821000440803C0308002463579CBF
67285+:10735000010328218CA40000008000080000000028
67286+:1073600024CC007F000751C2000C59C23170FFFFCE
67287+:107370002547C40030E5FFFF2784001C02003021B0
67288+:107380000E0005B52407000197860028020620217B
67289+:10739000A78400288FBF00148FB0001003E00008FE
67290+:1073A00027BD00183C0508008CA50030000779C2F5
67291+:1073B0000E00038125E4DF003045FFFF3C04080098
67292+:1073C00024845B58240600010E0005B52407000143
67293+:1073D000978E002A8FBF00148FB0001025CD0001BA
67294+:1073E00027BD001803E00008A78D002A0007C9C2C6
67295+:1073F0002738FF00001878C231F0FFFF3C04080076
67296+:1074000024845AD802002821240600010E0005B564
67297+:1074100024070001978D0026260E0100000E84002F
67298+:1074200025AC00013C0B6000A78C0026AD603D0838
67299+:1074300036040006000030213C0760008CE23D0469
67300+:10744000305F000617E0FFFD24C9000100061B00A5
67301+:10745000312600FF006440252CC50004ACE83D0443
67302+:1074600014A0FFF68FBF00148FB0001003E00008D7
67303+:1074700027BD0018000751C22549C8002406000195
67304+:10748000240700013C04080024845A580E0005B566
67305+:107490003125FFFF978700248FBF00148FB00010A5
67306+:1074A00024E6000127BD001803E00008A786002499
67307+:1074B0003C0660183C090800252900FCACC9502C8A
67308+:1074C0008CC850003C0580003C020002350700805B
67309+:1074D000ACC750003C04080024841FE03C030800B3
67310+:1074E00024631F98ACA50008ACA2000C3C01080066
67311+:1074F000AC2459A43C010800AC2359A803E00008BF
67312+:107500002402000100A030213C1C0800279C59AC3B
67313+:107510003C0C04003C0B0002008B3826008C4026FB
67314+:107520002CE200010007502B2D050001000A4880C5
67315+:107530003C030800246359A4004520250123182199
67316+:107540001080000300001021AC660000240200013E
67317+:1075500003E00008000000003C1C0800279C59AC18
67318+:107560003C0B04003C0A0002008A3026008B3826BF
67319+:107570002CC200010006482B2CE5000100094080C8
67320+:107580003C030800246359A4004520250103182169
67321+:1075900010800005000010213C0C0800258C1F986D
67322+:1075A000AC6C00002402000103E0000800000000B1
67323+:1075B0003C0900023C080400008830260089382677
67324+:1075C0002CC30001008028212CE400010083102539
67325+:1075D0001040000B000030213C1C0800279C59ACD7
67326+:1075E0003C0A80008D4E00082406000101CA68256F
67327+:1075F000AD4D00088D4C000C01855825AD4B000C9D
67328+:1076000003E0000800C010213C1C0800279C59AC76
67329+:107610003C0580008CA6000C0004202724020001F9
67330+:1076200000C4182403E00008ACA3000C3C020002D4
67331+:107630001082000B3C0560003C070400108700032B
67332+:107640000000000003E00008000000008CA908D042
67333+:10765000240AFFFD012A402403E00008ACA808D05A
67334+:107660008CA408D02406FFFE0086182403E000083E
67335+:10767000ACA308D03C05601A34A600108CC300806F
67336+:1076800027BDFFF88CC50084AFA3000093A40000C1
67337+:107690002402001010820003AFA5000403E00008DC
67338+:1076A00027BD000893A7000114E0001497AC000266
67339+:1076B00097B800023C0F8000330EFFFC01CF682119
67340+:1076C000ADA50000A3A000003C0660008CC708D058
67341+:1076D0002408FFFE3C04601A00E82824ACC508D04A
67342+:1076E0008FA300048FA200003499001027BD00086A
67343+:1076F000AF22008003E00008AF2300843C0B800031
67344+:10770000318AFFFC014B48218D2800000A00080C3B
67345+:10771000AFA8000427BDFFE8AFBF00103C1C080065
67346+:10772000279C59AC3C0580008CA4000C8CA2000462
67347+:107730003C0300020044282410A0000A00A31824DF
67348+:107740003C0604003C0400021460000900A610245A
67349+:107750001440000F3C0404000000000D3C1C080015
67350+:10776000279C59AC8FBF001003E0000827BD00180C
67351+:107770003C0208008C4259A40040F80900000000B7
67352+:107780003C1C0800279C59AC0A0008358FBF00102C
67353+:107790003C0208008C4259A80040F8090000000093
67354+:1077A0000A00083B000000003C0880008D0201B880
67355+:1077B0000440FFFE35090180AD2400003C031000A9
67356+:1077C00024040040AD250004A1240008A1260009DE
67357+:1077D000A527000A03E00008AD0301B83084FFFFCD
67358+:1077E0000080382130A5FFFF000020210A00084555
67359+:1077F000240600803087FFFF8CA400002406003898
67360+:107800000A000845000028218F8300788F860070C9
67361+:107810001066000B008040213C07080024E75B68ED
67362+:10782000000328C000A710218C440000246300013D
67363+:10783000108800053063000F5466FFFA000328C06B
67364+:1078400003E00008000010213C07080024E75B6CFF
67365+:1078500000A7302103E000088CC200003C03900028
67366+:1078600034620001008220253C038000AC640020CB
67367+:107870008C65002004A0FFFE0000000003E000086B
67368+:10788000000000003C0280003443000100832025FA
67369+:1078900003E00008AC44002027BDFFE0AFB10014B6
67370+:1078A0003091FFFFAFB00010AFBF001812200013DF
67371+:1078B00000A080218CA20000240400022406020003
67372+:1078C0001040000F004028210E0007250000000096
67373+:1078D00000001021AE000000022038218FBF0018E8
67374+:1078E0008FB100148FB0001000402021000028212B
67375+:1078F000000030210A00084527BD00208CA20000AE
67376+:10790000022038218FBF00188FB100148FB00010F3
67377+:107910000040202100002821000030210A000845F5
67378+:1079200027BD002000A010213087FFFF8CA5000498
67379+:107930008C4400000A000845240600068F83FD9C45
67380+:1079400027BDFFE8AFBF0014AFB00010906700087C
67381+:10795000008010210080282130E600400000202116
67382+:1079600010C000088C5000000E0000BD0200202155
67383+:10797000020020218FBF00148FB000100A000548BC
67384+:1079800027BD00180E0008A4000000000E0000BD76
67385+:1079900002002021020020218FBF00148FB00010B0
67386+:1079A0000A00054827BD001827BDFFE0AFB0001052
67387+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
67388+:1079C00092060001008088210E00087230D2000467
67389+:1079D00092040005001129C2A6050000348300406E
67390+:1079E000A20300050E00087C022020210E00054A9B
67391+:1079F0000220202124020001AE02000C02202821D6
67392+:107A0000A602001024040002A602001224060200AE
67393+:107A1000A60200140E000725A60200161640000F4D
67394+:107A20008FBF001C978C00743C0B08008D6B007896
67395+:107A30002588FFFF3109FFFF256A0001012A382B45
67396+:107A400010E00006A78800743C0F6006240E0016A4
67397+:107A500035ED0010ADAE00508FBF001C8FB2001886
67398+:107A60008FB100148FB0001003E0000827BD002084
67399+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
67400+:107A80001080000400A088212402008010820007DA
67401+:107A9000000000000000000D8FBF00188FB100141F
67402+:107AA0008FB0001003E0000827BD00200E00087210
67403+:107AB00000A020218F86FD9C0220202190C500057A
67404+:107AC0000E00087C30B000FF2403003E1603FFF1D7
67405+:107AD0003C0680008CC401780480FFFE34C801405D
67406+:107AE000240900073C071000AD11000002202021EE
67407+:107AF000A10900048FBF00188FB100148FB00010CF
67408+:107B0000ACC701780A0008C527BD002027BDFFE0EB
67409+:107B1000AFB00010AFBF0018AFB100143C10800030
67410+:107B20008E110020000000000E00054AAE04002067
67411+:107B3000AE1100208FBF00188FB100148FB000105D
67412+:107B400003E0000827BD00203084FFFF00803821BB
67413+:107B50002406003500A020210A0008450000282145
67414+:107B60003084FFFF008038212406003600A0202149
67415+:107B70000A0008450000282127BDFFD0AFB500242A
67416+:107B80003095FFFFAFB60028AFB40020AFBF002C88
67417+:107B9000AFB3001CAFB20018AFB10014AFB000100B
67418+:107BA00030B6FFFF12A000270000A0218F920058DE
67419+:107BB0008E4300003C0680002402004000033E0289
67420+:107BC00000032C0230E4007F006698241482001D1C
67421+:107BD00030A500FF8F8300682C68000A1100001098
67422+:107BE0008F8D0044000358803C0C0800258C57B84A
67423+:107BF000016C50218D4900000120000800000000A8
67424+:107C000002D4302130C5FFFF0E0008522404008446
67425+:107C1000166000028F920058AF8000688F8D00447C
67426+:107C20002659002026980001032090213314FFFFDD
67427+:107C300015A00004AF9900580295202B1480FFDC9A
67428+:107C400000000000028010218FBF002C8FB600289A
67429+:107C50008FB500248FB400208FB3001C8FB20018A2
67430+:107C60008FB100148FB0001003E0000827BD003072
67431+:107C70002407003414A70149000000009247000EB9
67432+:107C80008F9FFDA08F90FD9C24181600A3E700197C
67433+:107C90009242000D3C0880003C07800CA3E20018D3
67434+:107CA000964A00123C0D60003C117FFFA60A005C62
67435+:107CB000964400103623FFFF240200053099FFFF91
67436+:107CC000AE1900548E46001CAD1800288CEF000041
67437+:107CD0008DAE444801E6482601C93021AE06003881
67438+:107CE0008E05003824CB00013C0E7F00AE05003C21
67439+:107CF0008E0C003CAFEC0004AE0B00208E13002075
67440+:107D0000AE13001CA3E0001BAE03002CA3E2001284
67441+:107D10008E4A001424130050AE0A00348E0400343E
67442+:107D2000AFE400148E590018AE1900489258000CA8
67443+:107D3000A218004E920D000835AF0020A20F0008D7
67444+:107D40008E090018012E282434AC4000AE0C001817
67445+:107D5000920B0000317200FF1253027F2403FF8058
67446+:107D60003C04080024845BE80E0008AA0000000020
67447+:107D70003C1108008E315BE80E00087202202021C1
67448+:107D80002405000424080001A2050025022020216A
67449+:107D90000E00087CA20800053C0580008CB001782C
67450+:107DA0000600FFFE8F92005834AE0140240F0002FF
67451+:107DB0003C091000ADD10000A1CF0004ACA90178AE
67452+:107DC0000A000962AF8000682CAD003751A0FF9413
67453+:107DD0008F8D0044000580803C110800263157E05B
67454+:107DE000021178218DEE000001C0000800000000A3
67455+:107DF0002411000414B1008C3C0780003C080800EA
67456+:107E00008D085BE88F86FD9CACE800208E4500085D
67457+:107E10008F99FDA0240D0050ACC500308E4C000899
67458+:107E2000ACCC00508E4B000CACCB00348E43001019
67459+:107E3000ACC300388E4A0010ACCA00548E42001405
67460+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
67461+:107E5000ACD0002090C40000309800FF130D024AFF
67462+:107E6000000000008CC400348CD00030009030231F
67463+:107E700004C000F12404008C126000EE2402000310
67464+:107E80000A000962AF8200682419000514B900666F
67465+:107E90003C0580003C0808008D085BE88F86FD9C4F
67466+:107EA000ACA800208E4C00048F8AFDA0240720007F
67467+:107EB000ACCC001C924B000824120008A14B001906
67468+:107EC0008F82005890430009A14300188F85005805
67469+:107ED00090BF000A33E400FF1092001028890009C7
67470+:107EE000152000BA240E0002240D0020108D000B76
67471+:107EF000340780002898002117000008240740005C
67472+:107F000024100040109000053C0700012419008057
67473+:107F1000109900023C070002240740008CC20018A0
67474+:107F20003C03FF00004350240147F825ACDF001854
67475+:107F300090B2000BA0D200278F8300589464000CED
67476+:107F4000108001FE000000009467000C3C1F8000C0
67477+:107F50002405FFBFA4C7005C9063000E2407000443
67478+:107F6000A0C300088F820058904A000FA0CA0009E1
67479+:107F70008F8900588D3200108FE400740244C823AA
67480+:107F8000ACD900588D300014ACD0002C95380018B6
67481+:107F9000330DFFFFACCD00409531001A322FFFFFAB
67482+:107FA000ACCF00448D2E001CACCE00489128000EB2
67483+:107FB000A0C8000890CC000801855824126001B6C2
67484+:107FC000A0CB00088F9200580A000962AF870068B2
67485+:107FD0002406000614A600143C0E80003C0F080086
67486+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
67487+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
67488+:1080000024040005ACA800048CCC003C1260008164
67489+:10801000AD6C00000A000962AF84006824110007FB
67490+:1080200010B1004B240400063C05080024A55BE8C1
67491+:108030000E000881240400818F9200580013102B39
67492+:108040000A000962AF820068241F002314BFFFF6F4
67493+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
67494+:10806000AD8500208F91FD9C8E4600042564002084
67495+:1080700026450014AE260028240600030E000F81BA
67496+:10808000257000308F87005802002021240600034D
67497+:108090000E000F8124E500083C04080024845BE8FE
67498+:1080A0000E0008AA0000000092230000240A0050DD
67499+:1080B000306200FF544AFFE18F9200580E000F6CAF
67500+:1080C000000000000A000A6A8F920058240800335A
67501+:1080D00014A800323C0380003C1108008E315BE89C
67502+:1080E0008F8FFDA0AC7100208E420008240D002867
67503+:1080F0008F89FD9CADE200308E4A000C24060009F9
67504+:10810000ADEA00348E5F0010ADFF00388E440014DD
67505+:10811000ADE400208E590018ADF900248E58001CE3
67506+:10812000ADF80028A1ED00118E4E00041260003160
67507+:10813000AD2E00288F9200580A000962AF860068B1
67508+:10814000240D002214ADFFB8000000002404000735
67509+:108150003C1008008E105BE83C188000AF10002037
67510+:108160005660FEAEAF8400683C04080024845BE8DF
67511+:108170000E0008AA241300508F84FD9C90920000EA
67512+:10818000325900FF1333014B000000008F9200585A
67513+:10819000000020210A000962AF8400683C05080045
67514+:1081A00024A55BE80E000858240400810A000A6A2E
67515+:1081B0008F92005802D498213265FFFF0E000852BA
67516+:1081C000240400840A0009628F920058108EFF5325
67517+:1081D000240704002887000310E00179241100041B
67518+:1081E000240F0001548FFF4D240740000A000A228B
67519+:1081F000240701003C05080024A55BE80E0008A444
67520+:10820000240400828F920058000030210A00096285
67521+:10821000AF8600683C04080024845BE88CC2003808
67522+:108220000E0008AA8CC3003C8F9200580A000AC0B6
67523+:1082300000002021240400823C05080024A55BE8FE
67524+:108240000E0008A4000000008F92005800001021CA
67525+:108250000A000962AF8200688E5000048F91FD9C75
67526+:108260003C078000ACF00020922C00050200282181
67527+:10827000318B0002156001562404008A8F92FDA004
67528+:108280002404008D9245001B30A6002014C001502C
67529+:1082900002002821922E00092408001231C900FF93
67530+:1082A0001128014B240400810E00087202002021D5
67531+:1082B0009258001B240F000402002021370D0042B9
67532+:1082C000A24D001B0E00087CA22F00253C0580005B
67533+:1082D0008CA401780480FFFE34B90140241F000201
67534+:1082E000AF300000A33F00048F9200583C101000F4
67535+:1082F000ACB001780A000A6B0013102B8E500004FA
67536+:108300008F91FD9C3C038000AC700020922A0005F8
67537+:108310000200282131420002144000172404008A80
67538+:10832000922C00092412000402002821318B00FF46
67539+:1083300011720011240400810E0008720200202135
67540+:108340008F89FDA0240800122405FFFE912F001B39
67541+:108350000200202135EE0020A12E001BA2280009DA
67542+:108360009226000500C538240E00087CA2270005CF
67543+:1083700002002821000020210E0009330000000027
67544+:108380000A000A6A8F9200588E4C00043C07800055
67545+:108390003C10080026105BE8ACEC00203C01080013
67546+:1083A000AC2C5BE8924B0003317100041220013BBE
67547+:1083B0008F84FD9C24020006A0820009924F001BBE
67548+:1083C000240EFFC031E9003F012E4025A08800089F
67549+:1083D0009245000330A6000114C0013200000000E5
67550+:1083E0008E420008AE0200083C0208008C425BF09E
67551+:1083F000104001318F90FDA0000219C28F8DFD9CAD
67552+:10840000A603000C8E4A000C24180001240400145A
67553+:10841000AE0A002C8E420010AE02001C965F0016C1
67554+:10842000A61F003C96590014A619003EADB8000CDA
67555+:10843000A5B80010A5B80012A5B80014A5B800167C
67556+:1084400012600144A2040011925100033232000272
67557+:108450002E5300018F920058266200080A0009621C
67558+:10846000AF8200688E4400043C1980003C068008FE
67559+:10847000AF2400208E45000890D80000240D005045
67560+:10848000331100FF122D009C2407008824060009E8
67561+:108490000E000845000000000A000A6A8F9200588A
67562+:1084A0008E5000043C0980003C118008AD30002053
67563+:1084B0009228000024050050310400FF10850110AF
67564+:1084C0002407008802002021000028210E00084512
67565+:1084D0002406000E922D00002418FF80020028219F
67566+:1084E00001B8802524040004240600300E0007256E
67567+:1084F000A23000000A000A6A8F9200588E500004D1
67568+:108500008F91FDA03C028000AC500020923F001BE8
67569+:1085100033F900101320006C240700810200202191
67570+:10852000000028212406001F0E000845000000005E
67571+:108530000A000A6A8F9200588E44001C0E00085DE3
67572+:1085400000000000104000E3004048218F880058E0
67573+:1085500024070089012020218D05001C240600012C
67574+:108560000E000845000000000A000A6A8F920058B9
67575+:10857000964900023C10080026105BE831280004F0
67576+:10858000110000973C0460008E4E001C3C0F8000E0
67577+:10859000ADEE00203C010800AC2E5BE896470002DF
67578+:1085A00030E40001148000E6000000008E42000468
67579+:1085B000AE0200083C1008008E105BF0120000ECC8
67580+:1085C0003C0F80008F92FD9C241000018E4E0018FD
67581+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
67582+:1085E000A2400005AE50000C3C0808008D085BF06E
67583+:1085F0008F840058A6500010000839C2A6500012FF
67584+:10860000A6500014A6500016A5A7000C8C8C0008DC
67585+:108610008F8B00588F8A0058ADAC002C8D63000CF6
67586+:1086200024070002ADA3001C91460010A1A6001172
67587+:108630008F82005890450011A3E500088F990058DB
67588+:1086400093380012A258004E8F910058922F0013B9
67589+:10865000A1AF00128F920058964E0014A5AE003CB8
67590+:1086600096490016A5A9003E8E480018ADA8001432
67591+:108670005660FD6AAF8700683C05080024A55BE8EA
67592+:108680000E000881000020218F9200580000382140
67593+:108690000A000962AF8700683C05080024A55BE872
67594+:1086A0000E0008A4240400828F9200580A000A4D8C
67595+:1086B000000038210E000F6C000000008F9200585F
67596+:1086C0000A000AC0000020210E00087202002021CA
67597+:1086D0009223001B02002021346A00100E00087C47
67598+:1086E000A22A001B000038210200202100002821BE
67599+:1086F0000A000BA52406001F9242000C305F000107
67600+:1087000013E0000300000000964A000EA4CA002CEB
67601+:10871000924B000C316300025060000600003821CB
67602+:108720008E470014964C0012ACC7001CA4CC001A53
67603+:10873000000038210A000B7F240600093C050800D0
67604+:1087400024A55BE80E0008A42404008B8F92005837
67605+:108750000A000A4D0013382B3C0C08008D8C5BE896
67606+:1087600024DFFFFE25930100326B007F016790211B
67607+:1087700002638824AD110028AE4600E0AE4000E45C
67608+:108780000A0009B3AE5F001CACC000543C0D0800E9
67609+:108790008DAD5BE83C18800C37090100ACED00287A
67610+:1087A0008E510014AD3100E08E4F0014AD2F00E467
67611+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
67612+:1087C0005491FDD6240740000A000A222407100015
67613+:1087D0000E00092D000000000A000A6A8F9200585E
67614+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
67615+:1087F000AC205BE810710062000000003C196C6264
67616+:1088000037387970147800082404000297850074C2
67617+:108810009782006C2404009200A2F82B13E0001948
67618+:1088200002002821240400020E00069524050200FF
67619+:108830003C068000ACC200203C010800AC225BE892
67620+:108840001040000D8F8C0058240A002824040003D7
67621+:10885000918B0010316300FF546A00012404000171
67622+:108860000E0000810000000010400004240400837A
67623+:108870000A000BC28F920058240400833C050800B4
67624+:1088800024A55BE80E000881000000008F920058CC
67625+:108890000013382B0A000962AF8700680A000B49F1
67626+:1088A000240200128E4400080E00085D0000000043
67627+:1088B0000A000B55AE0200083C05080024A55BE841
67628+:1088C0000E000858240400878F9200580A000B728B
67629+:1088D0000013102B240400040E000695240500301C
67630+:1088E0001440002A004048218F8800582407008344
67631+:1088F000012020218D05001C0A000BB32406000175
67632+:108900008F8300788F8600701066FEEE000038219D
67633+:108910003C07080024E75B6C000320C00087282187
67634+:108920008CAE000011D0005D246F000131E3000F18
67635+:108930005466FFFA000320C00A000B8C00003821A7
67636+:108940008E4400040E00085D000000000A000BC801
67637+:10895000AE0200083C05080024A55BE80E0008A450
67638+:10896000240400828F9200580A000B72000010212C
67639+:108970003C05080024A55BE80A000C7C2404008761
67640+:108980008C83442C0A000C5B3C196C628F88005865
67641+:108990003C0780083C0C8000240B0050240A000196
67642+:1089A000AD820020A0EB0000A0EA000191030004CA
67643+:1089B000A0E3001891040005A0E400199106000648
67644+:1089C0003C04080024845B6CA0E6001A91020007B6
67645+:1089D0003C06080024C65B68A0E2001B9105000865
67646+:1089E000A0E5001C911F0009A0FF001D9119000ABD
67647+:1089F000A0F9001E9118000BA0F8001F9112000CA6
67648+:108A0000A0F200209111000DA0F100219110000EA4
67649+:108A1000A0F00022910F000FA0EF0023910E001094
67650+:108A2000A0EE0024910D0011A0ED0025950C00147E
67651+:108A3000A4EC0028950B00168F8A00708F920078A6
67652+:108A4000A4EB002A95030018000A10C02545000178
67653+:108A5000A4E3002C8D1F001C0044C0210046C82147
67654+:108A600030A5000FAF3F0000AF09000010B20006B4
67655+:108A7000AF850070000038218D05001C01202021E9
67656+:108A80000A000BB32406000124AD000131A7000F3A
67657+:108A9000AF8700780A000CF9000038213C06080076
67658+:108AA00024C65B680086902100003821ACA000003D
67659+:108AB0000A000B8CAE4000003C0482013C036000C5
67660+:108AC00034820E02AC603D68AF80009803E000087D
67661+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
67662+:108AE000001018422C620041AFBF00141440000275
67663+:108AF00024040080240300403C010800AC300060E6
67664+:108B00003C010800AC2300640E000F7500602821B2
67665+:108B1000244802BF2409FF8001092824001039805D
67666+:108B2000001030408FBF00148FB0001000A720212C
67667+:108B300000861821AF8300803C010800AC25005856
67668+:108B40003C010800AC24005C03E0000827BD0018CD
67669+:108B5000308300FF30C6FFFF30E400FF3C08800098
67670+:108B60008D0201B80440FFFE000354000144382583
67671+:108B70003C09600000E920253C031000AD050180A0
67672+:108B8000AD060184AD04018803E00008AD0301B81F
67673+:108B90008F8500583C0A6012354800108CAC0004E8
67674+:108BA0003C0D600E35A60010318B00062D690001CA
67675+:108BB000AD0900C48CA70004ACC731808CA20008AA
67676+:108BC00094A40002ACC231848CA3001C0460000396
67677+:108BD000A784009003E00008000000008CAF00189C
67678+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
67679+:108BF0008F8500588F87FF288F86FF308CAE00044A
67680+:108C00003C0F601235E80010ACEE00788CAD000827
67681+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
67682+:108C2000ACCB004894CA00543C0208008C4200447B
67683+:108C300025490001A4C9005494C400543083FFFFA7
67684+:108C400010620017000000003C0208008C42004047
67685+:108C5000A4C200528CA30018ACE300308CA2001414
67686+:108C6000ACE2002C8CB90018ACF900388CB80014B8
67687+:108C700024050001ACF800348D0600BC50C5001975
67688+:108C80008D0200B48D0200B8A4E2004894E40048CC
67689+:108C9000A4E4004A94E800EA03E000083102FFFF80
67690+:108CA0003C0208008C420024A4C00054A4C200521C
67691+:108CB0008CA30018ACE300308CA20014ACE2002CB2
67692+:108CC0008CB90018ACF900388CB8001424050001E8
67693+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
67694+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
67695+:108CF00094E800EA03E000083102FFFF8F86005885
67696+:108D00003C0480008CC900088CC80008000929C0F8
67697+:108D1000000839C0AC87002090C30007306200040F
67698+:108D20001040003EAF85009490CB0007316A0008E8
67699+:108D30001140003D8F87FF2C8CCD000C8CCE001491
67700+:108D400001AE602B11800036000000008CC2000CC8
67701+:108D5000ACE200708CCB00188F85FF288F88FF3025
67702+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
67703+:108D70008CC9000CAD0900608CC4001CACA400D0F0
67704+:108D800090E3007C0062C824A0F9007C90D8000722
67705+:108D9000330F000811E000040000000090ED007C9B
67706+:108DA00035AC0001A0EC007C90CF000731EE000153
67707+:108DB00011C000060000000090E3007C241800347D
67708+:108DC00034790002A0F9007CACB800DC90C2000746
67709+:108DD0003046000210C000040000000090E8007C53
67710+:108DE00035040004A0E4007C90ED007D3C0B600E97
67711+:108DF000356A001031AC003FA0EC007D8D4931D4C4
67712+:108E00003127000110E00002240E0001A0AE00098D
67713+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
67714+:108E20000A000DAF8CC200140A000DB0ACE0007057
67715+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
67716+:108E4000AFB00010AFBF0020AFB10014918F00157C
67717+:108E50003C13600E3673001031EB000FA38B009CA7
67718+:108E60008D8F00048D8B0008959F0012959900103E
67719+:108E70009584001A9598001E958E001C33EDFFFF17
67720+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
67721+:108E90003C010800AC2D00243C010800AC29004432
67722+:108EA0003C010800AC2A0040AE683178AE67317CE6
67723+:108EB00091850015959100163C12601236520010F3
67724+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
67725+:108ED00091830014959F0018240600010066C804C1
67726+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
67727+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
67728+:108F0000918A00159584000E3C07600A314900FFE4
67729+:108F1000AF8B00883084FFFFAE4900C835110010C8
67730+:108F20000E000D1034F004103C0208008C4200606A
67731+:108F30003C0308008C6300643C0608008CC60058A3
67732+:108F40003C0508008CA5005C8F8400808FBF00204A
67733+:108F5000AE23004CAE65319CAE030054AE4500DC40
67734+:108F6000AE6231A0AE6331A4AE663198AE22004845
67735+:108F70008FB3001CAE0200508FB10014AE4200E06F
67736+:108F8000AE4300E4AE4600D88FB000108FB2001898
67737+:108F90000A00057D27BD0028978500929783007CF5
67738+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
67739+:108FB000240400058F900058104000552409000239
67740+:108FC0000E0006958F850080AF8200942404000374
67741+:108FD0001040004F240900023C0680000E00008172
67742+:108FE000ACC2002024070001240820001040004DDE
67743+:108FF00024040005978E00928F8AFF2C24090050CC
67744+:1090000025C50001A7850092A14900003C0D08007C
67745+:109010008DAD0064240380008F84FF28000D66005E
67746+:10902000AD4C0018A5400006954B000A8F85FF3017
67747+:109030002402FF8001633024A546000A915F000AE4
67748+:109040000000482103E2C825A159000AA0A0000899
67749+:10905000A140004CA08000D5961800029783009094
67750+:109060003C020004A49800EA960F00022418FFBFF7
67751+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
67752+:109080008E0C0008ACAC0040A4A00050A4A000547A
67753+:109090008E0B000C240C0030AC8B00288E060010C8
67754+:1090A000AC860024A480003EA487004EA487005014
67755+:1090B000A483003CAD420074AC8800D8ACA800602A
67756+:1090C000A08700FC909F00D433F9007FA09900D4C2
67757+:1090D000909000D402187824A08F00D4914E007C88
67758+:1090E00035CD0001A14D007C938B009CAD480070F4
67759+:1090F000AC8C00DCA08B00D68F8800888F87008422
67760+:10910000AC8800C4AC8700C8A5400078A540007AB0
67761+:109110008FBF00148FB000100120102103E0000861
67762+:1091200027BD00188F8500940E0007258F860080CC
67763+:109130000A000E9F2409000227BDFFE0AFB0001017
67764+:109140008F900058AFB10014AFBF00188E09000413
67765+:109150000E00054A000921C08E0800048F84FF28F4
67766+:109160008F82FF30000839C03C068000ACC7002069
67767+:10917000948500EA904300131460001C30B1FFFF97
67768+:109180008F8CFF2C918B0008316A00401540000B3A
67769+:10919000000000008E0D0004022030218FBF001857
67770+:1091A0008FB100148FB00010240400220000382179
67771+:1091B000000D29C00A000D2F27BD00200E000098C9
67772+:1091C000000000008E0D0004022030218FBF001827
67773+:1091D0008FB100148FB00010240400220000382149
67774+:1091E000000D29C00A000D2F27BD00200E000090A1
67775+:1091F000000000008E0D0004022030218FBF0018F7
67776+:109200008FB100148FB00010240400220000382118
67777+:10921000000D29C00A000D2F27BD002027BDFFE04B
67778+:10922000AFB200183092FFFFAFB00010AFBF001C0C
67779+:10923000AFB100141240001E000080218F8600583C
67780+:109240008CC500002403000600053F02000514023F
67781+:1092500030E4000714830016304500FF2CA80006F8
67782+:1092600011000040000558803C0C0800258C58BCBB
67783+:10927000016C50218D490000012000080000000011
67784+:109280008F8E0098240D000111CD005024020002A1
67785+:10929000AF820098260900013130FFFF24C800206A
67786+:1092A0000212202B010030211480FFE5AF88005806
67787+:1092B000020010218FBF001C8FB200188FB1001464
67788+:1092C0008FB0001003E0000827BD00209387007EC8
67789+:1092D00054E00034000030210E000DE700000000D3
67790+:1092E0008F8600580A000EFF240200018F87009825
67791+:1092F0002405000210E50031240400130000282199
67792+:1093000000003021240700010E000D2F0000000096
67793+:109310000A000F008F8600588F83009824020002F5
67794+:109320001462FFF6240400120E000D9A00000000E3
67795+:109330008F85009400403021240400120E000D2F70
67796+:10934000000038210A000F008F8600588F83009894
67797+:109350002411000310710029241F0002107FFFCE8A
67798+:1093600026090001240400100000282100003021FB
67799+:109370000A000F1D240700018F91009824060002A7
67800+:109380001626FFF9240400100E000E410000000014
67801+:10939000144000238F9800588F8600580A000EFF53
67802+:1093A00024020003240400140E000D2F00002821C5
67803+:1093B0008F8600580A000EFF240200020E000EA93C
67804+:1093C000000000000A000F008F8600580E000D3FBD
67805+:1093D00000000000241900022404001400002821C9
67806+:1093E0000000302100003821AF9900980E000D2FA9
67807+:1093F000000000000A000F008F8600580E000D5775
67808+:10940000000000008F8500942419000200403021E4
67809+:1094100024040010000038210A000F56AF9900986C
67810+:109420000040382124040010970F0002000028217A
67811+:109430000E000D2F31E6FFFF8F8600580A000F0047
67812+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
67813+:109450008C8500182402000100A61824AC83001893
67814+:1094600003E00008A08200053084FFFF30A5FFFF65
67815+:109470001080000700001821308200011040000217
67816+:1094800000042042006518211480FFFB00052840DD
67817+:1094900003E000080060102110C000070000000079
67818+:1094A0008CA2000024C6FFFF24A50004AC820000AB
67819+:1094B00014C0FFFB2484000403E000080000000047
67820+:1094C00010A0000824A3FFFFAC86000000000000ED
67821+:1094D000000000002402FFFF2463FFFF1462FFFA74
67822+:1094E0002484000403E0000800000000000411C010
67823+:1094F00003E000082442024027BDFFE8AFB000109F
67824+:1095000000808021AFBF00140E000F9600A0202124
67825+:1095100000504821240AFF808FBF00148FB0001034
67826+:10952000012A30243127007F3C08800A3C042100B6
67827+:1095300000E8102100C428253C03800027BD001846
67828+:10954000AC650024AF820038AC400000AC6500245C
67829+:1095500003E00008AC4000403C0D08008DAD005811
67830+:1095600000056180240AFF8001A45821016C482174
67831+:10957000012A30243127007F3C08800C3C04210064
67832+:1095800000E8102100C428253C038000AC650028B9
67833+:10959000AF82003403E00008AC40002430A5FFFF98
67834+:1095A0003C0680008CC201B80440FFFE3C086015F8
67835+:1095B00000A838253C031000ACC40180ACC0018475
67836+:1095C000ACC7018803E00008ACC301B83C0D08003B
67837+:1095D0008DAD005800056180240AFF8001A4582148
67838+:1095E000016C4021010A4824000931403107007F05
67839+:1095F00000C728253C04200000A418253C02800058
67840+:10960000AC43083003E00008AF80003427BDFFE81A
67841+:10961000AFB0001000808021AFBF00140E000F9685
67842+:1096200000A0202100504821240BFF80012B502452
67843+:10963000000A39403128007F3C0620008FBF00140B
67844+:109640008FB0001000E8282534C2000100A21825C0
67845+:109650003C04800027BD0018AC83083003E00008FC
67846+:10966000AF8000383C0580088CA700603C0680086D
67847+:109670000087102B144000112C8340008CA8006040
67848+:109680002D0340001060000F240340008CC90060CF
67849+:109690000089282B14A00002008018218CC30060D0
67850+:1096A00000035A42000B30803C0A0800254A59202A
67851+:1096B00000CA202103E000088C8200001460FFF340
67852+:1096C0002403400000035A42000B30803C0A08008B
67853+:1096D000254A592000CA202103E000088C8200009E
67854+:1096E0003C05800890A60008938400AB24C20001CA
67855+:1096F000304200FF3043007F1064000C0002382726
67856+:10970000A0A200083C0480008C85017804A0FFFE24
67857+:109710008F8A00A0240900023C081000AC8A014096
67858+:10972000A089014403E00008AC8801780A00101BFE
67859+:1097300030E2008027BDFFD8AFB200188F9200A49E
67860+:10974000AFBF0020AFB3001CAFB00010AFB100142A
67861+:109750008F9300348E5900283C1000803C0EFFEFA0
67862+:10976000AE7900008E580024A260000A35CDFFFFBC
67863+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
67864+:10978000A271000C8E6F000C3C080040A271000B0F
67865+:1097900001F06025018D4824012A382400E8302595
67866+:1097A000AE66000C8E450004AE6000183C0400FF5D
67867+:1097B000AE6500148E43002C3482FFFFA6600008C3
67868+:1097C0000062F824AE7F00108E5900088F9000A030
67869+:1097D000964E0012AE7900208E51000C31D83FFF1A
67870+:1097E00000187980AE7100248E4D001401F06021C4
67871+:1097F00031CB0001AE6D00288E4A0018000C41C22A
67872+:10980000000B4B80AE6A002C8E46001C01093821EB
67873+:10981000A667001CAE660030964500028E4400200C
67874+:10982000A665001EAE64003492430033306200042B
67875+:1098300054400006924700003C0280083443010077
67876+:109840008C7F00D0AE7F0030924700008F860038BA
67877+:10985000A0C700309245003330A4000250800007BA
67878+:10986000925100018F880038240BFF80910A00304C
67879+:10987000014B4825A1090030925100018F9000381A
67880+:10988000240CFFBF2404FFDFA21100318F8D0038AC
67881+:109890003C1880083711008091AF003C31EE007F0A
67882+:1098A000A1AE003C8F890038912B003C016C502404
67883+:1098B000A12A003C8F9F00388E68001493E6003C7C
67884+:1098C0002D0700010007114000C4282400A218251C
67885+:1098D000A3E3003C8F87003896590012A4F90032A8
67886+:1098E0008E450004922E007C30B0000300107823D7
67887+:1098F00031ED000300AD102131CC000215800002D3
67888+:1099000024460034244600303C0280083443008062
67889+:10991000907F007C00BFC824333800041700000289
67890+:1099200024C2000400C010218F98003824190002BE
67891+:10993000ACE20034A3190000924F003F8F8E003834
67892+:109940003C0C8008358B0080A1CF00018F9100383E
67893+:10995000924D003F8E440004A62D0002956A005CE3
67894+:109960000E000FF43150FFFF00024B800209382532
67895+:109970003C08420000E82825AE2500048E4400384B
67896+:109980008F850038ACA400188E460034ACA6001CAD
67897+:10999000ACA0000CACA00010A4A00014A4A0001661
67898+:1099A000A4A00020A4A00022ACA000248E62001479
67899+:1099B00050400001240200018FBF00208FB3001C23
67900+:1099C0008FB200188FB100148FB00010ACA2000845
67901+:1099D0000A00101327BD002827BDFFC83C058008DA
67902+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
67903+:1099F000AFB60028AFB50024AFB40020AFB3001C51
67904+:109A0000AFB20018AFB10014AFB00010948300786B
67905+:109A10009482007A104300512405FFFF0080F0215A
67906+:109A20000A0011230080B821108B004D8FBF003435
67907+:109A30008F8600A03C1808008F18005C2411FF805E
67908+:109A40003C1680000306782101F18024AED0002C62
67909+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
67910+:109A6000018D5021000B4840012AA82196A4000036
67911+:109A70003C0808008D0800582405FF8030953FFF02
67912+:109A800001061821001539800067C8210325F82434
67913+:109A90003C02010003E290253338007F3C11800C2A
67914+:109AA000AED20028031190219250000D320F000415
67915+:109AB00011E0003702E0982196E3007A96E8007AF8
67916+:109AC00096E5007A2404800031077FFF24E300013B
67917+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
67918+:109AE00096E6007A3C1408008E94006030D67FFF22
67919+:109AF00012D400C1000000008E5800188F8400A00E
67920+:109B000002A028212713FFFF0E000FCEAE53002C1A
67921+:109B100097D5007897D4007A12950010000028217C
67922+:109B20003C098008352401003C0A8008914800085F
67923+:109B3000908700D53114007F30E400FF0284302B81
67924+:109B400014C0FFB9268B0001938E00AB268C000158
67925+:109B5000008E682115ACFFB78F8600A08FBF003440
67926+:109B60008FBE00308FB7002C8FB600288FB5002431
67927+:109B70008FB400208FB3001C8FB200188FB1001477
67928+:109B80008FB0001000A0102103E0000827BD0038AE
67929+:109B900000C020210E000F99028028218E4B00105A
67930+:109BA0008E4C00308F84003824090002016C502351
67931+:109BB000AE4A0010A089000096E3005C8E4400309D
67932+:109BC0008F9100380E000FF43070FFFF00024380C9
67933+:109BD000020838253C02420000E22825AE25000498
67934+:109BE0008E5F00048F8A00388E590000240B000815
67935+:109BF000AD5F001CAD590018AD40000CAD40001029
67936+:109C00009246000A240400052408C00030D000FF5A
67937+:109C1000A550001496580008A55800169251000A45
67938+:109C20003C188008322F00FFA54F0020964E0008F8
67939+:109C300037110100A54E0022AD400024924D000BCB
67940+:109C400031AC00FFA54C0002A14B00018E49003051
67941+:109C50008F830038240BFFBFAC690008A06400307C
67942+:109C60008F9000382403FFDF9607003200E8282495
67943+:109C700000B51025A6020032921F003233F9003FD2
67944+:109C800037260040A20600328F8C0038AD800034A9
67945+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
67946+:109CA00031CD007FA18D003C8F84003835EEFFFF61
67947+:109CB000908A003C014B4824A089003C8F850038E5
67948+:109CC00090A8003C01033824A0A7003C8E42003439
67949+:109CD0008F9100383C038008AE2200408E59002C42
67950+:109CE0008E5F0030033F3023AE26004492300048A0
67951+:109CF0003218007FA23800488F8800388E4D00301F
67952+:109D00008D0C004801AE582401965024014B482583
67953+:109D1000AD0900489244000AA104004C964700088F
67954+:109D20008F850038A4A7004E8E5000308E4400303E
67955+:109D30000E0003818C65006092F9007C0002F940FE
67956+:109D4000004028210002110003E2302133360002D6
67957+:109D500012C00003020680210005B0800216802197
67958+:109D6000926D007C31B30004126000020005708027
67959+:109D7000020E80218E4B00308F8800382405800031
67960+:109D8000316A0003000A4823312400030204182129
67961+:109D9000AD03003496E4007A96F0007A96F1007AEA
67962+:109DA00032027FFF2447000130FF7FFF0225C824D5
67963+:109DB000033F3025A6E6007A96F8007A3C120800A8
67964+:109DC0008E520060330F7FFF11F200180000000078
67965+:109DD0008F8400A00E000FCE02A028218F8400A047
67966+:109DE0000E000FDE028028210E001013000000007C
67967+:109DF0000A00111F0000000096F1007A022480245E
67968+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
67969+:109E1000000E69C2000D6027000C51C03169007F3F
67970+:109E2000012A20250A001119A2E4007A96E6007A98
67971+:109E300000C5C024A6F8007A92EF007A92F3007A67
67972+:109E400031F200FF001271C2000E6827000DB1C090
67973+:109E5000326C007F01962825A2E5007A0A0011D015
67974+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
67975+:109E7000AC640018AC65001C03E000088C620014A0
67976+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
67977+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
67978+:109EA000AFB30044AFB20040AFB1003CAFB0003838
67979+:109EB00034C80100910500D590C700083084FFFF29
67980+:109EC00030A500FF30E2007F0045182AAFA4001043
67981+:109ED000A7A00018A7A0002610600055AFA000148E
67982+:109EE00090CA00083149007F00A9302324D3FFFF26
67983+:109EF0000013802B8FB400100014902B02128824C2
67984+:109F0000522000888FB300143C03800894790052DB
67985+:109F1000947E00508FB60010033EC0230018BC0092
67986+:109F2000001714030016FC0002C2A82A16A00002A3
67987+:109F3000001F2C030040282100133C0000072403CD
67988+:109F400000A4102A5440000100A020212885000907
67989+:109F500014A000020080A021241400083C0C8008FA
67990+:109F60008D860048001459808D88004C3C03800089
67991+:109F70003169FFFF3C0A0010012A202534710400DA
67992+:109F8000AC660038AF9100A4AC68003CAC64003013
67993+:109F900000000000000000000000000000000000C1
67994+:109FA00000000000000000000000000000000000B1
67995+:109FB0008C6E000031CD002011A0FFFD0014782A26
67996+:109FC00001F01024104000390000A8213C16800840
67997+:109FD00092D700083C1280008E44010032F6007FC8
67998+:109FE0000E000F9902C028218E3900108E44010006
67999+:109FF0000000902133373FFF0E000FB102E028210F
68000+:10A00000923800003302003F2C500008520000102C
68001+:10A0100000008821000210803C030800246358E4FB
68002+:10A020000043F8218FFE000003C00008000000007C
68003+:10A0300090CF0008938C00AB31EE007F00AE682318
68004+:10A04000018D58210A0012172573FFFF0000882197
68005+:10A050003C1E80008FC401000E000FCE02E02821BC
68006+:10A060008FC401000E000FDE02C028211220000F55
68007+:10A070000013802B8F8B00A426A400010004AC00E9
68008+:10A08000027298230015AC032578004002B4B02A70
68009+:10A090000013802B241700010300882102D0102414
68010+:10A0A000AF9800A41440FFC9AFB700143C07800864
68011+:10A0B00094E200508FAE00103C05800002A288217F
68012+:10A0C0003C060020A4F10050ACA6003094F40050EF
68013+:10A0D00094EF005201D51823306CFFFF11F4001EDD
68014+:10A0E000AFAC00108CEF004C001561808CF500487F
68015+:10A0F00001EC28210000202100AC582B02A4C02133
68016+:10A10000030BB021ACE5004CACF600488FB4001056
68017+:10A110000014902B021288241620FF7C3C03800838
68018+:10A120008FB300148FBF005C8FBE00583A620001ED
68019+:10A130008FB700548FB600508FB5004C8FB40048D5
68020+:10A140008FB300448FB200408FB1003C8FB0003815
68021+:10A1500003E0000827BD006094FE00548CF2004428
68022+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
68023+:10A170008CE800448CAD003C010D50231940003B9D
68024+:10A18000000000008CF7004026E20001ACA200387D
68025+:10A190003C05005034A700103C038000AC67003041
68026+:10A1A00000000000000000000000000000000000AF
68027+:10A1B000000000000000000000000000000000009F
68028+:10A1C0008C7800003316002012C0FFFD3C1180087F
68029+:10A1D000962200543C1580003C068008304E000159
68030+:10A1E000000E18C0007578218DEC04003C070800B3
68031+:10A1F0008CE700443C040020ACCC00488DF40404FF
68032+:10A20000240B0001ACD4004C10EB0260AEA4003073
68033+:10A21000963900523C0508008CA5004000B99021F9
68034+:10A22000A6320052963F005427ED0001A62D00549F
68035+:10A230009626005430C4FFFF5487FF2F8FB40010C0
68036+:10A2400030A5FFFF0E0011F4A62000543C070800C3
68037+:10A250008CE70024963E00520047B82303D74823DA
68038+:10A26000A62900520A0012198FB400108CE2004097
68039+:10A270000A0012BE00000000922400012407000121
68040+:10A280003085007F14A7001C97AD00268E2B00148C
68041+:10A29000240CC000316A3FFF01AC48243C06080092
68042+:10A2A0008CC60060012A402531043FFF0086882BC0
68043+:10A2B00012200011A7A800263C0508008CA5005814
68044+:10A2C0008F9100A0000439802402FF8000B1182182
68045+:10A2D0000067F82103E2F02433F8007F3C1280008D
68046+:10A2E0003C19800EAE5E002C0319702191D0000D38
68047+:10A2F000360F0004A1CF000D0E001028241200011B
68048+:10A30000241100013C1E80008FC401000E000FCEFE
68049+:10A3100002E028218FC401000E000FDE02C02821B8
68050+:10A320001620FF558F8B00A40A0012860013802B85
68051+:10A330008F8600A490C80001310400201080019194
68052+:10A34000241000013C048008348B0080916A007C5A
68053+:10A350008F9E0034AFA0002C314900011120000F66
68054+:10A36000AFB000288CCD00148C8E006001AE602B45
68055+:10A370001580000201A038218C8700603C188008FD
68056+:10A38000370300808C70007000F0782B15E000021D
68057+:10A3900000E020218C640070AFA4002C3C028008F7
68058+:10A3A000344500808CD200148CBF0070025FC82B33
68059+:10A3B00017200002024020218CA400708FA7002CDF
68060+:10A3C0000087182310600003AFA3003024050002AB
68061+:10A3D000AFA500288FA400280264882B162000BA9D
68062+:10A3E000000018218CD000388FCE000C3C0F00806C
68063+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
68064+:10A40000AFCD000490CA003F3586FFFF01662024CF
68065+:10A410003C0900203C08FFEFA3CA000B0089382547
68066+:10A420003511FFFF00F118243C0500088F8700A4B8
68067+:10A430000065C825AFD9000C8CE20014AFC000182D
68068+:10A440008FA60030AFC200148CF800188FB0002C1B
68069+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
68070+:10A4600003326824AFCF00248CEC000C020670216C
68071+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
68072+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
68073+:10A49000014B48230126402311000011AFC80010D2
68074+:10A4A00090EB003D8FC900048FC80000000B5100E5
68075+:10A4B000012A28210000102100AA882B010218215E
68076+:10A4C0000071F821AFC50004AFDF000090F2003D3D
68077+:10A4D000A3D2000A8F9900A497380006A7D80008D5
68078+:10A4E0008F910038240800023C038008A228000055
68079+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
68080+:10A500000E000FF48F9200380002CB808F8500A4DC
68081+:10A51000021978253C18420001F87025AE4E00045F
68082+:10A520008F8400388CAD0038AC8D00188CAC0034B2
68083+:10A53000AC8C001CAC80000CAC800010A48000141B
68084+:10A54000A4800016A4800020A4800022AC800024F7
68085+:10A5500090A6003F8FA7002CA486000250E0019235
68086+:10A56000240700018FA200305040000290A2003D5D
68087+:10A5700090A2003E244A0001A08A00018F84003886
68088+:10A580008FA9002CAC8900083C128008364D008051
68089+:10A5900091AC007C3186000214C000022407003414
68090+:10A5A000240700308F8500A43C198008373F0080C5
68091+:10A5B00090B0000093F9007C240E0004A0900030BD
68092+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
68093+:10A5D0003304000301C46023A1B200318F8E003820
68094+:10A5E0008F8600A42402C00095CA003294C90012CC
68095+:10A5F0008FAB002C0142402431233FFF010388250B
68096+:10A60000A5D1003291D000323185000300EBF82152
68097+:10A610003218003F370F0040A1CF00328FA4002C2A
68098+:10A6200003E5382133280004108000028F850038AC
68099+:10A6300000E838213C0A8008ACA700343549010005
68100+:10A640008D2800D08FA3002C2419FFBFACA80038A0
68101+:10A6500090B1003C2C640001240FFFDF3227007F03
68102+:10A66000A0A7003C8F98003800049140931F003C45
68103+:10A6700003F98024A310003C8F8C0038918E003C9D
68104+:10A6800001CF682401B23025A186003C8F8900A447
68105+:10A690008F8800388D2B0020AD0B00408D220024C8
68106+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
68107+:10A6B0000E001013AD03004C8FB1002824070002D8
68108+:10A6C000122700118FA300280003282B00058023E8
68109+:10A6D0000270982400608021006090210A00126FAF
68110+:10A6E0000010882B962900128F8400A00000902172
68111+:10A6F0003125FFFFA7A900180E000FC22411000189
68112+:10A700000A00131D3C1E80003C0B80003C12800898
68113+:10A710008D640100924900088F92FF340E000F995A
68114+:10A720003125007F8F9900388FA700288FA4003033
68115+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
68116+:10A740008F91003800026B80020D80253C0842008A
68117+:10A750008F8D00A402085025AE2A00048DA5003874
68118+:10A760008F8A003800007821000F1100AD450018D5
68119+:10A770008DB800343C047FFF3488FFFFAD58001CC7
68120+:10A7800091A6003E8D4C001C8D4900180006190052
68121+:10A79000000677020183C821004E58250323882B29
68122+:10A7A000012B382100F1F821AD59001CAD5F0018D4
68123+:10A7B000AD40000CAD40001091B0003E8FA40030C1
68124+:10A7C00024090005A550001495A500042419C00013
68125+:10A7D00000884024A545001691B8003EA5580020E9
68126+:10A7E00095AF0004A54F0022AD40002491AE003F7C
68127+:10A7F000A54E000291A6003E91AC003D01861023BB
68128+:10A80000244B0001A14B00018F9100388FA3003031
68129+:10A810003C028008344B0100AE230008A22900301E
68130+:10A820008F8C00388F8700A4959F003294F000121F
68131+:10A830002407FFBF033FC02432053FFF03057825EF
68132+:10A84000A58F0032918E00322418FFDF31CD003FFA
68133+:10A8500035A60040A18600328F910038240DFFFFFD
68134+:10A86000240CFF80AE2000348D6A00D0AE2A003860
68135+:10A870009223003C3069007FA229003C8F90003871
68136+:10A880003C0380009219003C0327F824A21F003CDF
68137+:10A890008F8E003891C5003C00B87824A1CF003CD1
68138+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
68139+:10A8B000AD46004491420048004C5825A14B004849
68140+:10A8C0008F9000388F9900A48E09004801238824B6
68141+:10A8D00002283825AE070048933F003EA21F004CD7
68142+:10A8E0008F9800A48F8F003897050004A5E5004ECF
68143+:10A8F0000E0003818DC500609246007C8FAC003055
68144+:10A9000000026940000291000040282130CB000283
68145+:10A9100001B21021156000AA018230213C0E80088E
68146+:10A9200035C20080904C007C31830004106000032D
68147+:10A930008FB900300005788000CF3021241F00043B
68148+:10A940008F910038332D000303ED8023320800037C
68149+:10A9500000C85021AE2A00343C188000A7C500383A
68150+:10A960003C0680088F04010090DE00080E000FDE18
68151+:10A9700033C5007F0E001013000000000A00140D04
68152+:10A980008FA300288F9800348CC90038241F00033F
68153+:10A99000A7000008AF0900008CC50034A300000A1E
68154+:10A9A0008F9900A4AF0500043C080080932D003F60
68155+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
68156+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
68157+:10A9D00003D170243646FFFF01C61824AF03000CD4
68158+:10A9E0008F2C0014972900128F8400A0AF0C001048
68159+:10A9F0008F2F0014AF000018AF000020AF0F00141D
68160+:10AA0000AF0000248F270018312F3FFF000F59801F
68161+:10AA1000AF0700288F2500080164F821312D0001BF
68162+:10AA2000AF0500308F31000C8F920038001F51C2EB
68163+:10AA3000000D438001481021241E00023C068008BE
68164+:10AA4000A702001CA7000034AF11002CA25E00007A
68165+:10AA500034D20080964E005C8F9900383C0342004F
68166+:10AA600031CCFFFF01833825AF2700048F8B00A472
68167+:10AA7000240500012402C0008D640038240700343E
68168+:10AA8000AF2400188D690034AF29001CAF20000CE2
68169+:10AA9000AF200010A7200014A7200016A720002038
68170+:10AAA000A7200022AF200024A7300002A325000128
68171+:10AAB0008F8800388F9F00A4AD10000893ED000030
68172+:10AAC000A10D00308F8A00A48F98003891510001A9
68173+:10AAD000A31100318F8B0038957E003203C27024A1
68174+:10AAE00001CF6025A56C0032916300323064003FD5
68175+:10AAF000A16400329249007C3125000214A00002BA
68176+:10AB00008F840038240700303C198008AC8700345B
68177+:10AB1000373201008E5F00D0240AFFBF020090216F
68178+:10AB2000AC9F0038908D003C31A8007FA088003C8D
68179+:10AB30008F9E003893C2003C004A8824A3D1003C79
68180+:10AB40008F8300380010882B9066003C34CE0020A4
68181+:10AB5000A06E003C8F8400A48F9800388C8C00205D
68182+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
68183+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
68184+:10AB80003C1E80000A0012700000000094C80052B1
68185+:10AB90003C0A08008D4A002401488821A4D10052B3
68186+:10ABA0000A0012198FB40010A08700018F840038AA
68187+:10ABB000240B0001AC8B00080A0013BE3C12800875
68188+:10ABC000000520800A0014A200C4302127BDFFE048
68189+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
68190+:10ABE000AFB1001435B200808E4C001835A80100BA
68191+:10ABF000964B000695A70050910900FC000C5602E8
68192+:10AC0000016728233143007F312600FF240200031F
68193+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
68194+:10AC2000910600FC2412000530C200FF10520033D0
68195+:10AC300000000000160000098FBF001C8FB2001832
68196+:10AC40008FB100148FB00010240D0C003C0C80005C
68197+:10AC500027BD002003E00008AD8D00240E0011FB8D
68198+:10AC6000020020218FBF001C8FB200188FB100148A
68199+:10AC70008FB00010240D0C003C0C800027BD00207C
68200+:10AC800003E00008AD8D0024965800789651007AB4
68201+:10AC9000924E007D0238782631E8FFFF31C400C0B3
68202+:10ACA000148000092D11000116000037000000007B
68203+:10ACB0005620FFE28FBF001C0E0010D100000000E4
68204+:10ACC0000A00156A8FBF001C1620FFDA0000000082
68205+:10ACD0000E0010D1000000001440FFD88FBF001CF0
68206+:10ACE0001600002200000000925F007D33E2003F6A
68207+:10ACF000A242007D0A00156A8FBF001C950900EA78
68208+:10AD00008F86008000802821240400050E0007257E
68209+:10AD10003130FFFF978300923C0480002465FFFFE1
68210+:10AD2000A78500928C8A01B80540FFFE0000000054
68211+:10AD3000AC8001808FBF001CAC9001848FB20018E2
68212+:10AD40008FB100148FB000103C0760133C0B100053
68213+:10AD5000240D0C003C0C800027BD0020AC8701882E
68214+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
68215+:10AD7000020020215040FFB18FBF001C925F007D78
68216+:10AD80000A00159733E2003F0E0011FB020020215C
68217+:10AD90001440FFAA8FBF001C122000070000000013
68218+:10ADA0009259007D3330003F36020040A242007DC0
68219+:10ADB0000A00156A8FBF001C0E0010D100000000B1
68220+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
68221+:10ADD0000A0015C636020040000000000000001BFB
68222+:10ADE0000000000F0000000A00000008000000063C
68223+:10ADF0000000000500000005000000040000000441
68224+:10AE00000000000300000003000000030000000336
68225+:10AE10000000000300000002000000020000000229
68226+:10AE2000000000020000000200000002000000021A
68227+:10AE3000000000020000000200000002000000020A
68228+:10AE400000000002000000020000000200000002FA
68229+:10AE50000000000100000001000000018008010066
68230+:10AE6000800800808008000000000C000000308096
68231+:10AE7000080011D00800127C08001294080012A8E3
68232+:10AE8000080012BC080011D0080011D0080012F010
68233+:10AE90000800132C080013400800138808001A8CBF
68234+:10AEA00008001A8C08001AC408001AC408001AD82E
68235+:10AEB00008001AA808001D0008001CCC08001D5836
68236+:10AEC00008001D5808001DE008001D108008024001
68237+:10AED000080027340800256C0800275C080027F4C8
68238+:10AEE0000800293C0800298808002AAC080029B479
68239+:10AEF00008002A38080025DC08002EDC08002EA4F3
68240+:10AF000008002588080025880800258808002B20CF
68241+:10AF100008002B20080025880800258808002DD06F
68242+:10AF2000080025880800258808002588080025884D
68243+:10AF300008002E0C080025880800258808002588B0
68244+:10AF4000080025880800258808002588080025882D
68245+:10AF5000080025880800258808002588080025881D
68246+:10AF6000080025880800258808002588080029A8E9
68247+:10AF7000080025880800258808002E680800258814
68248+:10AF800008002588080025880800258808002588ED
68249+:10AF900008002588080025880800258808002588DD
68250+:10AFA00008002588080025880800258808002588CD
68251+:10AFB00008002588080025880800258808002588BD
68252+:10AFC00008002CF4080025880800258808002C6853
68253+:10AFD00008002BC408003CE408003CB808003C848E
68254+:10AFE00008003C5808003C3808003BEC8008010091
68255+:10AFF00080080080800800008008008008004C6401
68256+:10B0000008004C9C08004BE408004C6408004C64A9
68257+:10B01000080049B808004C64080050500A000C842D
68258+:10B0200000000000000000000000000D7278703683
68259+:10B030002E322E31620000000602010300000000E3
68260+:10B0400000000001000000000000000000000000FF
68261+:10B0500000000000000000000000000000000000F0
68262+:10B0600000000000000000000000000000000000E0
68263+:10B0700000000000000000000000000000000000D0
68264+:10B0800000000000000000000000000000000000C0
68265+:10B0900000000000000000000000000000000000B0
68266+:10B0A00000000000000000000000000000000000A0
68267+:10B0B0000000000000000000000000000000000090
68268+:10B0C0000000000000000000000000000000000080
68269+:10B0D0000000000000000000000000000000000070
68270+:10B0E0000000000000000000000000000000000060
68271+:10B0F0000000000000000000000000000000000050
68272+:10B10000000000000000000000000000000000003F
68273+:10B11000000000000000000000000000000000002F
68274+:10B12000000000000000000000000000000000001F
68275+:10B13000000000000000000000000000000000000F
68276+:10B1400000000000000000000000000000000000FF
68277+:10B1500000000000000000000000000000000000EF
68278+:10B1600000000000000000000000000000000000DF
68279+:10B1700000000000000000000000000000000000CF
68280+:10B1800000000000000000000000000000000000BF
68281+:10B1900000000000000000000000000000000000AF
68282+:10B1A000000000000000000000000000000000009F
68283+:10B1B000000000000000000000000000000000008F
68284+:10B1C000000000000000000000000000000000007F
68285+:10B1D000000000000000000000000000000000006F
68286+:10B1E000000000000000000000000000000000005F
68287+:10B1F000000000000000000000000000000000004F
68288+:10B20000000000000000000000000000000000003E
68289+:10B21000000000000000000000000000000000002E
68290+:10B22000000000000000000000000000000000001E
68291+:10B23000000000000000000000000000000000000E
68292+:10B2400000000000000000000000000000000000FE
68293+:10B2500000000000000000000000000000000000EE
68294+:10B2600000000000000000000000000000000000DE
68295+:10B2700000000000000000000000000000000000CE
68296+:10B2800000000000000000000000000000000000BE
68297+:10B2900000000000000000000000000000000000AE
68298+:10B2A000000000000000000000000000000000009E
68299+:10B2B000000000000000000000000000000000008E
68300+:10B2C000000000000000000000000000000000007E
68301+:10B2D000000000000000000000000000000000006E
68302+:10B2E000000000000000000000000000000000005E
68303+:10B2F000000000000000000000000000000000004E
68304+:10B30000000000000000000000000000000000003D
68305+:10B31000000000000000000000000000000000002D
68306+:10B32000000000000000000000000000000000001D
68307+:10B33000000000000000000000000000000000000D
68308+:10B3400000000000000000000000000000000000FD
68309+:10B3500000000000000000000000000000000000ED
68310+:10B3600000000000000000000000000000000000DD
68311+:10B3700000000000000000000000000000000000CD
68312+:10B3800000000000000000000000000000000000BD
68313+:10B3900000000000000000000000000000000000AD
68314+:10B3A000000000000000000000000000000000009D
68315+:10B3B000000000000000000000000000000000008D
68316+:10B3C000000000000000000000000000000000007D
68317+:10B3D000000000000000000000000000000000006D
68318+:10B3E000000000000000000000000000000000005D
68319+:10B3F000000000000000000000000000000000004D
68320+:10B40000000000000000000000000000000000003C
68321+:10B41000000000000000000000000000000000002C
68322+:10B42000000000000000000000000000000000001C
68323+:10B43000000000000000000000000000000000000C
68324+:10B4400000000000000000000000000000000000FC
68325+:10B4500000000000000000000000000000000000EC
68326+:10B4600000000000000000000000000000000000DC
68327+:10B4700000000000000000000000000000000000CC
68328+:10B4800000000000000000000000000000000000BC
68329+:10B4900000000000000000000000000000000000AC
68330+:10B4A000000000000000000000000000000000009C
68331+:10B4B000000000000000000000000000000000008C
68332+:10B4C000000000000000000000000000000000007C
68333+:10B4D000000000000000000000000000000000006C
68334+:10B4E000000000000000000000000000000000005C
68335+:10B4F000000000000000000000000000000000004C
68336+:10B50000000000000000000000000000000000003B
68337+:10B51000000000000000000000000000000000002B
68338+:10B52000000000000000000000000000000000001B
68339+:10B53000000000000000000000000000000000000B
68340+:10B5400000000000000000000000000000000000FB
68341+:10B5500000000000000000000000000000000000EB
68342+:10B5600000000000000000000000000000000000DB
68343+:10B5700000000000000000000000000000000000CB
68344+:10B5800000000000000000000000000000000000BB
68345+:10B5900000000000000000000000000000000000AB
68346+:10B5A000000000000000000000000000000000009B
68347+:10B5B000000000000000000000000000000000008B
68348+:10B5C000000000000000000000000000000000007B
68349+:10B5D000000000000000000000000000000000006B
68350+:10B5E000000000000000000000000000000000005B
68351+:10B5F000000000000000000000000000000000004B
68352+:10B60000000000000000000000000000000000003A
68353+:10B61000000000000000000000000000000000002A
68354+:10B62000000000000000000000000000000000001A
68355+:10B63000000000000000000000000000000000000A
68356+:10B6400000000000000000000000000000000000FA
68357+:10B6500000000000000000000000000000000000EA
68358+:10B6600000000000000000000000000000000000DA
68359+:10B6700000000000000000000000000000000000CA
68360+:10B6800000000000000000000000000000000000BA
68361+:10B6900000000000000000000000000000000000AA
68362+:10B6A000000000000000000000000000000000009A
68363+:10B6B000000000000000000000000000000000008A
68364+:10B6C000000000000000000000000000000000007A
68365+:10B6D000000000000000000000000000000000006A
68366+:10B6E000000000000000000000000000000000005A
68367+:10B6F000000000000000000000000000000000004A
68368+:10B700000000000000000000000000000000000039
68369+:10B710000000000000000000000000000000000029
68370+:10B720000000000000000000000000000000000019
68371+:10B730000000000000000000000000000000000009
68372+:10B7400000000000000000000000000000000000F9
68373+:10B7500000000000000000000000000000000000E9
68374+:10B7600000000000000000000000000000000000D9
68375+:10B7700000000000000000000000000000000000C9
68376+:10B7800000000000000000000000000000000000B9
68377+:10B7900000000000000000000000000000000000A9
68378+:10B7A0000000000000000000000000000000000099
68379+:10B7B0000000000000000000000000000000000089
68380+:10B7C0000000000000000000000000000000000079
68381+:10B7D0000000000000000000000000000000000069
68382+:10B7E0000000000000000000000000000000000059
68383+:10B7F0000000000000000000000000000000000049
68384+:10B800000000000000000000000000000000000038
68385+:10B810000000000000000000000000000000000028
68386+:10B820000000000000000000000000000000000018
68387+:10B830000000000000000000000000000000000008
68388+:10B8400000000000000000000000000000000000F8
68389+:10B8500000000000000000000000000000000000E8
68390+:10B8600000000000000000000000000000000000D8
68391+:10B8700000000000000000000000000000000000C8
68392+:10B8800000000000000000000000000000000000B8
68393+:10B8900000000000000000000000000000000000A8
68394+:10B8A0000000000000000000000000000000000098
68395+:10B8B0000000000000000000000000000000000088
68396+:10B8C0000000000000000000000000000000000078
68397+:10B8D0000000000000000000000000000000000068
68398+:10B8E0000000000000000000000000000000000058
68399+:10B8F0000000000000000000000000000000000048
68400+:10B900000000000000000000000000000000000037
68401+:10B910000000000000000000000000000000000027
68402+:10B920000000000000000000000000000000000017
68403+:10B930000000000000000000000000000000000007
68404+:10B9400000000000000000000000000000000000F7
68405+:10B9500000000000000000000000000000000000E7
68406+:10B9600000000000000000000000000000000000D7
68407+:10B9700000000000000000000000000000000000C7
68408+:10B9800000000000000000000000000000000000B7
68409+:10B9900000000000000000000000000000000000A7
68410+:10B9A0000000000000000000000000000000000097
68411+:10B9B0000000000000000000000000000000000087
68412+:10B9C0000000000000000000000000000000000077
68413+:10B9D0000000000000000000000000000000000067
68414+:10B9E0000000000000000000000000000000000057
68415+:10B9F0000000000000000000000000000000000047
68416+:10BA00000000000000000000000000000000000036
68417+:10BA10000000000000000000000000000000000026
68418+:10BA20000000000000000000000000000000000016
68419+:10BA30000000000000000000000000000000000006
68420+:10BA400000000000000000000000000000000000F6
68421+:10BA500000000000000000000000000000000000E6
68422+:10BA600000000000000000000000000000000000D6
68423+:10BA700000000000000000000000000000000000C6
68424+:10BA800000000000000000000000000000000000B6
68425+:10BA900000000000000000000000000000000000A6
68426+:10BAA0000000000000000000000000000000000096
68427+:10BAB0000000000000000000000000000000000086
68428+:10BAC0000000000000000000000000000000000076
68429+:10BAD0000000000000000000000000000000000066
68430+:10BAE0000000000000000000000000000000000056
68431+:10BAF0000000000000000000000000000000000046
68432+:10BB00000000000000000000000000000000000035
68433+:10BB10000000000000000000000000000000000025
68434+:10BB20000000000000000000000000000000000015
68435+:10BB30000000000000000000000000000000000005
68436+:10BB400000000000000000000000000000000000F5
68437+:10BB500000000000000000000000000000000000E5
68438+:10BB600000000000000000000000000000000000D5
68439+:10BB700000000000000000000000000000000000C5
68440+:10BB800000000000000000000000000000000000B5
68441+:10BB900000000000000000000000000000000000A5
68442+:10BBA0000000000000000000000000000000000095
68443+:10BBB0000000000000000000000000000000000085
68444+:10BBC0000000000000000000000000000000000075
68445+:10BBD0000000000000000000000000000000000065
68446+:10BBE0000000000000000000000000000000000055
68447+:10BBF0000000000000000000000000000000000045
68448+:10BC00000000000000000000000000000000000034
68449+:10BC10000000000000000000000000000000000024
68450+:10BC20000000000000000000000000000000000014
68451+:10BC30000000000000000000000000000000000004
68452+:10BC400000000000000000000000000000000000F4
68453+:10BC500000000000000000000000000000000000E4
68454+:10BC600000000000000000000000000000000000D4
68455+:10BC700000000000000000000000000000000000C4
68456+:10BC800000000000000000000000000000000000B4
68457+:10BC900000000000000000000000000000000000A4
68458+:10BCA0000000000000000000000000000000000094
68459+:10BCB0000000000000000000000000000000000084
68460+:10BCC0000000000000000000000000000000000074
68461+:10BCD0000000000000000000000000000000000064
68462+:10BCE0000000000000000000000000000000000054
68463+:10BCF0000000000000000000000000000000000044
68464+:10BD00000000000000000000000000000000000033
68465+:10BD10000000000000000000000000000000000023
68466+:10BD20000000000000000000000000000000000013
68467+:10BD30000000000000000000000000000000000003
68468+:10BD400000000000000000000000000000000000F3
68469+:10BD500000000000000000000000000000000000E3
68470+:10BD600000000000000000000000000000000000D3
68471+:10BD700000000000000000000000000000000000C3
68472+:10BD800000000000000000000000000000000000B3
68473+:10BD900000000000000000000000000000000000A3
68474+:10BDA0000000000000000000000000000000000093
68475+:10BDB0000000000000000000000000000000000083
68476+:10BDC0000000000000000000000000000000000073
68477+:10BDD0000000000000000000000000000000000063
68478+:10BDE0000000000000000000000000000000000053
68479+:10BDF0000000000000000000000000000000000043
68480+:10BE00000000000000000000000000000000000032
68481+:10BE10000000000000000000000000000000000022
68482+:10BE20000000000000000000000000000000000012
68483+:10BE30000000000000000000000000000000000002
68484+:10BE400000000000000000000000000000000000F2
68485+:10BE500000000000000000000000000000000000E2
68486+:10BE600000000000000000000000000000000000D2
68487+:10BE700000000000000000000000000000000000C2
68488+:10BE800000000000000000000000000000000000B2
68489+:10BE900000000000000000000000000000000000A2
68490+:10BEA0000000000000000000000000000000000092
68491+:10BEB0000000000000000000000000000000000082
68492+:10BEC0000000000000000000000000000000000072
68493+:10BED0000000000000000000000000000000000062
68494+:10BEE0000000000000000000000000000000000052
68495+:10BEF0000000000000000000000000000000000042
68496+:10BF00000000000000000000000000000000000031
68497+:10BF10000000000000000000000000000000000021
68498+:10BF20000000000000000000000000000000000011
68499+:10BF30000000000000000000000000000000000001
68500+:10BF400000000000000000000000000000000000F1
68501+:10BF500000000000000000000000000000000000E1
68502+:10BF600000000000000000000000000000000000D1
68503+:10BF700000000000000000000000000000000000C1
68504+:10BF800000000000000000000000000000000000B1
68505+:10BF900000000000000000000000000000000000A1
68506+:10BFA0000000000000000000000000000000000091
68507+:10BFB0000000000000000000000000000000000081
68508+:10BFC0000000000000000000000000000000000071
68509+:10BFD0000000000000000000000000000000000061
68510+:10BFE0000000000000000000000000000000000051
68511+:10BFF0000000000000000000000000000000000041
68512+:10C000000000000000000000000000000000000030
68513+:10C010000000000000000000000000000000000020
68514+:10C020000000000000000000000000000000000010
68515+:10C030000000000000000000000000000000000000
68516+:10C0400000000000000000000000000000000000F0
68517+:10C0500000000000000000000000000000000000E0
68518+:10C0600000000000000000000000000000000000D0
68519+:10C0700000000000000000000000000000000000C0
68520+:10C0800000000000000000000000000000000000B0
68521+:10C0900000000000000000000000000000000000A0
68522+:10C0A0000000000000000000000000000000000090
68523+:10C0B0000000000000000000000000000000000080
68524+:10C0C0000000000000000000000000000000000070
68525+:10C0D0000000000000000000000000000000000060
68526+:10C0E0000000000000000000000000000000000050
68527+:10C0F0000000000000000000000000000000000040
68528+:10C10000000000000000000000000000000000002F
68529+:10C11000000000000000000000000000000000001F
68530+:10C12000000000000000000000000000000000000F
68531+:10C1300000000000000000000000000000000000FF
68532+:10C1400000000000000000000000000000000000EF
68533+:10C1500000000000000000000000000000000000DF
68534+:10C1600000000000000000000000000000000000CF
68535+:10C1700000000000000000000000000000000000BF
68536+:10C1800000000000000000000000000000000000AF
68537+:10C19000000000000000000000000000000000009F
68538+:10C1A000000000000000000000000000000000008F
68539+:10C1B000000000000000000000000000000000007F
68540+:10C1C000000000000000000000000000000000006F
68541+:10C1D000000000000000000000000000000000005F
68542+:10C1E000000000000000000000000000000000004F
68543+:10C1F000000000000000000000000000000000003F
68544+:10C20000000000000000000000000000000000002E
68545+:10C21000000000000000000000000000000000001E
68546+:10C22000000000000000000000000000000000000E
68547+:10C2300000000000000000000000000000000000FE
68548+:10C2400000000000000000000000000000000000EE
68549+:10C2500000000000000000000000000000000000DE
68550+:10C2600000000000000000000000000000000000CE
68551+:10C2700000000000000000000000000000000000BE
68552+:10C2800000000000000000000000000000000000AE
68553+:10C29000000000000000000000000000000000009E
68554+:10C2A000000000000000000000000000000000008E
68555+:10C2B000000000000000000000000000000000007E
68556+:10C2C000000000000000000000000000000000006E
68557+:10C2D000000000000000000000000000000000005E
68558+:10C2E000000000000000000000000000000000004E
68559+:10C2F000000000000000000000000000000000003E
68560+:10C30000000000000000000000000000000000002D
68561+:10C31000000000000000000000000000000000001D
68562+:10C32000000000000000000000000000000000000D
68563+:10C3300000000000000000000000000000000000FD
68564+:10C3400000000000000000000000000000000000ED
68565+:10C3500000000000000000000000000000000000DD
68566+:10C3600000000000000000000000000000000000CD
68567+:10C3700000000000000000000000000000000000BD
68568+:10C3800000000000000000000000000000000000AD
68569+:10C39000000000000000000000000000000000009D
68570+:10C3A000000000000000000000000000000000008D
68571+:10C3B000000000000000000000000000000000007D
68572+:10C3C000000000000000000000000000000000006D
68573+:10C3D000000000000000000000000000000000005D
68574+:10C3E000000000000000000000000000000000004D
68575+:10C3F000000000000000000000000000000000003D
68576+:10C40000000000000000000000000000000000002C
68577+:10C41000000000000000000000000000000000001C
68578+:10C42000000000000000000000000000000000000C
68579+:10C4300000000000000000000000000000000000FC
68580+:10C4400000000000000000000000000000000000EC
68581+:10C4500000000000000000000000000000000000DC
68582+:10C4600000000000000000000000000000000000CC
68583+:10C4700000000000000000000000000000000000BC
68584+:10C4800000000000000000000000000000000000AC
68585+:10C49000000000000000000000000000000000009C
68586+:10C4A000000000000000000000000000000000008C
68587+:10C4B000000000000000000000000000000000007C
68588+:10C4C000000000000000000000000000000000006C
68589+:10C4D000000000000000000000000000000000005C
68590+:10C4E000000000000000000000000000000000004C
68591+:10C4F000000000000000000000000000000000003C
68592+:10C50000000000000000000000000000000000002B
68593+:10C51000000000000000000000000000000000001B
68594+:10C52000000000000000000000000000000000000B
68595+:10C5300000000000000000000000000000000000FB
68596+:10C5400000000000000000000000000000000000EB
68597+:10C5500000000000000000000000000000000000DB
68598+:10C5600000000000000000000000000000000000CB
68599+:10C5700000000000000000000000000000000000BB
68600+:10C5800000000000000000000000000000000000AB
68601+:10C59000000000000000000000000000000000009B
68602+:10C5A000000000000000000000000000000000008B
68603+:10C5B000000000000000000000000000000000007B
68604+:10C5C000000000000000000000000000000000006B
68605+:10C5D000000000000000000000000000000000005B
68606+:10C5E000000000000000000000000000000000004B
68607+:10C5F000000000000000000000000000000000003B
68608+:10C60000000000000000000000000000000000002A
68609+:10C61000000000000000000000000000000000001A
68610+:10C62000000000000000000000000000000000000A
68611+:10C6300000000000000000000000000000000000FA
68612+:10C6400000000000000000000000000000000000EA
68613+:10C6500000000000000000000000000000000000DA
68614+:10C6600000000000000000000000000000000000CA
68615+:10C6700000000000000000000000000000000000BA
68616+:10C6800000000000000000000000000000000000AA
68617+:10C69000000000000000000000000000000000009A
68618+:10C6A000000000000000000000000000000000008A
68619+:10C6B000000000000000000000000000000000007A
68620+:10C6C000000000000000000000000000000000006A
68621+:10C6D000000000000000000000000000000000005A
68622+:10C6E000000000000000000000000000000000004A
68623+:10C6F000000000000000000000000000000000003A
68624+:10C700000000000000000000000000000000000029
68625+:10C710000000000000000000000000000000000019
68626+:10C720000000000000000000000000000000000009
68627+:10C7300000000000000000000000000000000000F9
68628+:10C7400000000000000000000000000000000000E9
68629+:10C7500000000000000000000000000000000000D9
68630+:10C7600000000000000000000000000000000000C9
68631+:10C7700000000000000000000000000000000000B9
68632+:10C7800000000000000000000000000000000000A9
68633+:10C790000000000000000000000000000000000099
68634+:10C7A0000000000000000000000000000000000089
68635+:10C7B0000000000000000000000000000000000079
68636+:10C7C0000000000000000000000000000000000069
68637+:10C7D0000000000000000000000000000000000059
68638+:10C7E0000000000000000000000000000000000049
68639+:10C7F0000000000000000000000000000000000039
68640+:10C800000000000000000000000000000000000028
68641+:10C810000000000000000000000000000000000018
68642+:10C820000000000000000000000000000000000008
68643+:10C8300000000000000000000000000000000000F8
68644+:10C8400000000000000000000000000000000000E8
68645+:10C8500000000000000000000000000000000000D8
68646+:10C8600000000000000000000000000000000000C8
68647+:10C8700000000000000000000000000000000000B8
68648+:10C8800000000000000000000000000000000000A8
68649+:10C890000000000000000000000000000000000098
68650+:10C8A0000000000000000000000000000000000088
68651+:10C8B0000000000000000000000000000000000078
68652+:10C8C0000000000000000000000000000000000068
68653+:10C8D0000000000000000000000000000000000058
68654+:10C8E0000000000000000000000000000000000048
68655+:10C8F0000000000000000000000000000000000038
68656+:10C900000000000000000000000000000000000027
68657+:10C910000000000000000000000000000000000017
68658+:10C920000000000000000000000000000000000007
68659+:10C9300000000000000000000000000000000000F7
68660+:10C9400000000000000000000000000000000000E7
68661+:10C9500000000000000000000000000000000000D7
68662+:10C9600000000000000000000000000000000000C7
68663+:10C9700000000000000000000000000000000000B7
68664+:10C9800000000000000000000000000000000000A7
68665+:10C990000000000000000000000000000000000097
68666+:10C9A0000000000000000000000000000000000087
68667+:10C9B0000000000000000000000000000000000077
68668+:10C9C0000000000000000000000000000000000067
68669+:10C9D0000000000000000000000000000000000057
68670+:10C9E0000000000000000000000000000000000047
68671+:10C9F0000000000000000000000000000000000037
68672+:10CA00000000000000000000000000000000000026
68673+:10CA10000000000000000000000000000000000016
68674+:10CA20000000000000000000000000000000000006
68675+:10CA300000000000000000000000000000000000F6
68676+:10CA400000000000000000000000000000000000E6
68677+:10CA500000000000000000000000000000000000D6
68678+:10CA600000000000000000000000000000000000C6
68679+:10CA700000000000000000000000000000000000B6
68680+:10CA800000000000000000000000000000000000A6
68681+:10CA90000000000000000000000000000000000096
68682+:10CAA0000000000000000000000000000000000086
68683+:10CAB0000000000000000000000000000000000076
68684+:10CAC0000000000000000000000000000000000066
68685+:10CAD0000000000000000000000000000000000056
68686+:10CAE0000000000000000000000000000000000046
68687+:10CAF0000000000000000000000000000000000036
68688+:10CB00000000000000000000000000000000000025
68689+:10CB10000000000000000000000000000000000015
68690+:10CB20000000000000000000000000000000000005
68691+:10CB300000000000000000000000000000000000F5
68692+:10CB400000000000000000000000000000000000E5
68693+:10CB500000000000000000000000000000000000D5
68694+:10CB600000000000000000000000000000000000C5
68695+:10CB700000000000000000000000000000000000B5
68696+:10CB800000000000000000000000000000000000A5
68697+:10CB90000000000000000000000000000000000095
68698+:10CBA0000000000000000000000000000000000085
68699+:10CBB0000000000000000000000000000000000075
68700+:10CBC0000000000000000000000000000000000065
68701+:10CBD0000000000000000000000000000000000055
68702+:10CBE0000000000000000000000000000000000045
68703+:10CBF0000000000000000000000000000000000035
68704+:10CC00000000000000000000000000000000000024
68705+:10CC10000000000000000000000000000000000014
68706+:10CC20000000000000000000000000000000000004
68707+:10CC300000000000000000000000000000000000F4
68708+:10CC400000000000000000000000000000000000E4
68709+:10CC500000000000000000000000000000000000D4
68710+:10CC600000000000000000000000000000000000C4
68711+:10CC700000000000000000000000000000000000B4
68712+:10CC800000000000000000000000000000000000A4
68713+:10CC90000000000000000000000000000000000094
68714+:10CCA0000000000000000000000000000000000084
68715+:10CCB0000000000000000000000000000000000074
68716+:10CCC0000000000000000000000000000000000064
68717+:10CCD0000000000000000000000000000000000054
68718+:10CCE0000000000000000000000000000000000044
68719+:10CCF0000000000000000000000000000000000034
68720+:10CD00000000000000000000000000000000000023
68721+:10CD10000000000000000000000000000000000013
68722+:10CD20000000000000000000000000000000000003
68723+:10CD300000000000000000000000000000000000F3
68724+:10CD400000000000000000000000000000000000E3
68725+:10CD500000000000000000000000000000000000D3
68726+:10CD600000000000000000000000000000000000C3
68727+:10CD700000000000000000000000000000000000B3
68728+:10CD800000000000000000000000000000000000A3
68729+:10CD90000000000000000000000000000000000093
68730+:10CDA0000000000000000000000000000000000083
68731+:10CDB0000000000000000000000000000000000073
68732+:10CDC0000000000000000000000000000000000063
68733+:10CDD0000000000000000000000000000000000053
68734+:10CDE0000000000000000000000000000000000043
68735+:10CDF0000000000000000000000000000000000033
68736+:10CE00000000000000000000000000000000000022
68737+:10CE10000000000000000000000000000000000012
68738+:10CE20000000000000000000000000000000000002
68739+:10CE300000000000000000000000000000000000F2
68740+:10CE400000000000000000000000000000000000E2
68741+:10CE500000000000000000000000000000000000D2
68742+:10CE600000000000000000000000000000000000C2
68743+:10CE700000000000000000000000000000000000B2
68744+:10CE800000000000000000000000000000000000A2
68745+:10CE90000000000000000000000000000000000092
68746+:10CEA0000000000000000000000000000000000082
68747+:10CEB0000000000000000000000000000000000072
68748+:10CEC0000000000000000000000000000000000062
68749+:10CED0000000000000000000000000000000000052
68750+:10CEE0000000000000000000000000000000000042
68751+:10CEF0000000000000000000000000000000000032
68752+:10CF00000000000000000000000000000000000021
68753+:10CF10000000000000000000000000000000000011
68754+:10CF20000000000000000000000000000000000001
68755+:10CF300000000000000000000000000000000000F1
68756+:10CF400000000000000000000000000000000000E1
68757+:10CF500000000000000000000000000000000000D1
68758+:10CF600000000000000000000000000000000000C1
68759+:10CF700000000000000000000000000000000000B1
68760+:10CF800000000000000000000000000000000000A1
68761+:10CF90000000000000000000000000000000000091
68762+:10CFA0000000000000000000000000000000000081
68763+:10CFB0000000000000000000000000000000000071
68764+:10CFC0000000000000000000000000000000000061
68765+:10CFD0000000000000000000000000000000000051
68766+:10CFE0000000000000000000000000000000000041
68767+:10CFF0000000000000000000000000000000000031
68768+:10D000000000000000000000000000000000000020
68769+:10D010000000000000000000000000000000000010
68770+:10D020000000000000000000000000000000000000
68771+:10D0300000000000000000000000000000000000F0
68772+:10D0400000000000000000000000000000000000E0
68773+:10D0500000000000000000000000000000000000D0
68774+:10D0600000000000000000000000000000000000C0
68775+:10D0700000000000000000000000000000000000B0
68776+:10D0800000000000000000000000000000000000A0
68777+:10D090000000000000000000000000000000000090
68778+:10D0A0000000000000000000000000000000000080
68779+:10D0B0000000000000000000000000000000000070
68780+:10D0C0000000000000000000000000000000000060
68781+:10D0D0000000000000000000000000000000000050
68782+:10D0E0000000000000000000000000000000000040
68783+:10D0F0000000000000000000000000000000000030
68784+:10D10000000000000000000000000000000000001F
68785+:10D11000000000000000000000000000000000000F
68786+:10D1200000000000000000000000000000000000FF
68787+:10D1300000000000000000000000000000000000EF
68788+:10D1400000000000000000000000000000000000DF
68789+:10D1500000000000000000000000000000000000CF
68790+:10D1600000000000000000000000000000000000BF
68791+:10D1700000000000000000000000000000000000AF
68792+:10D18000000000000000000000000000000000009F
68793+:10D19000000000000000000000000000000000008F
68794+:10D1A000000000000000000000000000000000007F
68795+:10D1B000000000000000000000000000000000006F
68796+:10D1C000000000000000000000000000000000005F
68797+:10D1D000000000000000000000000000000000004F
68798+:10D1E000000000000000000000000000000000003F
68799+:10D1F000000000000000000000000000000000002F
68800+:10D20000000000000000000000000000000000001E
68801+:10D21000000000000000000000000000000000000E
68802+:10D2200000000000000000000000000000000000FE
68803+:10D2300000000000000000000000000000000000EE
68804+:10D2400000000000000000000000000000000000DE
68805+:10D2500000000000000000000000000000000000CE
68806+:10D2600000000000000000000000000000000000BE
68807+:10D2700000000000000000000000000000000000AE
68808+:10D28000000000000000000000000000000000009E
68809+:10D29000000000000000000000000000000000008E
68810+:10D2A000000000000000000000000000000000007E
68811+:10D2B000000000000000000000000000000000006E
68812+:10D2C000000000000000000000000000000000005E
68813+:10D2D000000000000000000000000000000000004E
68814+:10D2E000000000000000000000000000000000003E
68815+:10D2F000000000000000000000000000000000002E
68816+:10D30000000000000000000000000000000000001D
68817+:10D31000000000000000000000000000000000000D
68818+:10D3200000000000000000000000000000000000FD
68819+:10D3300000000000000000000000000000000000ED
68820+:10D3400000000000000000000000000000000000DD
68821+:10D3500000000000000000000000000000000000CD
68822+:10D3600000000000000000000000000000000000BD
68823+:10D3700000000000000000000000000000000000AD
68824+:10D38000000000000000000000000000000000009D
68825+:10D39000000000000000000000000000000000008D
68826+:10D3A000000000000000000000000000000000007D
68827+:10D3B000000000000000000000000000000000006D
68828+:10D3C000000000000000000000000000000000005D
68829+:10D3D000000000000000000000000000000000004D
68830+:10D3E000000000000000000000000000000000003D
68831+:10D3F000000000000000000000000000000000002D
68832+:10D40000000000000000000000000000000000001C
68833+:10D41000000000000000000000000000000000000C
68834+:10D4200000000000000000000000000000000000FC
68835+:10D4300000000000000000000000000000000000EC
68836+:10D4400000000000000000000000000000000000DC
68837+:10D4500000000000000000000000000000000000CC
68838+:10D4600000000000000000000000000000000000BC
68839+:10D4700000000000000000000000000000000000AC
68840+:10D48000000000000000000000000000000000009C
68841+:10D49000000000000000000000000000000000008C
68842+:10D4A000000000000000000000000000000000007C
68843+:10D4B000000000000000000000000000000000006C
68844+:10D4C000000000000000000000000000000000005C
68845+:10D4D000000000000000000000000000000000004C
68846+:10D4E000000000000000000000000000000000003C
68847+:10D4F000000000000000000000000000000000002C
68848+:10D50000000000000000000000000000000000001B
68849+:10D51000000000000000000000000000000000000B
68850+:10D5200000000000000000000000000000000000FB
68851+:10D5300000000000000000000000000000000000EB
68852+:10D5400000000000000000000000000000000000DB
68853+:10D5500000000000000000000000000000000000CB
68854+:10D5600000000000000000000000000000000000BB
68855+:10D5700000000000000000000000000000000000AB
68856+:10D58000000000000000000000000000000000009B
68857+:10D59000000000000000000000000000000000008B
68858+:10D5A000000000000000000000000000000000007B
68859+:10D5B000000000000000000000000000000000006B
68860+:10D5C000000000000000000000000000000000005B
68861+:10D5D000000000000000000000000000000000004B
68862+:10D5E000000000000000000000000000000000003B
68863+:10D5F000000000000000000000000000000000002B
68864+:10D60000000000000000000000000000000000001A
68865+:10D61000000000000000000000000000000000000A
68866+:10D6200000000000000000000000000000000000FA
68867+:10D6300000000000000000000000000000000000EA
68868+:10D6400000000000000000000000000000000000DA
68869+:10D6500000000000000000000000000000000000CA
68870+:10D6600000000000000000000000000000000000BA
68871+:10D6700000000000000000000000000000000000AA
68872+:10D68000000000000000000000000000000000009A
68873+:10D69000000000000000000000000000000000008A
68874+:10D6A000000000000000000000000000000000007A
68875+:10D6B000000000000000000000000000000000006A
68876+:10D6C000000000000000000000000000000000005A
68877+:10D6D000000000000000000000000000000000004A
68878+:10D6E000000000000000000000000000000000003A
68879+:10D6F000000000000000000000000000000000002A
68880+:10D700000000000000000000000000000000000019
68881+:10D710000000000000000000000000000000000009
68882+:10D7200000000000000000000000000000000000F9
68883+:10D7300000000000000000000000000000000000E9
68884+:10D7400000000000000000000000000000000000D9
68885+:10D7500000000000000000000000000000000000C9
68886+:10D7600000000000000000000000000000000000B9
68887+:10D7700000000000000000000000000000000000A9
68888+:10D780000000000000000000000000000000000099
68889+:10D790000000000000000000000000000000000089
68890+:10D7A0000000000000000000000000000000000079
68891+:10D7B0000000000000000000000000000000000069
68892+:10D7C0000000000000000000000000000000000059
68893+:10D7D0000000000000000000000000000000000049
68894+:10D7E0000000000000000000000000000000000039
68895+:10D7F0000000000000000000000000000000000029
68896+:10D800000000000000000000000000000000000018
68897+:10D810000000000000000000000000000000000008
68898+:10D8200000000000000000000000000000000000F8
68899+:10D8300000000000000000000000000000000000E8
68900+:10D8400000000000000000000000000000000000D8
68901+:10D8500000000000000000000000000000000000C8
68902+:10D8600000000000000000000000000000000000B8
68903+:10D8700000000000000000000000000000000000A8
68904+:10D880000000000000000000000000000000000098
68905+:10D890000000000000000000000000000000000088
68906+:10D8A0000000000000000000000000000000000078
68907+:10D8B0000000000000000000000000000000000068
68908+:10D8C0000000000000000000000000000000000058
68909+:10D8D0000000000000000000000000000000000048
68910+:10D8E0000000000000000000000000000000000038
68911+:10D8F0000000000000000000000000000000000028
68912+:10D900000000000000000000000000000000000017
68913+:10D910000000000000000000000000000000000007
68914+:10D9200000000000000000000000000000000000F7
68915+:10D9300000000000000000000000000000000000E7
68916+:10D9400000000000000000000000000000000000D7
68917+:10D9500000000000000000000000000000000000C7
68918+:10D9600000000000000000000000000000000000B7
68919+:10D9700000000000000000000000000000000000A7
68920+:10D980000000000000000000000000000000000097
68921+:10D990000000000000000000000000000000000087
68922+:10D9A0000000000000000000000000000000000077
68923+:10D9B0000000000000000000000000000000000067
68924+:10D9C0000000000000000000000000000000000057
68925+:10D9D0000000000000000000000000000000000047
68926+:10D9E0000000000000000000000000000000000037
68927+:10D9F0000000000000000000000000000000000027
68928+:10DA00000000000000000000000000000000000016
68929+:10DA10000000000000000000000000000000000006
68930+:10DA200000000000000000000000000000000000F6
68931+:10DA300000000000000000000000000000000000E6
68932+:10DA400000000000000000000000000000000000D6
68933+:10DA500000000000000000000000000000000000C6
68934+:10DA600000000000000000000000000000000000B6
68935+:10DA700000000000000000000000000000000000A6
68936+:10DA80000000000000000000000000000000000096
68937+:10DA90000000000000000000000000000000000086
68938+:10DAA0000000000000000000000000000000000076
68939+:10DAB0000000000000000000000000000000000066
68940+:10DAC0000000000000000000000000000000000056
68941+:10DAD0000000000000000000000000000000000046
68942+:10DAE0000000000000000000000000000000000036
68943+:10DAF0000000000000000000000000000000000026
68944+:10DB00000000000000000000000000000000000015
68945+:10DB10000000000000000000000000000000000005
68946+:10DB200000000000000000000000000000000000F5
68947+:10DB300000000000000000000000000000000000E5
68948+:10DB400000000000000000000000000000000000D5
68949+:10DB500000000000000000000000000000000000C5
68950+:10DB600000000000000000000000000000000000B5
68951+:10DB700000000000000000000000000000000000A5
68952+:10DB80000000000000000000000000000000000095
68953+:10DB90000000000000000000000000000000000085
68954+:10DBA0000000000000000000000000000000000075
68955+:10DBB0000000000000000000000000000000000065
68956+:10DBC0000000000000000000000000000000000055
68957+:10DBD0000000000000000000000000000000000045
68958+:10DBE0000000000000000000000000000000000035
68959+:10DBF0000000000000000000000000000000000025
68960+:10DC00000000000000000000000000000000000014
68961+:10DC10000000000000000000000000000000000004
68962+:10DC200000000000000000000000000000000000F4
68963+:10DC300000000000000000000000000000000000E4
68964+:10DC400000000000000000000000000000000000D4
68965+:10DC500000000000000000000000000000000000C4
68966+:10DC600000000000000000000000000000000000B4
68967+:10DC700000000000000000000000000000000000A4
68968+:10DC80000000000000000000000000000000000094
68969+:10DC90000000000000000000000000000000000084
68970+:10DCA0000000000000000000000000000000000074
68971+:10DCB0000000000000000000000000000000000064
68972+:10DCC0000000000000000000000000000000000054
68973+:10DCD0000000000000000000000000000000000044
68974+:10DCE0000000000000000000000000000000000034
68975+:10DCF0000000000000000000000000000000000024
68976+:10DD00000000000000000000000000000000000013
68977+:10DD10000000000000000000000000000000000003
68978+:10DD200000000000000000000000000000000000F3
68979+:10DD300000000000000000000000000000000000E3
68980+:10DD400000000000000000000000000000000000D3
68981+:10DD500000000000000000000000000000000000C3
68982+:10DD600000000000000000000000000000000000B3
68983+:10DD700000000000000000000000000000000000A3
68984+:10DD80000000000000000000000000000000000093
68985+:10DD90000000000000000000000000000000000083
68986+:10DDA0000000000000000000000000000000000073
68987+:10DDB0000000000000000000000000000000000063
68988+:10DDC0000000000000000000000000000000000053
68989+:10DDD0000000000000000000000000000000000043
68990+:10DDE0000000000000000000000000000000000033
68991+:10DDF0000000000000000000000000000000000023
68992+:10DE00000000000000000000000000000000000012
68993+:10DE10000000000000000000000000000000000002
68994+:10DE200000000000000000000000000000000000F2
68995+:10DE300000000000000000000000000000000000E2
68996+:10DE400000000000000000000000000000000000D2
68997+:10DE500000000000000000000000000000000000C2
68998+:10DE600000000000000000000000000000000000B2
68999+:10DE700000000000000000000000000000000000A2
69000+:10DE80000000000000000000000000000000000092
69001+:10DE90000000000000000000000000000000000082
69002+:10DEA0000000000000000000000000000000000072
69003+:10DEB0000000000000000000000000000000000062
69004+:10DEC0000000000000000000000000000000000052
69005+:10DED0000000000000000000000000000000000042
69006+:10DEE0000000000000000000000000000000000032
69007+:10DEF0000000000000000000000000000000000022
69008+:10DF00000000000000000000000000000000000011
69009+:10DF10000000000000000000000000000000000001
69010+:10DF200000000000000000000000000000000000F1
69011+:10DF300000000000000000000000000000000000E1
69012+:10DF400000000000000000000000000000000000D1
69013+:10DF500000000000000000000000000000000000C1
69014+:10DF600000000000000000000000000000000000B1
69015+:10DF700000000000000000000000000000000000A1
69016+:10DF80000000000000000000000000000000000091
69017+:10DF90000000000000000000000000000000000081
69018+:10DFA0000000000000000000000000000000000071
69019+:10DFB0000000000000000000000000000000000061
69020+:10DFC0000000000000000000000000000000000051
69021+:10DFD0000000000000000000000000000000000041
69022+:10DFE0000000000000000000000000000000000031
69023+:10DFF0000000000000000000000000000000000021
69024+:10E000000000000000000000000000000000000010
69025+:10E010000000000000000000000000000000000000
69026+:10E0200000000000000000000000000000000000F0
69027+:10E0300000000000000000000000000000000000E0
69028+:10E0400000000000000000000000000000000000D0
69029+:10E0500000000000000000000000000000000000C0
69030+:10E0600000000000000000000000000000000000B0
69031+:10E0700000000000000000000000000000000000A0
69032+:10E080000000000000000000000000000000000090
69033+:10E090000000000000000000000000000000000080
69034+:10E0A0000000000000000000000000000000000070
69035+:10E0B0000000000000000000000000000000000060
69036+:10E0C0000000000000000000000000000000000050
69037+:10E0D0000000000000000000000000000000000040
69038+:10E0E0000000000000000000000000000000000030
69039+:10E0F0000000000000000000000000000000000020
69040+:10E10000000000000000000000000000000000000F
69041+:10E1100000000000000000000000000000000000FF
69042+:10E1200000000000000000000000000000000000EF
69043+:10E1300000000000000000000000000000000000DF
69044+:10E1400000000000000000000000000000000000CF
69045+:10E1500000000000000000000000000000000000BF
69046+:10E1600000000000000000000000000000000000AF
69047+:10E17000000000000000000000000000000000009F
69048+:10E18000000000000000000000000000000000008F
69049+:10E19000000000000000000000000000000000007F
69050+:10E1A000000000000000000000000000000000006F
69051+:10E1B000000000000000000000000000000000005F
69052+:10E1C000000000000000000000000000000000004F
69053+:10E1D000000000000000000000000000000000003F
69054+:10E1E000000000000000000000000000000000002F
69055+:10E1F000000000000000000000000000000000809F
69056+:10E20000000000000000000000000000000000000E
69057+:10E2100000000000000000000000000000000000FE
69058+:10E220000000000A000000000000000000000000E4
69059+:10E2300010000003000000000000000D0000000DB1
69060+:10E240003C020801244295C03C030801246397FC6A
69061+:10E25000AC4000000043202B1480FFFD244200044A
69062+:10E260003C1D080037BD9FFC03A0F0213C100800B6
69063+:10E27000261032103C1C0801279C95C00E0012BECF
69064+:10E28000000000000000000D3C02800030A5FFFFF0
69065+:10E2900030C600FF344301803C0880008D0901B87E
69066+:10E2A0000520FFFE00000000AC6400002404000212
69067+:10E2B000A4650008A066000AA064000BAC67001803
69068+:10E2C0003C03100003E00008AD0301B83C0560000A
69069+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
69070+:10E2E0003C0310003C040200ACA44FC403E000084F
69071+:10E2F000ACA34FF89486000C00A050212488001491
69072+:10E3000000062B0200051080004448210109182B4B
69073+:10E310001060001100000000910300002C6400094F
69074+:10E320005080000991190001000360803C0D080134
69075+:10E3300025AD9258018D58218D67000000E000083E
69076+:10E340000000000091190001011940210109302B42
69077+:10E3500054C0FFF29103000003E000080000102108
69078+:10E360000A000CCC25080001910F0001240E000AC0
69079+:10E3700015EE00400128C8232F38000A1700003D81
69080+:10E38000250D00028D580000250F0006370E0100F4
69081+:10E39000AD4E0000910C000291AB000191A400026F
69082+:10E3A00091A60003000C2E00000B3C0000A71025D6
69083+:10E3B00000041A000043C8250326C025AD580004F8
69084+:10E3C000910E000691ED000191E7000291E5000336
69085+:10E3D000000E5E00000D6400016C30250007220075
69086+:10E3E00000C41025004518252508000A0A000CCC99
69087+:10E3F000AD430008910F000125040002240800022B
69088+:10E4000055E80001012020210A000CCC00804021A9
69089+:10E41000910C0001240B0003158B00160000000076
69090+:10E420008D580000910E000225080003370D0008EA
69091+:10E43000A14E00100A000CCCAD4D00009119000156
69092+:10E44000240F0004172F000B0000000091070002AA
69093+:10E45000910400038D43000000072A0000A410254A
69094+:10E460003466000425080004AD42000C0A000CCC00
69095+:10E47000AD46000003E000082402000127BDFFE8CC
69096+:10E48000AFBF0014AFB000100E00164E0080802108
69097+:10E490003C0480083485008090A600052403FFFE1C
69098+:10E4A0000200202100C310248FBF00148FB0001081
69099+:10E4B000A0A200050A00165827BD001827BDFFE8D6
69100+:10E4C000AFB00010AFBF00140E000FD40080802149
69101+:10E4D0003C06800834C5008090A40000240200504F
69102+:10E4E000308300FF106200073C09800002002021F9
69103+:10E4F0008FBF00148FB00010AD2001800A00108F74
69104+:10E5000027BD0018240801003C07800002002021DC
69105+:10E510008FBF00148FB00010ACE801800A00108F8C
69106+:10E5200027BD001827BDFF783C058008AFBE0080DE
69107+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
69108+:10E54000AFB60078AFB50074AFB40070AFB200687A
69109+:10E55000AFB0006034A600803C0580008CB201287A
69110+:10E5600090C400098CA701043C020001309100FF17
69111+:10E5700000E218240000B8210000F021106000071C
69112+:10E58000000098213C0908008D2931F02413000176
69113+:10E59000252800013C010800AC2831F0ACA0008423
69114+:10E5A00090CC0005000C5827316A0001154000721C
69115+:10E5B000AFA0005090CD00002406002031A400FF41
69116+:10E5C00010860018240E0050108E009300000000EA
69117+:10E5D0003C1008008E1000DC260F00013C010800F2
69118+:10E5E000AC2F00DC0E0016C7000000000040182110
69119+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
69120+:10E600008FB500748FB400708FB3006C8FB2006848
69121+:10E610008FB100648FB000600060102103E000083B
69122+:10E6200027BD00880000000D3C1F8000AFA0003017
69123+:10E6300097E501168FE201043C04002030B9FFFF8A
69124+:10E64000004438240007182B00033140AFA60030E7
69125+:10E650008FF5010437F80C003C1600400338802188
69126+:10E6600002B6A02434C40040128000479215000D69
69127+:10E6700032A800201500000234860080008030217E
69128+:10E6800014C0009FAFA600303C0D800835A6008066
69129+:10E6900090CC0008318B0040516000063C06800899
69130+:10E6A000240E0004122E00A8240F0012122F003294
69131+:10E6B0003C06800834C401003C0280009447011AE3
69132+:10E6C0009619000E909F00088E18000830E3FFFF97
69133+:10E6D00003F9B00432B40004AFB6005CAFA3005835
69134+:10E6E0008E1600041280002EAFB8005434C3008090
69135+:10E6F000906800083105004014A0002500000000CB
69136+:10E700008C70005002D090230640000500000000ED
69137+:10E710008C71003402D1A82306A201678EE20008A2
69138+:10E72000126000063C1280003C1508008EB531F4E2
69139+:10E7300026B600013C010800AC3631F4AE4000447E
69140+:10E74000240300018FBF00848FBE00808FB7007C40
69141+:10E750008FB600788FB500748FB400708FB3006CE3
69142+:10E760008FB200688FB100648FB00060006010212C
69143+:10E7700003E0000827BD00880E000D2800002021BE
69144+:10E780000A000D75004018210A000D9500C02021D7
69145+:10E790000E00171702C020211440FFE10000000006
69146+:10E7A0003C0B8008356400808C8A003402CA482300
69147+:10E7B0000520001D000000003C1E08008FDE310017
69148+:10E7C00027D700013C010800AC3731001260000679
69149+:10E7D000024020213C1408008E9431F42690000160
69150+:10E7E0003C010800AC3031F40E00164E3C1E80088F
69151+:10E7F00037CD008091B700250240202136EE00047D
69152+:10E800000E001658A1AE00250E000CAC02402021CF
69153+:10E810000A000DCA240300013C17080126F796C020
69154+:10E820000A000D843C1F80008C86003002C66023E5
69155+:10E830001980000C2419000C908F004F3C14080024
69156+:10E840008E94310032B500FC35ED0001268E0001BA
69157+:10E850003C010800AC2E3100A08D004FAFA0005845
69158+:10E860002419000CAFB900308C9800300316A02397
69159+:10E870001A80010B8FA300580074F82A17E0FFD309
69160+:10E88000000000001074002A8FA5005802D4B021A7
69161+:10E8900000B410233044FFFFAFA4005832A8000298
69162+:10E8A0001100002E32AB00103C15800836B00080FD
69163+:10E8B0009216000832D30040526000FB8EE200083E
69164+:10E8C0000E00164E02402021240A0018A20A000958
69165+:10E8D000921100052409FFFE024020210229902404
69166+:10E8E0000E001658A2120005240400390000282149
69167+:10E8F0000E0016F2240600180A000DCA24030001B7
69168+:10E9000092FE000C3C0A800835490080001EBB00C6
69169+:10E910008D27003836F10081024020213225F08118
69170+:10E920000E000C9B30C600FF0A000DC10000000065
69171+:10E930003AA7000130E300011460FFA402D4B02123
69172+:10E940000A000E1D00000000024020210E001734B6
69173+:10E95000020028210A000D75004018211160FF7087
69174+:10E960003C0F80083C0D800835EE00808DC40038D7
69175+:10E970008FA300548DA60004006660231D80FF68ED
69176+:10E98000000000000064C02307020001AFA400548F
69177+:10E990003C1F08008FFF31E433F9000113200015FC
69178+:10E9A0008FAC00583C07800094E3011A10600012FD
69179+:10E9B0003C0680080E00216A024020213C03080129
69180+:10E9C000906396F13064000214800145000000005D
69181+:10E9D000306C0004118000078FAC0058306600FBDB
69182+:10E9E0003C010801A02696F132B500FCAFA000580A
69183+:10E9F0008FAC00583C06800834D30080AFB40018B8
69184+:10EA0000AFB60010AFAC00143C088000950B01209D
69185+:10EA10008E6F0030966A005C8FA3005C8FBF003061
69186+:10EA20003169FFFF3144FFFF8FAE005401341021E4
69187+:10EA3000350540000064382B0045C82103E7C02598
69188+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
69189+:10EA5000AFA0002CAFAE0034926D000831B40008B6
69190+:10EA6000168000BB020020218EE200040040F8095D
69191+:10EA700027A400108FAF003031F300025660000170
69192+:10EA800032B500FE3C048008349F008093F90008F2
69193+:10EA900033380040530000138FA400248C850004F9
69194+:10EAA0008FA7005410A700D52404001432B0000131
69195+:10EAB0001200000C8FA400242414000C1234011A3C
69196+:10EAC0002A2D000D11A001022413000E240E000AAD
69197+:10EAD000522E0001241E00088FAF002425E40001FF
69198+:10EAE000AFA400248FAA00143C0B80083565008079
69199+:10EAF000008A48218CB10030ACA9003090A4004EAF
69200+:10EB00008CA700303408FFFF0088180400E3F821C8
69201+:10EB1000ACBF00348FA600308FB900548FB8005CB2
69202+:10EB200030C200081040000B033898218CAC002044
69203+:10EB3000119300D330C600FF92EE000C8FA7003473
69204+:10EB400002402021000E6B0035B400800E000C9BAB
69205+:10EB50003285F0803C028008345000808E0F0030F7
69206+:10EB600001F1302318C00097264800803C070800B8
69207+:10EB70008CE731E42404FF80010418243118007F5D
69208+:10EB80003C1F80003C19800430F10001AFE300908D
69209+:10EB900012200006031928213C030801906396F116
69210+:10EBA00030690008152000C6306A00F73C10800864
69211+:10EBB00036040080908C004F318B000115600042BC
69212+:10EBC000000000003C0608008CC6319830CE0010D2
69213+:10EBD00051C0004230F9000190AF006B55E0003F9A
69214+:10EBE00030F9000124180001A0B8006B3C1180002E
69215+:10EBF0009622007A24470064A48700123C0D800806
69216+:10EC000035A5008090B40008329000401600000442
69217+:10EC10003C03800832AE000115C0008B00000000EC
69218+:10EC2000346400808C86002010D3000A3463010015
69219+:10EC30008C67000002C7782319E000978FBF00544B
69220+:10EC4000AC93002024130001AC760000AFB3005059
69221+:10EC5000AC7F000417C0004E000000008FA90050D8
69222+:10EC60001520000B000000003C030801906396F1A2
69223+:10EC7000306A00011140002E8FAB0058306400FE56
69224+:10EC80003C010801A02496F10A000D75000018212E
69225+:10EC90000E000CAC024020210A000F1300000000FF
69226+:10ECA0000A000E200000A0210040F80924040017EB
69227+:10ECB0000A000DCA240300010040F80924040016CC
69228+:10ECC0000A000DCA240300019094004F240DFFFE9A
69229+:10ECD000028D2824A085004F30F900011320000682
69230+:10ECE0003C0480083C030801906396F1307F0010DB
69231+:10ECF00017E00051306800EF34900080240A0001D2
69232+:10ED0000024020210E00164EA60A00129203002592
69233+:10ED100024090001AFA90050346200010240202103
69234+:10ED20000E001658A20200250A000EF93C0D8008BC
69235+:10ED30001160FE83000018218FA5003030AC000464
69236+:10ED40001180FE2C8FBF00840A000DCB240300012C
69237+:10ED500027A500380E000CB6AFA000385440FF4382
69238+:10ED60008EE200048FB40038329001005200FF3F61
69239+:10ED70008EE200048FA3003C8E6E0058006E682364
69240+:10ED800005A3FF39AE6300580A000E948EE200041A
69241+:10ED90000E00164E024020213C038008346800809B
69242+:10EDA000024020210E001658A11E000903C0302188
69243+:10EDB000240400370E0016F2000028210A000F116B
69244+:10EDC0008FA900508FAB00185960FF8D3C0D800853
69245+:10EDD0000E00164E02402021920C00252405000151
69246+:10EDE000AFA5005035820004024020210E001658C5
69247+:10EDF000A20200250A000EF93C0D800812240059D9
69248+:10EE00002A2300151060004D240900162408000C68
69249+:10EE10005628FF2732B000013C0A8008914C001BA5
69250+:10EE20002406FFBD241E000E01865824A14B001BA2
69251+:10EE30000A000EA532B000013C010801A02896F19D
69252+:10EE40000A000EF93C0D80088CB500308EFE0008DB
69253+:10EE50002404001826B6000103C0F809ACB600303F
69254+:10EE60003C030801906396F13077000116E0FF81C2
69255+:10EE7000306A00018FB200300A000D753243000481
69256+:10EE80003C1080009605011A50A0FF2B34C60010DC
69257+:10EE90000A000EC892EE000C8C6200001456FF6D42
69258+:10EEA000000000008C7800048FB9005403388823D8
69259+:10EEB0000621FF638FBF00540A000F0E0000000000
69260+:10EEC0003C010801A02A96F10A000F3030F9000138
69261+:10EED0001633FF028FAF00240A000EB0241E00106C
69262+:10EEE0000E00164E024020213C0B80083568008041
69263+:10EEF00091090025240A0001AFAA0050353300040F
69264+:10EF0000024020210E001658A11300253C050801DF
69265+:10EF100090A596F130A200FD3C010801A02296F1D7
69266+:10EF20000A000E6D004018212411000E53D1FEEA94
69267+:10EF3000241E00100A000EAF241E00165629FEDC07
69268+:10EF400032B000013C0A8008914C001B2406FFBD32
69269+:10EF5000241E001001865824A14B001B0A000EA598
69270+:10EF600032B000010A000EA4241E00123C038000EF
69271+:10EF70008C6201B80440FFFE24040800AC6401B8B0
69272+:10EF800003E000080000000030A5FFFF30C6FFFFCF
69273+:10EF90003C0780008CE201B80440FFFE34EA0180A7
69274+:10EFA000AD440000ACE400203C0480089483004899
69275+:10EFB0003068FFFF11000016AF88000824AB001274
69276+:10EFC000010B482B512000133C04800034EF01005A
69277+:10EFD00095EE00208F890000240D001A31CCFFFF30
69278+:10EFE00031274000A14D000B10E000362583FFFEC5
69279+:10EFF0000103C02B170000348F9900048F88000490
69280+:10F00000A5430014350700010A001003AF87000470
69281+:10F010003C04800024030003348201808F890000B7
69282+:10F020008F870004A043000B3C088000350C018052
69283+:10F03000A585000EA585001A8F85000C30EB800099
69284+:10F04000A5890010AD850028A58600081160000F75
69285+:10F050008F85001435190100972A00163158FFFCDE
69286+:10F06000270F000401E870218DCD400031A6FFFF7D
69287+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
69288+:10F0800000E83824AF8700048F8500142403BFFFF5
69289+:10F090003C04800000E3582434830180A46B0026E4
69290+:10F0A000AC69002C10A0000300054C02A465001000
69291+:10F0B000A46900263C071000AC8701B803E00008F3
69292+:10F0C000000000008F990004240AFFFE032A382460
69293+:10F0D0000A001003AF87000427BDFFE88FA20028B5
69294+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
69295+:10F0F000AF820014AF8000040E000FDBAF80000071
69296+:10F100008FBF001027BD001803E00008AF80001477
69297+:10F110003C06800034C4007034C701008C8A0000B3
69298+:10F1200090E500128F84000027BDFFF030A300FFA0
69299+:10F13000000318823082400010400037246500032D
69300+:10F140000005C8800326C0218F0E4000246F0004F4
69301+:10F15000000F6880AFAE000001A660218D8B4000DB
69302+:10F16000AFAB000494E900163128FFFC01063821FA
69303+:10F170008CE64000AFA600088FA9000800003021EF
69304+:10F18000000028213C07080024E701000A0010675E
69305+:10F19000240800089059000024A500012CAC000CA4
69306+:10F1A0000079C0210018788001E770218DCD000022
69307+:10F1B0001180000600CD302603A5102114A8FFF50C
69308+:10F1C00000051A005520FFF4905900003C0480000F
69309+:10F1D000348700703C0508008CA531048CE30000E6
69310+:10F1E0002CA2002010400009006A38230005488046
69311+:10F1F0003C0B0800256B3108012B402124AA00019B
69312+:10F20000AD0700003C010800AC2A310400C0102109
69313+:10F2100003E0000827BD0010308220001040000BE2
69314+:10F2200000055880016648218D24400024680004B0
69315+:10F2300000083880AFA4000000E618218C6540006B
69316+:10F24000AFA000080A001057AFA500040000000D91
69317+:10F250000A0010588FA9000827BDFFE03C07800076
69318+:10F2600034E60100AFBF001CAFB20018AFB100140C
69319+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
69320+:10F280002483000430E2400010400010AF830028C7
69321+:10F290003C09002000E940241100000D30EC800002
69322+:10F2A0008F8A0004240BBFFF00EB38243543100085
69323+:10F2B000AF87000030F220001640000B3C1900041C
69324+:10F2C000241FFFBF0A0010B7007F102430EC80001D
69325+:10F2D000158000423C0E002030F220001240FFF862
69326+:10F2E0008F8300043C19000400F9C0241300FFF5CB
69327+:10F2F000241FFFBF34620040AF82000430E20100EF
69328+:10F300001040001130F010008F83002C10600006B8
69329+:10F310003C0F80003C05002000E52024148000C044
69330+:10F320003C0800043C0F800035EE010095CD001E26
69331+:10F3300095CC001C31AAFFFF000C5C00014B482556
69332+:10F34000AF89000C30F010001200000824110001F9
69333+:10F3500030F100201620008B3C18100000F890249B
69334+:10F36000164000823C040C002411000130E801002A
69335+:10F370001500000B3C0900018F85000430A94000F6
69336+:10F38000152000073C0900013C0C1F0100EC58242B
69337+:10F390003C0A1000116A01183C1080003C09000171
69338+:10F3A00000E9302410C000173C0B10003C18080086
69339+:10F3B0008F1800243307000214E0014024030001E9
69340+:10F3C0008FBF001C8FB200188FB100148FB00010D7
69341+:10F3D0000060102103E0000827BD002000EE682433
69342+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
69343+:10F3F00036307FFF00F0382435E380000A0010A685
69344+:10F40000AF87000000EB102450400065AF8000245F
69345+:10F410008F8C002C3C0D0F0000ED18241580008807
69346+:10F42000AF83001030E8010011000086938F0010B8
69347+:10F430003C0A0200106A00833C1280003650010032
69348+:10F44000920500139789002A3626000230AF00FF8C
69349+:10F4500025EE0004000E19C03C0480008C9801B811
69350+:10F460000700FFFE34880180AD0300003C198008CE
69351+:10F47000AC830020973100483225FFFF10A0015CCB
69352+:10F48000AF8500082523001200A3F82B53E0015993
69353+:10F490008F850004348D010095AC00202402001AF1
69354+:10F4A00030E44000318BFFFFA102000B108001927D
69355+:10F4B0002563FFFE00A3502B154001908F8F0004A1
69356+:10F4C000A50300148F88000435050001AF850004F2
69357+:10F4D0003C08800035190180A729000EA729001AD1
69358+:10F4E0008F89000C30B18000A7270010AF290028B9
69359+:10F4F000A72600081220000E3C04800035020100FF
69360+:10F50000944C0016318BFFFC256400040088182100
69361+:10F510008C7F400033E6FFFF14C000053C048000F0
69362+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
69363+:10F53000240EBFFF00AE402434850180A4A800261D
69364+:10F54000ACA7002C3C071000AC8701B800001821C4
69365+:10F550008FBF001C8FB200188FB100148FB0001045
69366+:10F560000060102103E0000827BD00203C020BFFD3
69367+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
69368+:10F58000241100013C0608008CC6002C24C5000193
69369+:10F590003C010800AC25002C0A0010D42411000501
69370+:10F5A0008F85002410A0002FAF80001090A30000D2
69371+:10F5B000146000792419000310A0002A30E601002D
69372+:10F5C00010C000CC8F860010241F000210DF00C97D
69373+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
69374+:10F5E00014E0000201641824000018213C0D0800FA
69375+:10F5F00025AD0038006D1021904C00048F85002847
69376+:10F6000025830004000321C030A5FFFF3626000239
69377+:10F610000E000FDB000000000A00114D0000182151
69378+:10F6200000E8302414C0FF403C0F80000E00103D65
69379+:10F63000000000008F8700000A0010CAAF82000C93
69380+:10F64000938F00103C18080127189640000F90C0B7
69381+:10F6500002588021AF9000248F85002414A0FFD38E
69382+:10F66000AF8F00103C0480008C86400030C5010044
69383+:10F6700010A000BC322300043C0C08008D8C002438
69384+:10F6800024120004106000C23190000D3C04800080
69385+:10F690008C8D40003402FFFF11A201003231FFFBCC
69386+:10F6A0008C884000310A01005540000124110010EF
69387+:10F6B00030EE080011C000BE2419FFFB8F9800280F
69388+:10F6C0002F0F03EF51E000010219802430E90100FF
69389+:10F6D00011200014320800018F87002C14E000FB79
69390+:10F6E0008F8C000C3C05800034AB0100917F00132F
69391+:10F6F00033E300FF246A00042403FFFE0203802496
69392+:10F70000000A21C012000002023230253226FFFF1B
69393+:10F710000E000FDB9785002A1200FF290000182138
69394+:10F72000320800011100000D32180004240E0001FF
69395+:10F73000120E0002023230253226FFFF9785002A82
69396+:10F740000E000FDB00002021240FFFFE020F80249B
69397+:10F750001200FF1B00001821321800045300FF188C
69398+:10F760002403000102323025241200045612000145
69399+:10F770003226FFFF9785002A0E000FDB24040100CC
69400+:10F780002419FFFB021988241220FF0D0000182104
69401+:10F790000A0010E9240300011079009C00003021C8
69402+:10F7A00090AD00012402000211A200BE30EA004028
69403+:10F7B00090B90001241800011338007F30E900409F
69404+:10F7C0008CA600049785002A00C020210E000FDBC4
69405+:10F7D0003626000200004021010018218FBF001CC6
69406+:10F7E0008FB200188FB100148FB00010006010218C
69407+:10F7F00003E0000827BD0020360F010095EE000C45
69408+:10F8000031CD020015A0FEE63C0900013C1880083D
69409+:10F81000971200489789002A362600023248FFFFD7
69410+:10F82000AF8800083C0380008C7101B80620FFFE01
69411+:10F83000346A0180AD4000001100008E3C0F800052
69412+:10F84000253F0012011FC82B1320008B240E00033C
69413+:10F85000346C0100958B00202402001A30E4400033
69414+:10F860003163FFFFA142000B108000A72463FFFE5D
69415+:10F870000103682B15A000A52408FFFE34A5000194
69416+:10F88000A5430014AF8500043C0480002412BFFF90
69417+:10F8900000B2802434850180A4A9000EA4A9001A16
69418+:10F8A000A4A60008A4B00026A4A700103C071000DE
69419+:10F8B000AC8701B80A00114D000018213C038000FC
69420+:10F8C00034640100949F000E3C1908008F3900D861
69421+:10F8D0002404008033E5FFFF273100013C010800CC
69422+:10F8E000AC3100D80E000FDB240600030A00114DD6
69423+:10F8F00000001821240A000210CA00598F85002830
69424+:10F900003C0308008C6300D0240E0001106E005EE2
69425+:10F910002CCF000C24D2FFFC2E5000041600002136
69426+:10F9200000002021241800021078001B2CD9000CA4
69427+:10F9300024DFFFF82FE900041520FF330000202109
69428+:10F9400030EB020051600004000621C054C00022C8
69429+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
69430+:10F96000362600023C0908008D29002431300001B0
69431+:10F970005200FEF7000018219785002A3626000263
69432+:10F980000E000FDB000020210A00114D000018219D
69433+:10F990000A00119C241200021320FFE624DFFFF866
69434+:10F9A0000000202130A5FFFF0A00117D362600024D
69435+:10F9B0000A0011AC021980245120FF828CA6000499
69436+:10F9C0003C05080190A5964110A0FF7E2408000187
69437+:10F9D0000A0011F0010018210E000FDB3226000191
69438+:10F9E0008F8600108F8500280A00124F000621C064
69439+:10F9F0008F8500043C18800024120003371001801A
69440+:10FA0000A212000B0A00112E3C08800090A30001F6
69441+:10FA1000241100011071FF70240800012409000264
69442+:10FA20005069000430E60040240800010A0011F08B
69443+:10FA30000100182150C0FFFD240800013C0C80008B
69444+:10FA4000358B01009563001094A40002307FFFFF06
69445+:10FA5000509FFF62010018210A001284240800014F
69446+:10FA60002CA803EF1100FE56240300010A001239EE
69447+:10FA700000000000240E000335EA0180A14E000BB7
69448+:10FA80000A00121C3C04800011E0FFA2000621C005
69449+:10FA900030A5FFFF0A00117D362600020A0011A5DD
69450+:10FAA000241100201140FFC63C1280003650010096
69451+:10FAB000960F001094AE000231E80FFF15C8FFC08A
69452+:10FAC000000000000A0011E690B900013C060800A1
69453+:10FAD0008CC6003824C4FFFF14C00002018418241F
69454+:10FAE000000018213C0D080025AD0038006D1021E4
69455+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
69456+:10FB00000A00112C01EE28242408FFFE0A00121A14
69457+:10FB100000A8282427BDFFC8AFB00010AFBF003435
69458+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
69459+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
69460+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
69461+:10FB500001CF682435AC380C240B0003AE0C5000E8
69462+:10FB6000ACCB00083C010800AC2000200E001819A6
69463+:10FB7000000000003C0A0010354980513C06601628
69464+:10FB8000AE09537C8CC700003C0860148D0500A0B2
69465+:10FB90003C03FFFF00E320243C02535300051FC237
69466+:10FBA0001482000634C57C000003A08002869821E0
69467+:10FBB0008E7200043C116000025128218CBF007C31
69468+:10FBC0008CA200783C1E600037C420203C05080150
69469+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
69470+:10FBE0002406000A3C190001273996403C01080010
69471+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
69472+:10FC00002418FFF03C15570902F8B02412D502F56C
69473+:10FC100024040001AF80002C3C1480003697018042
69474+:10FC20003C1E080127DE9644369301008E900000AA
69475+:10FC30003205000310A0FFFD3207000110E000882C
69476+:10FC4000320600028E7100283C048000AE91002034
69477+:10FC50008E6500048E66000000A0382100C040219F
69478+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
69479+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
69480+:10FC80009675000E3C1208008E52002030AC4000E9
69481+:10FC900032AFFFFF264E000125ED00043C010800B5
69482+:10FCA000AC2E0020118000E8AF8D00283C18002009
69483+:10FCB00000B8B02412C000E530B980002408BFFFAE
69484+:10FCC00000A8382434C81000AF87000030E62000B8
69485+:10FCD00010C000E92409FFBF3C03000400E328240E
69486+:10FCE00010A00002010910243502004030EA010092
69487+:10FCF00011400010AF8200048F8B002C11600007B0
69488+:10FD00003C0D002000ED6024118000043C0F000435
69489+:10FD100000EF702411C00239000000009668001E38
69490+:10FD20009678001C3115FFFF0018B40002B690252C
69491+:10FD3000AF92000C30F910001320001324150001BD
69492+:10FD400030FF002017E0000A3C04100000E41024FB
69493+:10FD50001040000D3C0A0C003C090BFF00EA18247F
69494+:10FD60003525FFFF00A3302B10C0000830ED010047
69495+:10FD70003C0C08008D8C002C24150005258B0001FF
69496+:10FD80003C010800AC2B002C30ED010015A0000B4D
69497+:10FD90003C0500018F85000430AE400055C00007CF
69498+:10FDA0003C0500013C161F0100F690243C0F10009A
69499+:10FDB000124F01CE000000003C05000100E5302498
69500+:10FDC00010C000AF3C0C10003C1F08008FFF002447
69501+:10FDD00033E90002152000712403000100601021A6
69502+:10FDE000104000083C0680003C08800035180100E7
69503+:10FDF0008F0F00243C056020ACAF00140000000011
69504+:10FE00003C0680003C194000ACD9013800000000DD
69505+:10FE10005220001332060002262B0140262C0080BF
69506+:10FE2000240EFF80016E2024018E6824000D1940ED
69507+:10FE3000318A007F0004A9403172007F3C16200007
69508+:10FE400036C20002006A482502B2382500E2882541
69509+:10FE50000122F825ACDF0830ACD1083032060002B0
69510+:10FE600010C0FF723C188000370501408CA80000CC
69511+:10FE700024100040AF08002090AF000831E300706C
69512+:10FE8000107000D428790041532000082405006038
69513+:10FE9000241100201071000E3C0A40003C09800033
69514+:10FEA000AD2A01780A001304000000001465FFFB6E
69515+:10FEB0003C0A40000E001FFA000000003C0A40000F
69516+:10FEC0003C098000AD2A01780A00130400000000FC
69517+:10FED00090A90009241F00048CA70000312800FF0E
69518+:10FEE000111F01B22503FFFA2C7200061240001404
69519+:10FEF0003C0680008CA9000494A4000A310500FF90
69520+:10FF000000095E022D6A00083086FFFF15400002DE
69521+:10FF10002567000424070003240C000910AC01FA33
69522+:10FF200028AD000A11A001DE2410000A240E0008EA
69523+:10FF300010AE0028000731C000C038213C06800008
69524+:10FF40008CD501B806A0FFFE34D20180AE47000078
69525+:10FF500034CB0140916E0008240300023C0A4000AB
69526+:10FF600031C400FF00046A0001A86025A64C000807
69527+:10FF7000A243000B9562000A3C0810003C09800077
69528+:10FF8000A64200108D670004AE470024ACC801B83B
69529+:10FF9000AD2A01780A001304000000003C0A80002A
69530+:10FFA000354401009483000E3C0208008C4200D8C6
69531+:10FFB000240400803065FFFF245500013C01080047
69532+:10FFC000AC3500D80E000FDB240600030A001370C6
69533+:10FFD000000018210009320230D900FF2418000166
69534+:10FFE0001738FFD5000731C08F910020262200016D
69535+:10FFF000AF8200200A0013C800C0382100CB2024A3
69536+:020000021000EC
69537+:10000000AF85000010800008AF860004240D87FF34
69538+:1000100000CD6024158000083C0E006000AE302446
69539+:1000200010C00005000000000E000D42000000009E
69540+:100030000A001371000000000E0016050000000009
69541+:100040000A0013710000000030B980005320FF1F28
69542+:10005000AF8500003C02002000A2F82453E0FF1B03
69543+:10006000AF8500003C07FFFF34E47FFF00A4382485
69544+:100070000A00132B34C880000A001334010910242D
69545+:1000800000EC58245160005AAF8000248F8D002C62
69546+:100090003C0E0F0000EE182415A00075AF83001071
69547+:1000A00030EF010011E00073939800103C12020041
69548+:1000B000107200703C06800034D9010093280013B0
69549+:1000C0009789002A36A60002311800FF271600047F
69550+:1000D000001619C03C0480008C8501B804A0FFFE06
69551+:1000E00034880180AD0300003C158008AC830020FB
69552+:1000F00096BF004833E5FFFF10A001BCAF850008A4
69553+:100100002523001200A3102B504001B98F85000455
69554+:10011000348D010095AC0020240B001A30E440001F
69555+:10012000318AFFFFA10B000B108001BA2543FFFEAF
69556+:1001300000A3702B15C001B88F9600048F8F0004A8
69557+:10014000A503001435E50001AF8500043C088000DC
69558+:1001500035150180A6A9000EA6A9001A8F89000CEA
69559+:1001600030BF8000A6A70010AEA90028A6A60008F0
69560+:1001700013E0000F3C0F8000350C0100958B00163A
69561+:10018000316AFFFC25440004008818218C6240007D
69562+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
69563+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
69564+:1001B0002416BFFF00B6902435E50180A4B20026C6
69565+:1001C000ACA7002C3C071000ADE701B80A00137083
69566+:1001D000000018210E00165D000000003C0A4000DF
69567+:1001E0003C098000AD2A01780A00130400000000D9
69568+:1001F0008F85002410A00027AF80001090A300007E
69569+:10020000106000742409000310690101000030210E
69570+:1002100090AE0001240D000211CD014230EF0040EC
69571+:1002200090A90001241F0001113F000930E20040A5
69572+:100230008CA600049785002A00C020210E000FDB49
69573+:1002400036A60002000040210A00137001001821A8
69574+:100250005040FFF88CA600043C07080190E7964147
69575+:1002600010E0FFF4240800010A00137001001821B7
69576+:10027000939800103C1F080127FF96400018C8C043
69577+:10028000033F4021AF8800248F85002414A0FFDBAA
69578+:10029000AF9800103C0480008C86400030C50100FF
69579+:1002A00010A0008732AB00043C0C08008D8C0024A9
69580+:1002B00024160004156000033192000D241600027C
69581+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
69582+:1002D00032B5FFFB8C984000330F010055E0000160
69583+:1002E0002415001030E80800110000382409FFFB35
69584+:1002F0008F9F00282FF903EF53200001024990241B
69585+:1003000030E2010010400014325F00018F87002CA2
69586+:1003100014E0010E8F8C000C3C0480003486010038
69587+:1003200090C5001330AA00FF25430004000321C03C
69588+:100330002419FFFE025990241240000202B6302513
69589+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
69590+:1003500000001821325F000113E0000D3247000455
69591+:10036000240900011249000202B6302532A6FFFF1F
69592+:100370009785002A0E000FDB000020212402FFFEDB
69593+:10038000024290241240FE950000182132470004DA
69594+:1003900050E0FE922403000102B63025241600042A
69595+:1003A0005656000132A6FFFF9785002A0E000FDB8C
69596+:1003B000240401002403FFFB0243A82412A0FE87AB
69597+:1003C000000018210A001370240300010A0014B968
69598+:1003D0000249902410A0FFAF30E5010010A00017E3
69599+:1003E0008F8600102403000210C300148F84000CB9
69600+:1003F0003C0608008CC6003824CAFFFF14C0000267
69601+:10040000008A1024000010213C0E080025CE003880
69602+:10041000004E682191AC00048F850028258B0004D4
69603+:10042000000B21C030A5FFFF36A600020E000FDB37
69604+:10043000000000000A00137000001821240F0002C1
69605+:1004400010CF0088241600013C0308008C6300D004
69606+:100450001076008D8F85002824D9FFFC2F280004FA
69607+:100460001500006300002021241F0002107F005DA2
69608+:100470002CC9000C24C3FFF82C6200041440FFE9CF
69609+:100480000000202130EA020051400004000621C093
69610+:1004900054C0000530A5FFFF000621C030A5FFFFB6
69611+:1004A0000A00150436A600020E000FDB32A600017A
69612+:1004B0008F8600108F8500280A001520000621C0B5
69613+:1004C0003C0A08008D4A0024315200015240FE438C
69614+:1004D000000018219785002A36A600020E000FDBC7
69615+:1004E000000020210A001370000018219668000CFB
69616+:1004F000311802005700FE313C0500013C1F800806
69617+:1005000097F900489789002A36A600023328FFFF92
69618+:10051000AF8800083C0380008C7501B806A0FFFE80
69619+:100520003C04800034820180AC400000110000B621
69620+:1005300024180003252A0012010A182B106000B2AB
69621+:1005400000000000966F00203C0E8000240D001A71
69622+:1005500031ECFFFF35CA018030EB4000A14D000BAC
69623+:10056000116000B02583FFFE0103902B164000AE02
69624+:100570002416FFFE34A50001A5430014AF85000436
69625+:100580002419BFFF00B94024A6E9000EA6E9001A0D
69626+:10059000A6E60008A6E80026A6E700103C07100023
69627+:1005A000AE8701B80A001370000018213C048000D7
69628+:1005B0008C8201B80440FFFE349601802415001C93
69629+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
69630+:1005D0003C0A40003C098000AD2A01780A0013045F
69631+:1005E000000000005120FFA424C3FFF800002021D8
69632+:1005F00030A5FFFF0A00150436A600020E00103DCC
69633+:10060000000000008F8700000A001346AF82000C34
69634+:1006100090A30001241500011075FF0B24080001B0
69635+:10062000240600021066000430E2004024080001A5
69636+:100630000A001370010018215040FFFD240800013A
69637+:100640003C0C8000358B0100956A001094A40002D8
69638+:100650003143FFFF5083FDE1010018210A00158599
69639+:10066000240800018F8500282CB203EF1240FDDB27
69640+:10067000240300013C0308008C6300D02416000111
69641+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
69642+:10069000000621C030A5FFFF0A00150436A600029F
69643+:1006A00010B00037240F000B14AFFE23000731C039
69644+:1006B000312600FF00065600000A4E0305220047BF
69645+:1006C00030C6007F0006F8C03C16080126D69640CA
69646+:1006D00003F68021A2000001A20000003C0F600090
69647+:1006E0008DF918202405000100C588040011302769
69648+:1006F0000326C024000731C000C03821ADF81820FF
69649+:100700000A0013C8A60000028F850020000731C030
69650+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
69651+:100720002415002011E0FECC3C1980003728010080
69652+:100730009518001094B6000233120FFF16D2FEC6B1
69653+:10074000000000000A00148290A900013C0B080080
69654+:100750008D6B0038256DFFFF15600002018D1024A0
69655+:10076000000010213C080800250800380048C0217E
69656+:10077000930F000425EE00040A0014C5000E21C0EA
69657+:1007800000065202241F00FF115FFDEB000731C07D
69658+:10079000000A20C03C0E080125CE9640008EA821FC
69659+:1007A000009E602100095C02240D00013C076000EE
69660+:1007B000A2AD0000AD860000A2AB00018CF21820B3
69661+:1007C00024030001014310040242B025ACF61820B6
69662+:1007D00000C038210A0013C8A6A900020A0015AA01
69663+:1007E000AF8000200A0012FFAF84002C8F85000428
69664+:1007F0003C1980002408000337380180A308000B4F
69665+:100800000A00144D3C088000A2F8000B0A00155A9B
69666+:100810002419BFFF8F9600042412FFFE0A00144B18
69667+:1008200002D228242416FFFE0A00155800B62824F8
69668+:100830003C038000346401008C85000030A2003E3F
69669+:100840001440000800000000AC6000488C870000E5
69670+:1008500030E607C010C0000500000000AC60004C8E
69671+:10086000AC60005003E0000824020001AC600054BA
69672+:10087000AC6000408C880000310438001080FFF923
69673+:10088000000000002402000103E00008AC60004406
69674+:100890003C0380008C6201B80440FFFE3467018095
69675+:1008A000ACE4000024080001ACE00004A4E500086A
69676+:1008B00024050002A0E8000A34640140A0E5000B12
69677+:1008C0009483000A14C00008A4E30010ACE00024E4
69678+:1008D0003C07800034E901803C041000AD20002872
69679+:1008E00003E00008ACE401B88C8600043C0410006E
69680+:1008F000ACE600243C07800034E90180AD200028EC
69681+:1009000003E00008ACE401B83C0680008CC201B8EA
69682+:100910000440FFFE34C7018024090002ACE400005B
69683+:10092000ACE40004A4E50008A0E9000A34C50140D5
69684+:10093000A0E9000B94A8000A3C041000A4E80010F1
69685+:10094000ACE000248CA30004ACE3002803E0000822
69686+:10095000ACC401B83C039000346200010082202541
69687+:100960003C038000AC6400208C65002004A0FFFEE6
69688+:100970000000000003E00008000000003C028000CE
69689+:10098000344300010083202503E00008AC4400202C
69690+:1009900027BDFFE03C098000AFBF0018AFB10014D5
69691+:1009A000AFB00010352801408D10000091040009FF
69692+:1009B0009107000891050008308400FF30E600FF31
69693+:1009C00000061A002C820081008330251040002A86
69694+:1009D00030A50080000460803C0D080125AD92B078
69695+:1009E000018D58218D6A00000140000800000000C0
69696+:1009F0003C038000346201409445000A14A0001EAC
69697+:100A00008F91FCC09227000530E6000414C0001A44
69698+:100A1000000000000E00164E02002021922A000560
69699+:100A200002002021354900040E001658A2290005B5
69700+:100A30009228000531040004148000020000000028
69701+:100A40000000000D922D0000240B002031AC00FFAF
69702+:100A5000158B00093C0580008CAE01B805C0FFFE77
69703+:100A600034B10180AE3000003C0F100024100005AE
69704+:100A7000A230000BACAF01B80000000D8FBF001812
69705+:100A80008FB100148FB0001003E0000827BD0020D4
69706+:100A90000200202100C028218FBF00188FB1001450
69707+:100AA0008FB00010240600010A00161D27BD00208B
69708+:100AB0000000000D0200202100C028218FBF001877
69709+:100AC0008FB100148FB00010000030210A00161DF5
69710+:100AD00027BD002014A0FFE8000000000200202134
69711+:100AE0008FBF00188FB100148FB0001000C02821F4
69712+:100AF0000A00163B27BD00203C0780008CEE01B8A1
69713+:100B000005C0FFFE34F00180241F0002A21F000B6D
69714+:100B100034F80140A60600089719000A3C0F10009F
69715+:100B2000A61900108F110004A6110012ACEF01B835
69716+:100B30000A0016998FBF001827BDFFE8AFBF00104D
69717+:100B40000E000FD4000000003C0280008FBF001098
69718+:100B500000002021AC4001800A00108F27BD001842
69719+:100B60003084FFFF30A5FFFF108000070000182130
69720+:100B7000308200011040000200042042006518216C
69721+:100B80001480FFFB0005284003E0000800601021EE
69722+:100B900010C00007000000008CA2000024C6FFFF68
69723+:100BA00024A50004AC82000014C0FFFB24840004D0
69724+:100BB00003E000080000000010A0000824A3FFFFCD
69725+:100BC000AC86000000000000000000002402FFFFCF
69726+:100BD0002463FFFF1462FFFA2484000403E000088A
69727+:100BE000000000003C03800027BDFFF83462018054
69728+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
69729+:100C00003C0B80008D6401B80480FFFE00000000F2
69730+:100C10008FA900008D6801288FAA00008FA700000F
69731+:100C20008FA400002405000124020002A085000A10
69732+:100C30008FA30000359940003C051000A062000B16
69733+:100C40008FB800008FAC00008FA600008FAF0000AF
69734+:100C500027BD0008AD280000AD400004AD80002491
69735+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
69736+:100C700003E00008AD6501B83C06800827BDFFE829
69737+:100C800034C50080AFBF001090A7000924020012F5
69738+:100C900030E300FF1062000B008030218CA8005070
69739+:100CA00000882023048000088FBF00108CAA003425
69740+:100CB000240400390000282100CA4823052000052B
69741+:100CC000240600128FBF00102402000103E0000878
69742+:100CD00027BD00180E0016F2000000008FBF0010A4
69743+:100CE0002402000103E0000827BD001827BDFFC84B
69744+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
69745+:100D000000A0802190A5000D30A6001010C000109A
69746+:100D1000008090213C0280088C4400048E0300086F
69747+:100D20001064000C30A7000530A6000510C0009329
69748+:100D3000240400018FBF00348FB200308FB1002C2B
69749+:100D40008FB000280080102103E0000827BD003884
69750+:100D500030A7000510E0000F30AB001210C00006F5
69751+:100D6000240400013C0980088E0800088D25000439
69752+:100D70005105009C240400388FBF00348FB200302E
69753+:100D80008FB1002C8FB000280080102103E00008F4
69754+:100D900027BD0038240A0012156AFFE6240400016A
69755+:100DA0000200202127A500100E000CB6AFA00010F5
69756+:100DB0001440007C3C19800837240080909800087B
69757+:100DC000331100081220000A8FA7001030FF010025
69758+:100DD00013E000A48FA300148C8600580066102333
69759+:100DE000044000043C0A8008AC8300588FA7001020
69760+:100DF0003C0A800835480080910900083124000829
69761+:100E00001480000224080003000040213C1F8008D9
69762+:100E100093F1001193F9001237E600808CCC005456
69763+:100E2000333800FF03087821322D00FF000F708057
69764+:100E300001AE282100AC582B1160006F00000000AB
69765+:100E400094CA005C8CC900543144FFFF0125102373
69766+:100E50000082182B14600068000000008CCB005446
69767+:100E60000165182330EC00041180006C000830800C
69768+:100E70008FA8001C0068102B1040006230ED0004A9
69769+:100E8000006610232C46008010C00002004088211C
69770+:100E9000241100800E00164E024020213C0D8008D7
69771+:100EA00035A6008024070001ACC7000C90C80008DC
69772+:100EB0000011484035A70100310C007FA0CC00088C
69773+:100EC0008E05000424AB0001ACCB0030A4D1005C43
69774+:100ED0008CCA003C9602000E01422021ACC40020C6
69775+:100EE0008CC3003C0069F821ACDF001C8E190004A3
69776+:100EF000ACF900008E180008ACF800048FB10010A7
69777+:100F0000322F000855E0004793A60020A0C0004EF5
69778+:100F100090D8004E2411FFDFA0F8000890CF000801
69779+:100F200001F17024A0CE00088E0500083C0B80085B
69780+:100F300035690080AD2500388D6A00148D2200309F
69781+:100F40002419005001422021AD24003491230000D7
69782+:100F5000307F00FF13F90036264F01000E001658AF
69783+:100F60000240202124040038000028210E0016F23F
69784+:100F70002406000A0A001757240400010E000D2859
69785+:100F8000000020218FBF00348FB200308FB1002CC1
69786+:100F90008FB00028004020210080102103E00008CD
69787+:100FA00027BD00388E0E00083C0F800835F0008009
69788+:100FB000AE0E005402402021AE0000300E00164E4E
69789+:100FC00000000000920D00250240202135AC0020D9
69790+:100FD0000E001658A20C00250E000CAC0240202179
69791+:100FE000240400382405008D0E0016F22406001299
69792+:100FF0000A0017572404000194C5005C0A001792E8
69793+:1010000030A3FFFF2407021811A0FF9E00E6102363
69794+:101010008FAE001C0A00179A01C610230A0017970A
69795+:101020002C620218A0E600080A0017C48E0500080A
69796+:101030002406FF8001E6C0243C118000AE38002861
69797+:101040008E0D000831E7007F3C0E800C00EE602121
69798+:10105000AD8D00E08E080008AF8C00380A0017D074
69799+:10106000AD8800E4AC800058908500082403FFF7A9
69800+:1010700000A33824A08700080A0017758FA7001066
69801+:101080003C05080024A560A83C04080024846FF4F3
69802+:101090003C020800244260B0240300063C01080121
69803+:1010A000AC2596C03C010801AC2496C43C01080163
69804+:1010B000AC2296C83C010801A02396CC03E00008AE
69805+:1010C0000000000003E00008240200013C02800050
69806+:1010D000308800FF344701803C0680008CC301B893
69807+:1010E0000460FFFE000000008CC501282418FF806A
69808+:1010F0003C0D800A24AF010001F8702431EC007F20
69809+:10110000ACCE0024018D2021ACE50000948B00EAD8
69810+:101110003509600024080002316AFFFFACEA0004D0
69811+:1011200024020001A4E90008A0E8000BACE00024C0
69812+:101130003C071000ACC701B8AF84003803E00008DA
69813+:10114000AF85006C938800488F8900608F820038DB
69814+:1011500030C600FF0109382330E900FF01221821C1
69815+:1011600030A500FF2468008810C000020124382147
69816+:101170000080382130E400031480000330AA00030B
69817+:101180001140000D312B000310A0000900001021B8
69818+:1011900090ED0000244E000131C200FF0045602B9D
69819+:1011A000A10D000024E700011580FFF925080001CA
69820+:1011B00003E00008000000001560FFF300000000DD
69821+:1011C00010A0FFFB000010218CF80000245900043F
69822+:1011D000332200FF0045782BAD18000024E70004FF
69823+:1011E00015E0FFF92508000403E0000800000000F6
69824+:1011F00093850048938800588F8700600004320070
69825+:101200003103007F00E5102B30C47F001040000F39
69826+:10121000006428258F8400383C0980008C8A00EC0B
69827+:10122000AD2A00A43C03800000A35825AC6B00A0AD
69828+:101230008C6C00A00580FFFE000000008C6D00ACEF
69829+:10124000AC8D00EC03E000088C6200A80A00188254
69830+:101250008F840038938800593C0280000080502120
69831+:10126000310300FEA383005930ABFFFF30CC00FFF9
69832+:1012700030E7FFFF344801803C0980008D2401B82D
69833+:101280000480FFFE8F8D006C24180016AD0D000049
69834+:101290008D2201248F8D0038AD0200048D5900206D
69835+:1012A000A5070008240201C4A119000AA118000B17
69836+:1012B000952F01208D4E00088D4700049783005C18
69837+:1012C0008D59002401CF302100C7282100A32023FD
69838+:1012D0002418FFFFA504000CA50B000EA5020010AA
69839+:1012E000A50C0012AD190018AD18002495AF00E848
69840+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
69841+:101300008DAC0084AD0C002CAD2B01B88D460020B7
69842+:1013100000C7282403E00008AD4500208F8800386E
69843+:101320000080582130E7FFFF910900D63C02800081
69844+:1013300030A5FFFF312400FF00041A00006750258C
69845+:1013400030C600FF344701803C0980008D2C01B875
69846+:101350000580FFFE8F82006C240F0017ACE20000B6
69847+:101360008D390124ACF900048D780020A4EA00082E
69848+:10137000241901C4A0F8000AA0EF000B9523012056
69849+:101380008D6E00088D6D00049784005C01C35021B0
69850+:10139000014D602101841023A4E2000CA4E5000E9D
69851+:1013A000A4F90010A4E60012ACE000148D7800242B
69852+:1013B000240DFFFFACF800188D0F007CACEF001C73
69853+:1013C0008D0E00783C0F1000ACEE0020ACED002438
69854+:1013D000950A00BE240DFFF73146FFFFACE600285A
69855+:1013E000950C00809504008231837FFF0003CA00C2
69856+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
69857+:10140000950E00828D6A002000AE3021014D282407
69858+:10141000A506008203E00008AD6500203C028000C4
69859+:10142000344501803C0480008C8301B80460FFFED9
69860+:101430008F8A0044240600199549001C3128FFFFBB
69861+:10144000000839C0ACA70000A0A6000B3C051000A6
69862+:1014500003E00008AC8501B88F87004C0080402174
69863+:1014600030C400FF3C0680008CC201B80440FFFE7F
69864+:101470008F89006C9383006834996000ACA90000E8
69865+:10148000A0A300058CE20010240F00022403FFF744
69866+:10149000A4A20006A4B900088D180020A0B8000A74
69867+:1014A000A0AF000B8CEE0000ACAE00108CED000481
69868+:1014B000ACAD00148CEC001CACAC00248CEB002018
69869+:1014C000ACAB00288CEA002C3C071000ACAA002C26
69870+:1014D0008D090024ACA90018ACC701B88D05002007
69871+:1014E00000A3202403E00008AD0400208F8600380C
69872+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
69873+:1015000090C300D430A500FF3062002010400008D6
69874+:10151000008088218CCB00D02409FFDF256A0001E0
69875+:10152000ACCA00D090C800D401093824A0C700D4A8
69876+:1015300014A000403C0C80008F840038908700D4B9
69877+:101540002418FFBF2406FFEF30E3007FA08300D400
69878+:10155000979F005C8F8200608F8D003803E2C82364
69879+:10156000A799005CA5A000BC91AF00D401F870243D
69880+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
69881+:10158000A5400082AD4000EC914500D400A658244F
69882+:10159000A14B00D48F9000348F8400609786005C4C
69883+:1015A0000204282110C0000FAF850034A38000582A
69884+:1015B0003C0780008E2C000894ED01208E2B000447
69885+:1015C000018D5021014B8021020620233086FFFF30
69886+:1015D00030C8000F3909000131310001162000091F
69887+:1015E000A3880058938600488FBF00188FB100145D
69888+:1015F0008FB0001027BD0020AF85006403E0000815
69889+:10160000AF86006000C870238FBF00189386004823
69890+:101610008FB100148FB0001034EF0C00010F28219F
69891+:1016200027BD0020ACEE0084AF85006403E0000815
69892+:10163000AF86006035900180020028210E00190F4E
69893+:10164000240600828F840038908600D430C5004084
69894+:1016500050A0FFBAA38000688F85004C3C06800034
69895+:101660008CCD01B805A0FFFE8F89006C2408608234
69896+:1016700024070002AE090000A6080008A207000B1C
69897+:101680008CA300083C0E1000AE0300108CA2000CCE
69898+:10169000AE0200148CBF0014AE1F00188CB90018E5
69899+:1016A000AE1900248CB80024AE1800288CAF002896
69900+:1016B000AE0F002CACCE01B80A001948A380006818
69901+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
69902+:1016D0008F880060AFBF00189389003C954200BC22
69903+:1016E00030D100FF0109182B0080802130AC00FFB1
69904+:1016F0003047FFFF0000582114600003310600FF4F
69905+:1017000001203021010958239783005C0068202BB9
69906+:101710001480002700000000106800562419000102
69907+:101720001199006334E708803165FFFF0E0018C08F
69908+:10173000020020218F83006C3C07800034E601808A
69909+:101740003C0580008CAB01B80560FFFE240A001840
69910+:101750008F840038ACC30000A0CA000B948900BE7F
69911+:101760003C081000A4C90010ACC00030ACA801B8FF
69912+:101770009482008024430001A4830080949F008011
69913+:101780003C0608008CC6318833EC7FFF1186005E72
69914+:101790000000000002002021022028218FBF001835
69915+:1017A0008FB100148FB000100A00193427BD00203B
69916+:1017B000914400D42403FF8000838825A15100D4E4
69917+:1017C0009784005C3088FFFF51000023938C003C1D
69918+:1017D0008F8500382402EFFF008B782394AE00BC85
69919+:1017E0000168502B31E900FF01C26824A4AD00BCA0
69920+:1017F00051400039010058213C1F800037E60100AC
69921+:101800008CD800043C190001031940245500000144
69922+:1018100034E740008E0A00202403FFFB241100015E
69923+:1018200001432024AE0400201191002D34E78000F4
69924+:1018300002002021012030210E0018C03165FFFF79
69925+:101840009787005C8F890060A780005C0127802358
69926+:10185000AF900060938C003C8F8B00388FBF0018D6
69927+:101860008FB100148FB0001027BD002003E00008E6
69928+:10187000A16C00D73C0D800035AA01008D48000402
69929+:101880003C0900010109282454A0000134E740006C
69930+:101890008E0F00202418FFFB34E7800001F870242D
69931+:1018A00024190001AE0E00201599FF9F34E708802F
69932+:1018B000020020210E00188E3165FFFF020020215A
69933+:1018C000022028218FBF00188FB100148FB00010A4
69934+:1018D0000A00193427BD00200A0019F7000048212A
69935+:1018E00002002021012030210E00188E3165FFFFFB
69936+:1018F0009787005C8F890060A780005C01278023A8
69937+:101900000A001A0EAF900060948C0080241F8000A3
69938+:10191000019F3024A4860080908B0080908F0080EF
69939+:10192000316700FF0007C9C20019C027001871C045
69940+:1019300031ED007F01AE2825A08500800A0019DF67
69941+:1019400002002021938500682403000127BDFFE8E1
69942+:1019500000A330042CA20020AFB00010AFBF0014D1
69943+:1019600000C01821104000132410FFFE3C0708009F
69944+:101970008CE7319000E610243C088000350501809A
69945+:1019800014400005240600848F890038240A0004CE
69946+:101990002410FFFFA12A00FC0E00190F0000000018
69947+:1019A000020010218FBF00148FB0001003E0000868
69948+:1019B00027BD00183C0608008CC631940A001A574F
69949+:1019C00000C310248F87004427BDFFE0AFB200188A
69950+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
69951+:1019E00090E6000D00A088210080902130C5007F86
69952+:1019F000A0E5000D8F8500388E2300188CA200D042
69953+:101A00001062002E240A000E0E001A4AA38A0068F3
69954+:101A10002409FFFF104900222404FFFF5200002088
69955+:101A2000000020218E2600003C0C001000CC582421
69956+:101A3000156000393C0E000800CE682455A0003F18
69957+:101A4000024020213C18000200D880241200001F10
69958+:101A50003C0A00048F8700448CE200148CE30010E1
69959+:101A60008CE500140043F82303E5C82B1320000580
69960+:101A7000024020218E24002C8CF1001010910031A6
69961+:101A80000240202124020012A38200680E001A4A9C
69962+:101A90002412FFFF105200022404FFFF0000202147
69963+:101AA0008FBF001C8FB200188FB100148FB00010D0
69964+:101AB0000080102103E0000827BD002090A800D47A
69965+:101AC000350400200A001A80A0A400D400CA4824CB
69966+:101AD0001520000B8F8B00448F8D00448DAC0010BF
69967+:101AE0001580000B024020218E2E002C51C0FFECEF
69968+:101AF00000002021024020210A001A9B2402001726
69969+:101B00008D66001050C0FFE6000020210240202119
69970+:101B10000A001A9B24020011024020212402001511
69971+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
69972+:101B30002404FFFF0A001A8A8E2600000A001AC138
69973+:101B4000240200143C08000400C8382450E0FFD4EC
69974+:101B500000002021024020210A001A9B24020013C9
69975+:101B60008F85003827BDFFD8AFB3001CAFB2001877
69976+:101B7000AFB10014AFB00010AFBF002090A700D4E9
69977+:101B80008F90004C2412FFFF34E2004092060000C8
69978+:101B9000A0A200D48E0300100080982110720006CD
69979+:101BA00030D1003F2408000D0E001A4AA3880068B7
69980+:101BB000105200252404FFFF8F8A00388E09001878
69981+:101BC0008D4400D01124000702602021240C000E57
69982+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
69983+:101BE0002404FFFF24040020122400048F8D0038F9
69984+:101BF00091AF00D435EE0020A1AE00D48F85005403
69985+:101C000010A00019000000001224004A8F9800382C
69986+:101C10008F92FCC0971000809651000A5230004805
69987+:101C20008F9300403C1F08008FFF318C03E5C82BC9
69988+:101C30001720001E02602021000028210E0019A993
69989+:101C400024060001000020218FBF00208FB3001C5C
69990+:101C50008FB200188FB100148FB0001000801021D7
69991+:101C600003E0000827BD00285224002A8E05001436
69992+:101C70008F840038948A008025490001A48900805F
69993+:101C8000948800803C0208008C42318831077FFF35
69994+:101C900010E2000E00000000026020210E00193446
69995+:101CA000240500010A001B0B000020212402002D46
69996+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
69997+:101CC0002404FFFF0A001B0C8FBF002094990080A2
69998+:101CD000241F800024050001033FC024A498008035
69999+:101CE00090920080908E0080325100FF001181C2DE
70000+:101CF00000107827000F69C031CC007F018D582576
70001+:101D0000A08B00800E001934026020210A001B0BFA
70002+:101D1000000020212406FFFF54A6FFD68F84003840
70003+:101D2000026020210E001934240500010A001B0B5B
70004+:101D300000002021026020210A001B252402000A45
70005+:101D40002404FFFD0A001B0BAF9300608F8800384E
70006+:101D500027BDFFE8AFB00010AFBF0014910A00D458
70007+:101D60008F87004C00808021354900408CE60010B0
70008+:101D7000A10900D43C0208008C4231B030C53FFFBD
70009+:101D800000A2182B106000078F850050240DFF80E3
70010+:101D900090AE000D01AE6024318B00FF156000088D
70011+:101DA0000006C382020020212403000D8FBF00140F
70012+:101DB0008FB0001027BD00180A001A4AA3830068DC
70013+:101DC00033060003240F000254CFFFF70200202146
70014+:101DD00094A2001C8F85003824190023A4A200E8D7
70015+:101DE0008CE8000000081E02307F003F13F9003528
70016+:101DF0003C0A00838CE800188CA600D0110600086D
70017+:101E0000000000002405000E0E001A4AA385006899
70018+:101E10002407FFFF104700182404FFFF8F850038B8
70019+:101E200090A900D435240020A0A400D48F8C0044B5
70020+:101E3000918E000D31CD007FA18D000D8F83005458
70021+:101E40001060001C020020218F8400508C9800102C
70022+:101E50000303782B11E0000D241900180200202143
70023+:101E6000A39900680E001A4A2410FFFF10500002C8
70024+:101E70002404FFFF000020218FBF00148FB000104A
70025+:101E80000080102103E0000827BD00188C86001098
70026+:101E90008F9F00440200202100C31023AFE20010F6
70027+:101EA000240500010E0019A9240600010A001B9751
70028+:101EB000000020210E001934240500010A001B97A0
70029+:101EC00000002021010A5824156AFFD98F8C004494
70030+:101ED000A0A600FC0A001B84A386005A30A500FFC0
70031+:101EE0002406000124A9000100C9102B1040000C99
70032+:101EF00000004021240A000100A61823308B0001B5
70033+:101F000024C60001006A3804000420421160000267
70034+:101F100000C9182B010740251460FFF800A61823FC
70035+:101F200003E000080100102127BDFFD8AFB0001862
70036+:101F30008F90004CAFB1001CAFBF00202403FFFF07
70037+:101F40002411002FAFA30010920600002405000802
70038+:101F500026100001006620260E001BB0308400FF12
70039+:101F600000021E003C021EDC34466F410A001BD8F2
70040+:101F70000000102110A00009008018212445000154
70041+:101F800030A2FFFF2C4500080461FFFA0003204047
70042+:101F90000086202614A0FFF9008018210E001BB037
70043+:101FA000240500208FA300102629FFFF313100FFF8
70044+:101FB00000034202240700FF1627FFE20102182651
70045+:101FC00000035027AFAA0014AFAA00100000302170
70046+:101FD00027A8001027A7001400E6782391ED00033E
70047+:101FE00024CE000100C8602131C600FF2CCB0004C4
70048+:101FF0001560FFF9A18D00008FA200108FBF002097
70049+:102000008FB1001C8FB0001803E0000827BD002826
70050+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
70051+:10202000AFB50024AFB40020AFB20018AFB10014B8
70052+:102030003C0C80008D880128240FFF803C06800A1C
70053+:1020400025100100250B0080020F68243205007F57
70054+:10205000016F7024AD8E009000A62821AD8D002464
70055+:1020600090A600FC3169007F3C0A8004012A1821F7
70056+:10207000A386005A9067007C00809821AF830030CF
70057+:1020800030E20002AF88006CAF85003800A0182154
70058+:10209000144000022404003424040030A3840048C7
70059+:1020A0008C7200DC30D100FF24040004AF92006089
70060+:1020B00012240004A38000688E7400041680001EA1
70061+:1020C0003C0880009386005930C7000110E0000FE3
70062+:1020D0008F9300608CB000848CA800842404FF805F
70063+:1020E000020410240002F940310A007F03EA482567
70064+:1020F0003C0C2000012C902530CD00FE3C038000DC
70065+:10210000AC720830A38D00598F9300608FBF0028F8
70066+:102110008FB50024ACB300DC8FB400208FB3001C5B
70067+:102120008FB200188FB100148FB00010240200018C
70068+:1021300003E0000827BD00308E7F000895020120D3
70069+:102140008E67001003E2C8213326FFFF30D8000F4E
70070+:1021500033150001AF87003416A00058A39800582B
70071+:1021600035090C000309382100D81823AD03008479
70072+:10217000AF8700648E6A00043148FFFF1100007EC3
70073+:10218000A78A005C90AC00D42407FF8000EC3024C8
70074+:1021900030CB00FF1560004B9786005C938E005A91
70075+:1021A000240D000230D5FFFF11CD02A20000A021B6
70076+:1021B0008F85006002A5802B160000BC9388004824
70077+:1021C0003C11800096240120310400FF1485008812
70078+:1021D0008F8400648F9800343312000356400085CA
70079+:1021E00030A500FF8F900064310C00FF24060034FE
70080+:1021F00011860095AF90004C9204000414800118E1
70081+:102200008F8E0038A380003C8E0D00048DC800D84E
70082+:102210003C0600FF34CCFFFF01AC30240106182B34
70083+:1022200014600120AF8600548F8700609798005C8F
70084+:10223000AF8700400307402310C000C7A788005C99
70085+:102240008F91003030C3000300035823922A007C92
70086+:102250003171000302261021000A20823092000111
70087+:102260000012488000492821311FFFFF03E5C82BD9
70088+:10227000132001208F8800388F8500348F880064F8
70089+:102280001105025A3C0E3F018E0600003C0C250051
70090+:1022900000CE682411AC01638F84004C30E500FF50
70091+:1022A0000E00184A000030218F8800388F870060A8
70092+:1022B0008F8500340A001DB78F8600540A001C5613
70093+:1022C000AF87006490A400D400E48024320200FFB1
70094+:1022D000104000169386005990A6008890AE00D753
70095+:1022E00024A8008830D4003F2686FFE02CD10020AF
70096+:1022F000A38E003C1220000CAF88004C240B000180
70097+:1023000000CB20043095001916A0012B3C0680005C
70098+:1023100034CF0002008FC0241700022E3099002015
70099+:1023200017200234000000009386005930CB0001D2
70100+:102330001160000F9788005C8CBF00848CA900841A
70101+:10234000240AFF8003EA6024000C19403132007F28
70102+:10235000007238253C0D200000EDC82530D800FE65
70103+:102360003C0F8000ADF90830A39800599788005CB5
70104+:102370001500FF84000000008E630020306200041E
70105+:102380001040FF51938600592404FFFB0064802411
70106+:102390003C038000AE700020346601808C7301B86D
70107+:1023A0000660FFFE8F98006C347501003C1400013C
70108+:1023B000ACD800008C6B012424076085ACCB0004F2
70109+:1023C0008EAE000401D488245220000124076083CB
70110+:1023D00024190002A4C700083C0F1000A0D9000B6C
70111+:1023E0003C068000ACCF01B80A001C2B9386005934
70112+:1023F00030A500FF0E00184A240600018F88006CEB
70113+:102400003C05800034A90900250201889388004812
70114+:10241000304A0007304B00783C0340802407FF809F
70115+:102420000163C825014980210047F824310C00FFD1
70116+:1024300024060034ACBF0800AF90004CACB90810C3
70117+:102440005586FF6E920400048F8400388E11003090
70118+:10245000908E00D431CD001015A000108F83006045
70119+:102460002C6F000515E000E400000000909800D4F7
70120+:102470002465FFFC331200101640000830A400FF52
70121+:102480008F9F00648F99003413F90004388700018E
70122+:1024900030E20001144001C8000000000E001BC320
70123+:1024A000000000000A001DF8000000008F84006496
70124+:1024B00030C500FF0E00184A24060001939800481A
70125+:1024C000240B0034130B00A08F8500388F8600602A
70126+:1024D0009783005C306EFFFF00CE8823AF910060D1
70127+:1024E000A780005C1280FF90028018212414FFFD59
70128+:1024F0005474FFA28E6300208E6A00042403FFBF81
70129+:102500002408FFEF0155F823AE7F000490AC00D4FF
70130+:102510003189007FA0A900D48E7200208F8F0038EF
70131+:10252000A780005C364D0002AE6D0020A5E000BC27
70132+:1025300091E500D400A3C824A1F900D48F950038F8
70133+:10254000AEA000EC92B800D403085824A2AB00D48B
70134+:102550000A001CD78F8500388F910034AF8000604F
70135+:1025600002275821AF8B0034000020212403FFFFF5
70136+:10257000108301B48F8500388E0C00103C0D0800CC
70137+:102580008DAD31B09208000031843FFF008D802B6B
70138+:1025900012000023310D003F3C1908008F3931A88B
70139+:1025A0008F9F006C000479802408FF80033F202166
70140+:1025B000008FC821938500590328F8243C06008029
70141+:1025C0003C0F800034D80001001F91403331007F60
70142+:1025D0008F8600380251502535EE0940332B0078A4
70143+:1025E000333000073C0310003C02800C017890253A
70144+:1025F000020E48210143C0250222382134AE0001D9
70145+:10260000ADFF0804AF890050ADF20814AF87004455
70146+:10261000ADFF0028ACD90084ADF80830A38E005976
70147+:102620009383005A24070003106700272407000142
70148+:102630001467FFAC8F8500382411002311B1008589
70149+:1026400000000000240E000B026020210E001A4A38
70150+:10265000A38E00680040A0210A001D328F8500383B
70151+:1026600002602021240B000C0E001A4AA38B006884
70152+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
70153+:10268000A380003C8E0D00048DC800D83C0600FFDE
70154+:1026900034CCFFFF01AC30240106182B1060FEE2A1
70155+:1026A000AF86005402602021241200190E001A4A3D
70156+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
70157+:1026C0000A001C838F86005425A3FFE02C74002091
70158+:1026D0001280FFDD240E000B000328803C1108014E
70159+:1026E000263194B400B148218D2D000001A00008CE
70160+:1026F000000000008F85003400A710219385003C66
70161+:10270000AF82003402251821A383003C951F00BC32
70162+:102710000226282137F91000A51900BC5240FF926B
70163+:10272000AF850060246A0004A38A003C950900BCC0
70164+:1027300024A40004AF84006035322000A51200BC40
70165+:102740000A001D54000020218F8600602CC800055F
70166+:102750001500FF609783005C3065FFFF00C5C8234C
70167+:102760002F2F000511E00003306400FF24CDFFFC93
70168+:1027700031A400FF8F8900648F920034113200046D
70169+:10278000389F000133EC0001158001380000000083
70170+:102790008F840038908700D434E60010A08600D4DF
70171+:1027A0008F8500388F8600609783005CACA000ECBA
70172+:1027B0000A001D2F306EFFFF8CB500848CB400849E
70173+:1027C0003C04100002A7302400068940328E007FAE
70174+:1027D000022E8025020410253C08800024050001FB
70175+:1027E00002602021240600010E0019A9AD02083064
70176+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
70177+:102800000260202124090005A38900680E001A4AED
70178+:102810002411FFFF1451FE782404FFFF0A001D5508
70179+:102820002403FFFF8F8F004C8F8800388DF8000045
70180+:10283000AD1800888DE70010AD0700988F87006005
70181+:102840000A001DB78F8600542406FFFF118600057D
70182+:10285000000000000E001B4C026020210A001D8FAA
70183+:102860000040A0210E001AD1026020210A001D8F15
70184+:102870000040A0218F90004C3C0208008C4231B0F7
70185+:102880008E110010322C3FFF0182282B10A0000C6B
70186+:10289000240BFF808F85005090A3000D01637024EE
70187+:1028A00031CA00FF1140000702602021001143825D
70188+:1028B000310600032418000110D8010600000000B2
70189+:1028C000026020212403000D0E001A4AA383006831
70190+:1028D000004020218F8500380A001D320080A02191
70191+:1028E0008F90004C3C0A08008D4A31B08F85005013
70192+:1028F0008E0400100000A0218CB1001430823FFF34
70193+:10290000004A602B8CB200205180FFEE0260202133
70194+:1029100090B8000D240BFF800178702431C300FFB4
70195+:102920005060FFE80260202100044382310600036A
70196+:1029300014C0FFE40260202194BF001C8F9900386E
70197+:102940008E060028A73F00E88CAF0010022F20233E
70198+:1029500014C4013A026020218F83005400C368210F
70199+:10296000022D382B14E00136240200188F8A00440F
70200+:102970008F820030024390218D4B00100163702341
70201+:10298000AD4E0010AD5200208C4C00740192282BEB
70202+:1029900014A0015F026020218F8400508E08002463
70203+:1029A0008C86002411060007026020212419001CD7
70204+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
70205+:1029C0002404FFFF8F8400448C87002424FF00012F
70206+:1029D000AC9F00241251012F8F8D00308DB10074F7
70207+:1029E0001232012C3C0B00808E0E000001CB5024D3
70208+:1029F00015400075000000008E0300142411FFFF35
70209+:102A0000107100073C0808003C0608008CC6319095
70210+:102A100000C8C0241300015202602021A380006876
70211+:102A20008E0300003C19000100792024108000135F
70212+:102A30003C1F0080007FA02416800009020028218E
70213+:102A4000026020212411001A0E001A4AA391006886
70214+:102A50002407FFFF1047FF9F2404FFFF02002821E7
70215+:102A6000026020210E001A6A240600012410FFFFD4
70216+:102A70001050FF982404FFFF241400018F8D0044A0
70217+:102A8000026020210280302195A900342405000134
70218+:102A9000253200010E0019A9A5B200340000202142
70219+:102AA0008F8500380A001D320080A0218F90004CD5
70220+:102AB0003C1408008E9431B08E07001030E53FFFC3
70221+:102AC00000B4C82B132000618F8600502412FF80B1
70222+:102AD00090C9000D0249682431A400FF5080005CB9
70223+:102AE000026020218F8C00541180000700078B8228
70224+:102AF0008F8500388F82FCC094BF0080944A000A02
70225+:102B0000515F00F78F8600403227000314E0006415
70226+:102B100000000000920E000211C000D8000000006A
70227+:102B20008E0B0024156000D902602021920400035E
70228+:102B300024190002308500FF14B90005308900FF18
70229+:102B40008F940054128000EA240D002C308900FF7D
70230+:102B5000392C00102D8400012D3200010244302553
70231+:102B6000020028210E001A6A026020212410FFFFB3
70232+:102B7000105000BF8F8500388F830054106000D341
70233+:102B8000240500013C0A08008D4A318C0143F82BD2
70234+:102B900017E000B22402002D02602021000028214D
70235+:102BA0000E0019A9240600018F85003800001821A5
70236+:102BB0000A001D320060A0210E0018750000000000
70237+:102BC0000A001DF800000000AC8000200A001E78FA
70238+:102BD0008E03001400002821026020210E0019A994
70239+:102BE000240600010A001CC38F8500380A001DB7A7
70240+:102BF0008F8800388CAA00848CAC00843C031000C1
70241+:102C00000147F824001F91403189007F024968255F
70242+:102C100001A32825ACC50830910700012405000157
70243+:102C2000026020210E0019A930E600010A001CC331
70244+:102C30008F850038938F00482403FFFD0A001D3460
70245+:102C4000AF8F00600A001D342403FFFF02602021C3
70246+:102C50002410000D0E001A4AA390006800401821AD
70247+:102C60008F8500380A001D320060A0210E00187503
70248+:102C7000000000009783005C8F86006000402021E8
70249+:102C80003070FFFF00D010232C4A00051140FE11C8
70250+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
70251+:102CA00090CF000D31E300085460FFA192040003AF
70252+:102CB00002602021240200100E001A4AA38200683C
70253+:102CC0002403FFFF5443FF9A920400030A001F12DB
70254+:102CD0008F85003890A4000D308F000811E000951A
70255+:102CE0008F990054572000A6026020218E1F000CEF
70256+:102CF0008CB4002057F40005026020218E0D0008DE
70257+:102D00008CA7002411A7003A026020212402002091
70258+:102D1000A38200680E001A4A2412FFFF1052FEED33
70259+:102D20002404FFFF8F9F00442402FFF73C14800E11
70260+:102D300093EA000D2419FF803C03800001423824EF
70261+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
70262+:102D50008F8C006C97F200788F870044012C302113
70263+:102D6000324D7FFF000D204000C4782131E5007F07
70264+:102D700000B4C02101F94024AC68002CA711000068
70265+:102D80008CEB0028256E0001ACEE00288CEA002CAC
70266+:102D90008E02002C01426021ACEC002C8E09002C2C
70267+:102DA000ACE900308E120014ACF2003494ED003A1D
70268+:102DB00025A40001A4E4003A97E600783C1108003D
70269+:102DC0008E3131B024C3000130707FFF1211005CDE
70270+:102DD000006030218F8F0030026020212405000127
70271+:102DE0000E001934A5E600780A001EA1000020217B
70272+:102DF0008E0900142412FFFF1132006B8F8A0038F5
70273+:102E00008E0200188D4C00D0144C00650260202109
70274+:102E10008E0B00248CAE0028116E005B2402002172
70275+:102E20000E001A4AA38200681452FFBE2404FFFF5A
70276+:102E30008F8500380A001D320080A0212402001F67
70277+:102E40000E001A4AA38200682409FFFF1049FEA160
70278+:102E50002404FFFF0A001E548F83005402602021C7
70279+:102E60000E001A4AA38200681450FF508F85003864
70280+:102E70002403FFFF0A001D320060A0218CD800242B
70281+:102E80008E0800241118FF29026020210A001F2744
70282+:102E90002402000F8E0900003C05008001259024CB
70283+:102EA0001640FF492402001A026020210E001A4A2F
70284+:102EB000A3820068240CFFFF144CFECF2404FFFF04
70285+:102EC0008F8500380A001D320080A0210E001934C1
70286+:102ED000026020218F8500380A001EE500001821BD
70287+:102EE0002403FFFD0060A0210A001D32AF860060B0
70288+:102EF000026020210E001A4AA38D00682403FFFF00
70289+:102F00001043FF588F8500380A001ECC920400033E
70290+:102F10002418001D0E001A4AA39800682403FFFF1E
70291+:102F20001443FE9D2404FFFF8F8500380A001D32E4
70292+:102F30000080A021026020210A001F3D24020024FD
70293+:102F4000240880000068C024330BFFFF000B73C20D
70294+:102F500031D000FF001088270A001F6E001133C017
70295+:102F6000240F001B0E001A4AA38F00681451FEACF8
70296+:102F70002404FFFF8F8500380A001D320080A02145
70297+:102F80000A001F3D240200278E0600288CA3002C77
70298+:102F900010C30008026020210A001F812402001FC4
70299+:102FA0000A001F812402000E026020210A001F81F6
70300+:102FB000240200258E04002C1080000D8F8F00301D
70301+:102FC0008DE800740104C02B5700000C0260202122
70302+:102FD0008CB900140086A0210334282B10A0FF52C6
70303+:102FE0008F9F0044026020210A001F8124020022DA
70304+:102FF000026020210A001F81240200230A001F8191
70305+:103000002402002627BDFFD8AFB3001CAFB10014C7
70306+:10301000AFBF0020AFB20018AFB000103C0280007C
70307+:103020008C5201408C4B01483C048000000B8C0208
70308+:10303000322300FF317300FF8C8501B804A0FFFE2E
70309+:1030400034900180AE1200008C8701442464FFF0AC
70310+:10305000240600022C830013AE070004A61100080A
70311+:10306000A206000BAE1300241060004F8FBF00209B
70312+:10307000000448803C0A0801254A9534012A402171
70313+:103080008D04000000800008000000003C030800E0
70314+:103090008C6331A831693FFF00099980007280215B
70315+:1030A000021370212405FF80264D0100264C00806C
70316+:1030B0003C02800031B1007F3198007F31CA007F2F
70317+:1030C0003C1F800A3C1980043C0F800C01C5202461
70318+:1030D00001A5302401853824014F1821AC46002475
70319+:1030E000023F402103194821AC470090AC4400281E
70320+:1030F000AF830044AF880038AF8900300E0019005C
70321+:10310000016080213C0380008C6B01B80560FFFEEC
70322+:103110008F8700448F8600383465018090E8000D69
70323+:10312000ACB20000A4B0000600082600000416039C
70324+:1031300000029027001227C21080008124C200885C
70325+:10314000241F6082A4BF0008A0A000052402000282
70326+:10315000A0A2000B8F8B0030000424003C08270045
70327+:1031600000889025ACB20010ACA00014ACA00024E4
70328+:10317000ACA00028ACA0002C8D6900382413FF807F
70329+:10318000ACA9001890E3000D02638024320500FF13
70330+:1031900010A000058FBF002090ED000D31AC007F26
70331+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
70332+:1031B0008FB100148FB000103C0A10003C0E80004C
70333+:1031C00027BD002803E00008ADCA01B8265F010052
70334+:1031D0002405FF8033F8007F3C06800003E5782457
70335+:1031E0003C19800A03192021ACCF0024908E00D412
70336+:1031F00000AE682431AC00FF11800024AF84003899
70337+:10320000248E008895CD00123C0C08008D8C31A8CE
70338+:1032100031AB3FFF01924821000B5180012A402130
70339+:1032200001052024ACC400283107007F3C06800C37
70340+:1032300000E620219083000D00A31024304500FFFC
70341+:1032400010A0FFD8AF8400449098000D330F0010F9
70342+:1032500015E0FFD58FBF00200E0019000000000010
70343+:103260003C0380008C7901B80720FFFE00000000BD
70344+:10327000AE1200008C7F0144AE1F0004A6110008AE
70345+:1032800024110002A211000BAE1300243C1308010C
70346+:10329000927396F0327000015200FFC38FBF00207E
70347+:1032A0000E002146024020210A0020638FBF00202B
70348+:1032B0003C1260008E452C083C03F0033462FFFF93
70349+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
70350+:1032D00003199825AE532C080A0020638FBF0020E5
70351+:1032E000264D010031AF007F3C10800A240EFF8084
70352+:1032F00001F0282101AE60243C0B8000AD6C00245D
70353+:103300001660FFA8AF85003824110003A0B100FCAF
70354+:103310000A0020638FBF002026480100310A007F89
70355+:103320003C0B800A2409FF80014B30210109202435
70356+:103330003C078000ACE400240A002062AF8600381D
70357+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
70358+:10335000241F608290D900D42418FF800319782498
70359+:1033600031EA00FF1140FF7700000000240700044D
70360+:10337000A0C700FC8F870044241160842406000D40
70361+:10338000A4B10008A0A600050A00204D24020002F6
70362+:103390003C040001248496DC24030014240200FE73
70363+:1033A0003C010800AC2431EC3C010800AC2331E8BE
70364+:1033B0003C010801A42296F83C040801248496F8F4
70365+:1033C0000000182100643021A0C300042463000120
70366+:1033D0002C6500FF54A0FFFC006430213C0708006E
70367+:1033E00024E7010003E00008AF87007800A058211F
70368+:1033F000008048210000102114A00012000050217C
70369+:103400000A002142000000003C010801A42096F8B7
70370+:103410003C05080194A596F88F8200783C0C0801C1
70371+:10342000258C96F800E2182100AC2021014B302BAE
70372+:10343000A089000400001021A460000810C0003919
70373+:10344000010048218F8600780009384000E94021BA
70374+:103450000008388000E6282190A8000B90B9000AE7
70375+:103460000008204000881021000218800066C0215A
70376+:10347000A319000A8F85007800E5782191EE000AF3
70377+:1034800091E6000B000E684001AE6021000C208028
70378+:1034900000851021A046000B3C030801906396F2C2
70379+:1034A000106000222462FFFF8F8300383C01080176
70380+:1034B000A02296F2906C00FF118000040000000032
70381+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
70382+:1034D000973996F8272300013078FFFF2F0F00FF60
70383+:1034E00011E0FFC9254A00013C010801A42396F818
70384+:1034F0003C05080194A596F88F8200783C0C0801E1
70385+:10350000258C96F800E2182100AC2021014B302BCD
70386+:10351000A089000400001021A460000814C0FFC9A5
70387+:103520000100482103E000080000000003E000085B
70388+:103530002402000227BDFFE0248501002407FF804C
70389+:10354000AFB00010AFBF0018AFB1001400A718242F
70390+:103550003C10800030A4007F3C06800A00862821B1
70391+:103560008E110024AE03002490A200FF1440000836
70392+:10357000AF850038A0A000098FBF0018AE1100244D
70393+:103580008FB100148FB0001003E0000827BD0020A9
70394+:1035900090A900FD90A800FF312400FF0E0020F448
70395+:1035A000310500FF8F8500388FBF0018A0A00009EB
70396+:1035B000AE1100248FB100148FB0001003E000089A
70397+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
70398+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
70399+:1035E0003C0980009533011635320C00952F011AE5
70400+:1035F0003271FFFF023280218E08000431EEFFFF9E
70401+:10360000248B0100010E6821240CFF8025A5FFFFFB
70402+:10361000016C50243166007F3C07800AAD2A0024EB
70403+:1036200000C73021AF850074AF8800703C010801ED
70404+:10363000A02096F190C300090200D02100809821BB
70405+:10364000306300FF2862000510400048AF86003854
70406+:10365000286400021480008E24140001240D00054B
70407+:103660003C010801A02D96D590CC00FD3C0108013D
70408+:10367000A02096D63C010801A02096D790CB000A46
70409+:10368000240AFF80318500FF014B4824312700FFC9
70410+:1036900010E0000C000058213C12800836510080D8
70411+:1036A0008E2F00308CD0005C01F0702305C0018E9D
70412+:1036B0008F87007090D4000A3284007FA0C4000A73
70413+:1036C0008F8600383C118008363000808E0F003025
70414+:1036D0008F87007000EF702319C000EE000000001B
70415+:1036E00090D4000924120002328400FF1092024795
70416+:1036F000000000008CC2005800E2F82327F9FFFF09
70417+:103700001B2001300000000090C5000924080004BF
70418+:1037100030A300FF10680057240A00013C01080193
70419+:10372000A02A96D590C900FF252700013C01080179
70420+:10373000A02796D43C030801906396D52406000583
70421+:103740001066006A2C780005130000C40000902168
70422+:103750000003F8803C0408012484958003E4C82118
70423+:103760008F25000000A0000800000000241800FFC2
70424+:103770001078005C0000000090CC000A90CA00099C
70425+:103780003C080801910896F13187008000EA48253D
70426+:103790003C010801A02996DC90C500FD3C140801FD
70427+:1037A000929496F2311100013C010801A02596DDAA
70428+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
70429+:1037C0003C010801A03296DF8CD900543C0108016D
70430+:1037D000AC3996E08CD000583C010801AC3096E43E
70431+:1037E0008CC3005C3C010801AC3496EC3C01080140
70432+:1037F000AC2396E8162000088FBF002C8FB4002859
70433+:103800008FB300248FB200208FB1001C8FB000183E
70434+:1038100003E0000827BD00303C1180009624010E13
70435+:103820000E000FD43094FFFF3C0B08018D6B96F413
70436+:103830000260382102802821AE2B01803C13080150
70437+:103840008E7396D401602021240600830E00102F71
70438+:10385000AFB300108FBF002C8FB400288FB30024AB
70439+:103860008FB200208FB1001C8FB0001803E0000859
70440+:1038700027BD00303C1808008F1831FC270F0001CD
70441+:103880003C010800AC2F31FC0A0021D700000000E9
70442+:103890001474FFB900000000A0C000FF3C05080040
70443+:1038A0008CA531E43C0308008C6331E03C02080045
70444+:1038B0008C4232048F99003834A80001241F000282
70445+:1038C0003C010801AC2396F43C010801A02896F0C5
70446+:1038D0003C010801A02296F3A33F00090A002190B1
70447+:1038E0008F8600380E002146000000000A0021D714
70448+:1038F0008F8600383C1F080193FF96D424190001DD
70449+:1039000013F902298F8700703C100801921096D895
70450+:103910003C06080190C696D610C000050200A02102
70451+:103920003C040801908496D9109001E48F870078B8
70452+:10393000001088408F9F0078023048210009C8801D
70453+:10394000033F702195D80008270F0001A5CF00087C
70454+:103950003C040801908496D93C05080190A596D6B0
70455+:103960000E0020F4000000008F8700780230202134
70456+:103970000004308000C720218C8500048F820074F1
70457+:1039800000A2402305020006AC8200048C8A0000DD
70458+:103990008F830070014310235C400001AC83000062
70459+:1039A0008F86003890CB00FF2D6C00025580002DD3
70460+:1039B000241400010230F821001F40800107282153
70461+:1039C00090B9000B8CAE00040019C0400319782197
70462+:1039D000000F1880006710218C4D000001AE882375
70463+:1039E0002630FFFF5E00001F241400018C440004F9
70464+:1039F0008CAA0000008A482319200019240E000414
70465+:103A00003C010801A02E96D590AD000B8CAB0004B4
70466+:103A1000000D8840022D80210010108000471021E9
70467+:103A20008C44000401646023058202009443000872
70468+:103A300090DF00FE90B9000B33E500FF54B900049D
70469+:103A40000107A021A0D400FE8F8700780107A021E4
70470+:103A50009284000B0E0020F4240500018F860038AC
70471+:103A600024140001125400962E500001160000424A
70472+:103A70003C08FFFF241900021659FF3F0000000018
70473+:103A8000A0C000FF8F860038A0D200090A0021D70D
70474+:103A90008F86003890C700092404000230E300FF3D
70475+:103AA0001064016F24090004106901528F880074AA
70476+:103AB0008CCE0054010E682325B10001062001754B
70477+:103AC000241800043C010801A03896D53C010801E7
70478+:103AD000A02096D490D400FD90D200FF2E4F00027B
70479+:103AE00015E0FF14328400FF000438408F8900780D
70480+:103AF00090DF00FF00E41021000220800089C8212F
70481+:103B00002FE500029324000B14A0FF0A24070002F3
70482+:103B100000041840006480210010588001692821A9
70483+:103B20008CAC0004010C50230540FF020000000093
70484+:103B30003C030801906396D614600005246F0001D1
70485+:103B40003C010801A02496D93C010801A02796D782
70486+:103B50003C010801A02F96D690CE00FF24E700017B
70487+:103B600031CD00FF01A7882B1220FFE990A4000BA4
70488+:103B70000A0021C6000000003C0508018CA596D46F
70489+:103B80003C12000400A8F82413F2000624020005E9
70490+:103B90003C090801912996D5152000022402000352
70491+:103BA000240200053C010801A02296F190C700FF05
70492+:103BB00014E0012024020002A0C200090A0021D75B
70493+:103BC0008F86003890CC00FF1180FEDA240A0001B5
70494+:103BD0008F8C00748F890078240F00030180682186
70495+:103BE0001160001E240E0002000540400105A021C6
70496+:103BF00000142080008990218E51000401918023BF
70497+:103C00000600FECC000000003C020801904296D65F
70498+:103C100014400005245800013C010801A02A96D751
70499+:103C20003C010801A02596D93C010801A03896D690
70500+:103C300090DF00FF010510210002C88033E500FF7E
70501+:103C4000254A00010329202100AA402B1500FEB9B6
70502+:103C50009085000B1560FFE50005404000054040E1
70503+:103C600001051821000310803C010801A02A96D408
70504+:103C70003C010801A02596D8004918218C64000455
70505+:103C800000E4F82327F9FFFF1F20FFE900000000F0
70506+:103C90008C63000000E358230560013A01A38823E8
70507+:103CA00010E301170184C0231B00FEA200000000E6
70508+:103CB0003C010801A02E96D50A002305240B000123
70509+:103CC000240E0004A0CE00093C0D08008DAD31F893
70510+:103CD0008F86003825A200013C010800AC2231F893
70511+:103CE0000A0021D7000000008CD9005C00F9C02335
70512+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
70513+:103D00008F8400748CC3005C008340232502000173
70514+:103D10001C40FF60000000008CC9005C248700018B
70515+:103D200000E9282B10A0FE943C0D80008DAB01040F
70516+:103D30003C0C0001016C50241140FE8F2402001045
70517+:103D40003C010801A02296F10A0021D700000000E2
70518+:103D50008F9100748F86003826220001ACC2005C6F
70519+:103D60000A002292241400018F8700382404FF8067
70520+:103D70000000882190E9000A241400010124302564
70521+:103D8000A0E6000A3C05080190A596D63C0408016F
70522+:103D9000908496D90E0020F4000000008F86003831
70523+:103DA0008F85007890C800FD310700FF0007404074
70524+:103DB0000107F821001FC0800305C8219323000BD1
70525+:103DC000A0C300FD8F8500788F8600380305602131
70526+:103DD000918F000B000F704001CF6821000D808093
70527+:103DE000020510218C4B0000ACCB00548D840004E4
70528+:103DF0008F83007400645023194000022482000164
70529+:103E00002462000101074821ACC2005C0009308037
70530+:103E100000C5402100E02021240500010E0020F40F
70531+:103E20009110000B8F86003890C500FF10A0FF0C8A
70532+:103E3000001070408F85007801D06821000D10803F
70533+:103E4000004558218D6400008F8C0074018450233C
70534+:103E50002547000104E0FF02263100013C03080170
70535+:103E6000906396D62E2F0002247800013C010801B1
70536+:103E7000A03896D63C010801A03496D711E0FEF890
70537+:103E8000020038210A002365000740408F84003873
70538+:103E90008F8300748C85005800A340230502FE9A8E
70539+:103EA000AC8300580A00223B000000003C070801D8
70540+:103EB00090E796F2240200FF10E200BE8F860038E1
70541+:103EC0003C110801963196FA3C030801246396F8E8
70542+:103ED000262500013230FFFF30ABFFFF02036021D7
70543+:103EE0002D6A00FF1540008D918700043C010801F8
70544+:103EF000A42096FA8F88003800074840012728211F
70545+:103F0000911800FF000530802405000127140001EE
70546+:103F1000A11400FF3C120801925296F28F8800789B
70547+:103F20008F8E0070264F000100C820213C0108013F
70548+:103F3000A02F96F2AC8E00008F8D0074A48500082F
70549+:103F4000AC8D00043C030801906396D414600077A4
70550+:103F5000000090213C010801A02596D4A087000B09
70551+:103F60008F8C007800CC5021A147000A8F82003846
70552+:103F7000A04700FD8F840038A08700FE8F860038A0
70553+:103F80008F9F0070ACDF00548F990074ACD900583B
70554+:103F90008F8D00780127C02100185880016DA02165
70555+:103FA000928F000A000F704001CF18210003888013
70556+:103FB000022D8021A207000B8F8600780166602108
70557+:103FC000918A000B000A1040004A2021000428803A
70558+:103FD00000A64021A107000A3C07800834E90080C0
70559+:103FE0008D2200308F860038ACC2005C0A0022921D
70560+:103FF0002414000190CA00FF1540FEAD8F880074A4
70561+:10400000A0C400090A0021D78F860038A0C000FD97
70562+:104010008F98003824060001A30000FE3C0108012F
70563+:10402000A02696D53C010801A02096D40A0021C6FE
70564+:104030000000000090CB00FF3C040801908496F340
70565+:10404000316C00FF0184502B1540000F2402000347
70566+:1040500024020004A0C200090A0021D78F8600387C
70567+:1040600090C3000A2410FF8002035824316C00FF23
70568+:104070001180FDC1000000003C010801A02096D580
70569+:104080000A0021C600000000A0C200090A0021D7D2
70570+:104090008F86003890D4000A2412FF8002544824EE
70571+:1040A000312800FF1500FFF4240200083C0108013C
70572+:1040B000A02296F10A0021D70000000000108840DD
70573+:1040C0008F8B0070023018210003688001A7202127
70574+:1040D000AC8B00008F8A0074240C0001A48C0008B3
70575+:1040E000AC8A00043C05080190A596D62402000184
70576+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
70577+:104100000184A0231A80FD8B000000003C010801FF
70578+:10411000A02E96D50A002305240B00013C010801BE
70579+:10412000A42596FA0A0023B78F880038240B0001D3
70580+:10413000106B00228F9800388F85003890BF00FFE9
70581+:1041400033F900FF1079002B000000003C1F08012C
70582+:1041500093FF96D8001FC840033FC0210018A080DD
70583+:104160000288782191EE000AA08E000A8F8D0078D7
70584+:104170003C030801906396D800CD88210A0023DD16
70585+:10418000A223000B263000010600003101A4902379
70586+:104190000640002B240200033C010801A02F96D505
70587+:1041A0000A002305240B00018F8900380A00223BF6
70588+:1041B000AD2700540A00229124120001931400FD3F
70589+:1041C000A094000B8F8800388F8F0078910E00FE2E
70590+:1041D00000CF6821A1AE000A8F910038A22700FD10
70591+:1041E0008F8300708F900038AE0300540A0023DEE6
70592+:1041F0008F8D007890B000FEA090000A8F8B003861
70593+:104200008F8C0078916A00FD00CC1021A04A000B31
70594+:104210008F840038A08700FE8F8600748F85003859
70595+:10422000ACA600580A0023DE8F8D007894B80008F1
70596+:10423000ACA40004030378210A002285A4AF00087F
70597+:104240003C010801A02296D50A0021C6000000000A
70598+:1042500090CF0009240D000431EE00FF11CDFD8543
70599+:10426000240200013C010801A02296D50A0021C6C3
70600+:1042700000000000080033440800334408003420E4
70601+:10428000080033F4080033D8080033280800332826
70602+:10429000080033280800334C8008010080080080A3
70603+:1042A000800800005F865437E4AC62CC50103A4579
70604+:1042B00036621985BF14C0E81BC27A1E84F4B55655
70605+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
70606+:1042D00008005AB808005A5C08005A5C08005A5C8A
70607+:1042E00008005A5C08005A7408005A5C08005A5CBE
70608+:1042F00008005AC008005A5C080059D408005A5CEB
70609+:1043000008005A5C08005AC008005A5C08005A5C51
70610+:1043100008005A5C08005A5C08005A5C08005A5CA5
70611+:1043200008005A5C08005A5C08005A5C08005A5C95
70612+:1043300008005A9408005A5C08005A9408005A5C15
70613+:1043400008005A5C08005A5C08005A9808005A9401
70614+:1043500008005A5C08005A5C08005A5C08005A5C65
70615+:1043600008005A5C08005A5C08005A5C08005A5C55
70616+:1043700008005A5C08005A5C08005A5C08005A5C45
70617+:1043800008005A5C08005A5C08005A5C08005A5C35
70618+:1043900008005A5C08005A5C08005A5C08005A5C25
70619+:1043A00008005A9808005A9808005A5C08005A9861
70620+:1043B00008005A5C08005A5C08005A5C08005A5C05
70621+:1043C00008005A5C08005A5C08005A5C08005A5CF5
70622+:1043D00008005A5C08005A5C08005A5C08005A5CE5
70623+:1043E00008005A5C08005A5C08005A5C08005A5CD5
70624+:1043F00008005A5C08005A5C08005A5C08005A5CC5
70625+:1044000008005A5C08005A5C08005A5C08005A5CB4
70626+:1044100008005A5C08005A5C08005A5C08005A5CA4
70627+:1044200008005A5C08005A5C08005A5C08005A5C94
70628+:1044300008005A5C08005A5C08005A5C08005A5C84
70629+:1044400008005A5C08005A5C08005A5C08005A5C74
70630+:1044500008005A5C08005A5C08005A5C08005A5C64
70631+:1044600008005A5C08005A5C08005A5C08005A5C54
70632+:1044700008005A5C08005A5C08005A5C08005A5C44
70633+:1044800008005A5C08005A5C08005A5C08005A5C34
70634+:1044900008005A5C08005A5C08005A5C08005A5C24
70635+:1044A00008005A5C08005A5C08005A5C08005A5C14
70636+:1044B00008005A5C08005A5C08005A5C08005A5C04
70637+:1044C00008005A5C08005A5C08005A5C08005ADC74
70638+:1044D0000800782C08007A900800783808007628C0
70639+:1044E00008007838080078C4080078380800762872
70640+:1044F0000800762808007628080076280800762824
70641+:104500000800762808007628080076280800762813
70642+:1045100008007628080078580800784808007628AF
70643+:1045200008007628080076280800762808007628F3
70644+:1045300008007628080076280800762808007628E3
70645+:1045400008007628080076280800762808007848B1
70646+:10455000080082FC08008188080082C40800818865
70647+:104560000800829408008070080081880800818813
70648+:1045700008008188080081880800818808008188F7
70649+:1045800008008188080081880800818808008188E7
70650+:104590000800818808008188080081B008008D34F7
70651+:1045A00008008E9008008E70080088D808008D4C96
70652+:1045B0000A00012400000000000000000000000DBF
70653+:1045C000747061362E322E31620000000602010145
70654+:1045D00000000000000000000000000000000000DB
70655+:1045E00000000000000000000000000000000000CB
70656+:1045F00000000000000000000000000000000000BB
70657+:1046000000000000000000000000000000000000AA
70658+:10461000000000000000000000000000000000009A
70659+:10462000000000000000000000000000000000008A
70660+:10463000000000000000000000000000000000007A
70661+:104640000000000010000003000000000000000D4A
70662+:104650000000000D3C020800244217203C03080023
70663+:1046600024632A10AC4000000043202B1480FFFD7F
70664+:10467000244200043C1D080037BD2FFC03A0F0219C
70665+:104680003C100800261004903C1C0800279C1720B2
70666+:104690000E000262000000000000000D2402FF80F6
70667+:1046A00027BDFFE000821024AFB00010AF42002011
70668+:1046B000AFBF0018AFB10014936500043084007FD1
70669+:1046C000034418213C0200080062182130A5002094
70670+:1046D000036080213C080111277B000814A0000220
70671+:1046E0002466005C2466005892020004974301048B
70672+:1046F000920400043047000F3063FFFF3084004015
70673+:10470000006728231080000900004821920200055C
70674+:1047100030420004104000050000000010A000031B
70675+:104720000000000024A5FFFC2409000492020005FB
70676+:1047300030420004104000120000000010A00010E1
70677+:10474000000000009602000200A72021010440257D
70678+:104750002442FFFEA7421016920300042402FF80A9
70679+:1047600000431024304200FF104000033C020400CC
70680+:104770000A000174010240258CC20000AF421018EB
70681+:104780008F4201780440FFFE2402000AA742014044
70682+:1047900096020002240400093042000700021023A0
70683+:1047A00030420007A7420142960200022442FFFE67
70684+:1047B000A7420144A740014697420104A74201488D
70685+:1047C0008F420108304200205040000124040001C3
70686+:1047D00092020004304200101440000234830010A2
70687+:1047E00000801821A743014A0000000000000000DB
70688+:1047F0000000000000000000AF48100000000000B2
70689+:104800000000000000000000000000008F421000C7
70690+:104810000441FFFE3102FFFF1040000700000000CE
70691+:1048200092020004304200401440000300000000E7
70692+:104830008F421018ACC20000960200063042FFFF03
70693+:10484000244200020002104300021040036288214B
70694+:10485000962200001120000D3044FFFF00A7102118
70695+:104860008F8300388F45101C0002108200021080D8
70696+:1048700000431021AC45000030A6FFFF0E00058D5F
70697+:1048800000052C0200402021A62200009203000413
70698+:104890002402FF8000431024304200FF1040001F1C
70699+:1048A0000000000092020005304200021040001B90
70700+:1048B000000000009742100C2442FFFEA742101691
70701+:1048C000000000003C02040034420030AF421000FF
70702+:1048D00000000000000000000000000000000000D8
70703+:1048E0008F4210000441FFFE000000009742100CB0
70704+:1048F0008F45101C3042FFFF24420030000210821E
70705+:1049000000021080005B1021AC45000030A6FFFFC4
70706+:104910000E00058D00052C02A62200009604000260
70707+:10492000248400080E0001E93084FFFF974401044D
70708+:104930000E0001F73084FFFF8FBF00188FB1001405
70709+:104940008FB000103C02100027BD002003E00008DB
70710+:10495000AF4201783084FFFF308200078F8500244A
70711+:1049600010400002248300073064FFF800A41021E7
70712+:1049700030421FFF03421821247B4000AF850028EE
70713+:10498000AF82002403E00008AF4200843084FFFFC0
70714+:104990003082000F8F85002C8F860034104000027B
70715+:1049A0002483000F3064FFF000A410210046182B70
70716+:1049B000AF8500300046202314600002AF82002C37
70717+:1049C000AF84002C8F82002C340480000342182115
70718+:1049D00000641821AF83003803E00008AF42008074
70719+:1049E0008F820014104000088F8200048F82FFDC49
70720+:1049F000144000058F8200043C02FFBF3442FFFFD9
70721+:104A0000008220248F82000430430006240200022A
70722+:104A10001062000F3C0201012C62000350400005AF
70723+:104A2000240200041060000F3C0200010A00023062
70724+:104A30000000000010620005240200061462000C51
70725+:104A40003C0201110A000229008210253C020011DB
70726+:104A500000821025AF421000240200010A0002303B
70727+:104A6000AF82000C00821025AF421000AF80000C16
70728+:104A700000000000000000000000000003E000084B
70729+:104A8000000000008F82000C1040000400000000B5
70730+:104A90008F4210000441FFFE0000000003E0000808
70731+:104AA000000000008F8200102443F800000231C291
70732+:104AB00024C2FFF02C6303011060000300021042C7
70733+:104AC0000A000257AC8200008F85001800C5102B29
70734+:104AD0001440000B0000182100C5102324470001DA
70735+:104AE0008F82001C00A210212442FFFF0046102BE1
70736+:104AF000544000042402FFFF0A000257AC87000064
70737+:104B00002402FFFF0A000260AC8200008C820000D9
70738+:104B10000002194000621821000318800062182169
70739+:104B2000000318803C0208002442175C0062182130
70740+:104B300003E000080060102127BDFFD8AFBF0020B0
70741+:104B4000AFB1001CAFB000183C0460088C8250006C
70742+:104B50002403FF7F3C066000004310243442380CDD
70743+:104B6000AC8250008CC24C1C3C1A80000002160221
70744+:104B70003042000F10400007AF82001C8CC34C1C59
70745+:104B80003C02001F3442FC0000621824000319C2DA
70746+:104B9000AF8300188F420008275B400034420001B9
70747+:104BA000AF420008AF8000243C02601CAF40008090
70748+:104BB000AF4000848C4500088CC308083402800094
70749+:104BC000034220212402FFF0006218243C020080EE
70750+:104BD0003C010800AC2204203C025709AF84003895
70751+:104BE00014620004AF850034240200010A0002921E
70752+:104BF000AF820014AF8000148F42000038420001E1
70753+:104C0000304200011440FFFC8F8200141040001657
70754+:104C10000000000097420104104000058F8300004F
70755+:104C2000146000072462FFFF0A0002A72C62000A3A
70756+:104C30002C620010504000048F83000024620001A9
70757+:104C4000AF8200008F8300002C62000A1440000332
70758+:104C50002C6200070A0002AEAF80FFDC10400002A9
70759+:104C600024020001AF82FFDC8F4301088F44010062
70760+:104C700030622000AF83000410400008AF840010B1
70761+:104C80003C0208008C42042C244200013C01080034
70762+:104C9000AC22042C0A00058A3C0240003065020068
70763+:104CA00014A0000324020F001482026024020D00ED
70764+:104CB00097420104104002C83C02400030624000AC
70765+:104CC000144000AD8F8200388C4400088F42017878
70766+:104CD0000440FFFE24020800AF42017824020008CD
70767+:104CE000A7420140A7400142974201048F8400047B
70768+:104CF0003051FFFF30820001104000070220802168
70769+:104D00002623FFFE240200023070FFFFA742014667
70770+:104D10000A0002DBA7430148A74001463C02080005
70771+:104D20008C42043C1440000D8F8300103082002020
70772+:104D30001440000224030009240300010060202124
70773+:104D40008F830010240209005062000134840004A3
70774+:104D5000A744014A0A0002F60000000024020F00E6
70775+:104D60001462000530820020144000062403000D68
70776+:104D70000A0002F524030005144000022403000980
70777+:104D800024030001A743014A3C0208008C4204208E
70778+:104D90003C0400480E00020C004420250E000235A1
70779+:104DA000000000008F82000C1040003E0000000058
70780+:104DB0008F4210003C0300200043102410400039B3
70781+:104DC0008F820004304200021040003600000000D4
70782+:104DD000974210141440003300000000974210085E
70783+:104DE0008F8800383042FFFF2442000600021882FC
70784+:104DF0000003388000E83021304300018CC40000FB
70785+:104E000010600004304200030000000D0A00033768
70786+:104E100000E81021544000103084FFFF3C05FFFFE4
70787+:104E200000852024008518260003182B0004102B71
70788+:104E300000431024104000050000000000000000A6
70789+:104E40000000000D00000000240002228CC20000BF
70790+:104E50000A000336004520253883FFFF0003182B86
70791+:104E60000004102B00431024104000050000000037
70792+:104E7000000000000000000D000000002400022BD4
70793+:104E80008CC200003444FFFF00E81021AC44000055
70794+:104E90003C0208008C420430244200013C0108001E
70795+:104EA000AC2204308F6200008F840038AF8200088B
70796+:104EB0008C8300003402FFFF1462000F00001021F9
70797+:104EC0003C0508008CA504543C0408008C84045064
70798+:104ED00000B0282100B0302B008220210086202144
70799+:104EE0003C010800AC2504543C010800AC240450EB
70800+:104EF0000A000580240400088C8200003042010072
70801+:104F00001040000F000010213C0508008CA5044C47
70802+:104F10003C0408008C84044800B0282100B0302BE9
70803+:104F200000822021008620213C010800AC25044C91
70804+:104F30003C010800AC2404480A0005802404000851
70805+:104F40003C0508008CA504443C0408008C84044003
70806+:104F500000B0282100B0302B0082202100862021C3
70807+:104F60003C010800AC2504443C010800AC2404408A
70808+:104F70000A000580240400088F6200088F62000088
70809+:104F800000021602304300F02402003010620005D7
70810+:104F900024020040106200E08F8200200A00058891
70811+:104FA0002442000114A000050000000000000000E1
70812+:104FB0000000000D00000000240002568F4201781E
70813+:104FC0000440FFFE000000000E00023D27A4001078
70814+:104FD0001440000500408021000000000000000D8A
70815+:104FE000000000002400025D8E0200001040000559
70816+:104FF00000000000000000000000000D00000000A4
70817+:10500000240002608F62000C0443000324020001AC
70818+:105010000A00042EAE000000AE0200008F820038AD
70819+:105020008C480008A20000078F65000C8F64000404
70820+:1050300030A3FFFF0004240200852023308200FFFC
70821+:105040000043102124420005000230832CC200815D
70822+:10505000A605000A14400005A20400040000000098
70823+:105060000000000D00000000240002788F85003849
70824+:105070000E0005AB260400148F6200048F43010864
70825+:10508000A60200083C02100000621824106000080C
70826+:105090000000000097420104920300072442FFEC45
70827+:1050A000346300023045FFFF0A0003C3A203000778
70828+:1050B000974201042442FFF03045FFFF96060008A6
70829+:1050C0002CC200135440000592030007920200070F
70830+:1050D00034420001A20200079203000724020001EB
70831+:1050E00010620005240200031062000B8F8200385A
70832+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
70833+:105100008C43000C0064182400651825AC43000C87
70834+:105110000A0003E030C6FFFF3C04FFFF8C43001091
70835+:105120000064182400651825AC43001030C6FFFF4A
70836+:1051300024C2000200021083A20200058F830038FF
70837+:10514000304200FF00021080004328218CA800009C
70838+:105150008CA2000024030004000217021443001272
70839+:1051600000000000974201043C03FFFF01031824E4
70840+:105170003042FFFF004610232442FFFE006240251C
70841+:10518000ACA8000092030005306200FF000210800E
70842+:1051900000501021904200143042000F00431021B3
70843+:1051A0000A000415A20200068CA400049742010420
70844+:1051B0009603000A3088FFFF3042FFFF00461023AD
70845+:1051C0002442FFD60002140001024025ACA80004CE
70846+:1051D000920200079204000524630028000318834C
70847+:1051E0000064182134420004A2030006A202000752
70848+:1051F0008F8200042403FFFB34420002004310248A
70849+:10520000AF820004920300068F87003800031880E5
70850+:10521000007010218C4400203C02FFF63442FFFF56
70851+:105220000082402400671821AE04000CAC68000C1A
70852+:10523000920500063C03FF7F8E02000C00052880CB
70853+:1052400000B020213463FFFF01033024948800263E
70854+:1052500000A7282100431024AE02000CAC860020D9
70855+:10526000AC880024ACA8001024020010A742014022
70856+:1052700024020002A7400142A7400144A742014680
70857+:10528000974201043C0400082442FFFEA742014863
70858+:10529000240200010E00020CA742014A9603000AF4
70859+:1052A0009202000400431021244200023042000711
70860+:1052B00000021023304200070E000235AE0200103B
70861+:1052C0008F6200003C0308008C6304442404001037
70862+:1052D000AF820008974201043042FFFF2442FFFEE4
70863+:1052E00000403821000237C33C0208008C420440D1
70864+:1052F000006718210067282B004610210045102167
70865+:105300003C010800AC2304443C010800AC220440EA
70866+:105310000A0005150000000014A0000500000000B0
70867+:10532000000000000000000D000000002400030A3F
70868+:105330008F4201780440FFFE000000000E00023D95
70869+:1053400027A4001414400005004080210000000044
70870+:105350000000000D00000000240003118E02000078
70871+:105360005440000692020007000000000000000DFB
70872+:10537000000000002400031C9202000730420004D9
70873+:10538000104000058F8200042403FFFB344200021A
70874+:1053900000431024AF8200048F620004044300081D
70875+:1053A00092020007920200068E03000CAE0000007D
70876+:1053B0000002108000501021AC4300209202000730
70877+:1053C00030420004544000099602000A920200058F
70878+:1053D0003C03000100021080005010218C46001890
70879+:1053E00000C33021AC4600189602000A9206000461
70880+:1053F000277100080220202100C2302124C60005A8
70881+:10540000260500140E0005AB00063082920400064B
70882+:105410008F6500043C027FFF000420800091202162
70883+:105420008C8300043442FFFF00A228240065182169
70884+:10543000AC8300049202000792040005920300046A
70885+:10544000304200041040001496070008308400FF2A
70886+:1054500000042080009120218C86000497420104E2
70887+:105460009605000A306300FF3042FFFF0043102121
70888+:105470000045102130E3FFFF004310232442FFD8F2
70889+:1054800030C6FFFF0002140000C23025AC860004C5
70890+:105490000A0004C992030007308500FF0005288038
70891+:1054A00000B128218CA4000097420104306300FF62
70892+:1054B0003042FFFF00431021004710233C03FFFF51
70893+:1054C000008320243042FFFF00822025ACA400008E
70894+:1054D0009203000724020001106200060000000091
70895+:1054E0002402000310620011000000000A0004EC16
70896+:1054F0008E03001097420104920300049605000AEF
70897+:105500008E24000C00431021004510212442FFF29C
70898+:105510003C03FFFF008320243042FFFF0082202550
70899+:10552000AE24000C0A0004EC8E0300109742010424
70900+:10553000920300049605000A8E24001000431021F7
70901+:10554000004510212442FFEE3C03FFFF008320248E
70902+:105550003042FFFF00822025AE2400108E03001091
70903+:105560002402000AA7420140A74301429603000A11
70904+:10557000920200043C04004000431021A742014471
70905+:10558000A740014697420104A742014824020001B6
70906+:105590000E00020CA742014A0E0002350000000076
70907+:1055A0008F6200009203000400002021AF820008F7
70908+:1055B000974201049606000A3042FFFF006218215C
70909+:1055C000006028213C0308008C6304443C0208006E
70910+:1055D0008C42044000651821004410210065382BDE
70911+:1055E000004710213C010800AC2304443C010800A2
70912+:1055F000AC22044092040004008620212484000A86
70913+:105600003084FFFF0E0001E9000000009744010410
70914+:105610003084FFFF0E0001F7000000003C02100084
70915+:10562000AF4201780A0005878F820020148200278C
70916+:105630003062000697420104104000673C024000BF
70917+:105640003062400010400005000000000000000033
70918+:105650000000000D00000000240004208F420178AB
70919+:105660000440FFFE24020800AF4201782402000833
70920+:10567000A7420140A74001428F82000497430104E2
70921+:1056800030420001104000073070FFFF2603FFFE8C
70922+:1056900024020002A7420146A74301480A00053F31
70923+:1056A0002402000DA74001462402000DA742014A32
70924+:1056B0008F62000024040008AF8200080E0001E998
70925+:1056C000000000000A0005190200202110400042DD
70926+:1056D0003C02400093620000304300F024020010BE
70927+:1056E0001062000524020070106200358F820020D5
70928+:1056F0000A000588244200018F62000097430104DC
70929+:105700003050FFFF3071FFFF8F4201780440FFFEF1
70930+:105710003202000700021023304200072403000A6F
70931+:105720002604FFFEA7430140A7420142A7440144CB
70932+:10573000A7400146A75101488F420108304200208E
70933+:10574000144000022403000924030001A743014A76
70934+:105750000E00020C3C0400400E0002350000000068
70935+:105760003C0708008CE70444021110212442FFFE8C
70936+:105770003C0608008CC604400040182100E3382194
70937+:10578000000010218F65000000E3402B00C2302193
70938+:105790002604000800C830213084FFFFAF850008D0
70939+:1057A0003C010800AC2704443C010800AC2604403E
70940+:1057B0000E0001E9000000000A0005190220202166
70941+:1057C0000E00013B000000008F82002024420001F7
70942+:1057D000AF8200203C024000AF4201380A00029232
70943+:1057E000000000003084FFFF30C6FFFF00052C00E2
70944+:1057F00000A628253882FFFF004510210045282BF0
70945+:105800000045102100021C023042FFFF004310211E
70946+:1058100000021C023042FFFF004310213842FFFF0C
70947+:1058200003E000083042FFFF3084FFFF30A5FFFF98
70948+:1058300000001821108000070000000030820001E5
70949+:105840001040000200042042006518210A0005A152
70950+:105850000005284003E000080060102110C0000689
70951+:1058600024C6FFFF8CA2000024A50004AC82000027
70952+:105870000A0005AB2484000403E0000800000000D7
70953+:1058800010A0000824A3FFFFAC8600000000000069
70954+:10589000000000002402FFFF2463FFFF1462FFFAF0
70955+:1058A0002484000403E00008000000000000000160
70956+:1058B0000A00002A00000000000000000000000DA7
70957+:1058C000747870362E322E3162000000060201001C
70958+:1058D00000000000000001360000EA600000000047
70959+:1058E00000000000000000000000000000000000B8
70960+:1058F00000000000000000000000000000000000A8
70961+:105900000000000000000000000000000000000097
70962+:105910000000001600000000000000000000000071
70963+:105920000000000000000000000000000000000077
70964+:105930000000000000000000000000000000000067
70965+:1059400000000000000000000000138800000000BC
70966+:10595000000005DC00000000000000001000000353
70967+:10596000000000000000000D0000000D3C020800D7
70968+:1059700024423D683C0308002463401CAC40000006
70969+:105980000043202B1480FFFD244200043C1D08002E
70970+:1059900037BD7FFC03A0F0213C100800261000A8B2
70971+:1059A0003C1C0800279C3D680E00044E00000000CF
70972+:1059B0000000000D27BDFFB4AFA10000AFA200049E
70973+:1059C000AFA30008AFA4000CAFA50010AFA6001451
70974+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
70975+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
70976+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
70977+:105A0000AFBF00480E000591000000008FBF0048A6
70978+:105A10008FBC00448FB900408FB8003C8FAF003876
70979+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
70980+:105A30008FAA00248FA900208FA8001C8FA7001810
70981+:105A40008FA600148FA500108FA4000C8FA3000850
70982+:105A50008FA200048FA1000027BD004C3C1B6004F6
70983+:105A60008F7A5030377B502803400008AF7A00000F
70984+:105A70008F86003C3C0390003C0280000086282575
70985+:105A800000A32025AC4400203C0380008C6700204C
70986+:105A900004E0FFFE0000000003E00008000000003A
70987+:105AA0000A000070240400018F85003C3C04800043
70988+:105AB0003483000100A3102503E00008AC8200201D
70989+:105AC00003E00008000010213084FFFF30A5FFFF35
70990+:105AD00010800007000018213082000110400002F1
70991+:105AE00000042042006518211480FFFB00052840B7
70992+:105AF00003E000080060102110C000070000000053
70993+:105B00008CA2000024C6FFFF24A50004AC82000084
70994+:105B100014C0FFFB2484000403E000080000000020
70995+:105B200010A0000824A3FFFFAC86000000000000C6
70996+:105B3000000000002402FFFF2463FFFF1462FFFA4D
70997+:105B40002484000403E000080000000090AA003153
70998+:105B50008FAB00108CAC00403C0300FF8D6800044C
70999+:105B6000AD6C00208CAD004400E060213462FFFF8A
71000+:105B7000AD6D00248CA700483C09FF000109C0243A
71001+:105B8000AD6700288CAE004C0182C824031978252B
71002+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
71003+:105BA000AD6D001C94A900323128FFFFAD680010D4
71004+:105BB00090A70030A5600002A1600004A16700006A
71005+:105BC00090A30032306200FF0002198210600005CD
71006+:105BD000240500011065000E0000000003E000082D
71007+:105BE000A16A00018CD80028354A0080AD780018E1
71008+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
71009+:105C00008CC4002CA16A000103E00008AD64000C04
71010+:105C10008CCD001CAD6D00188CC90014AD6900144A
71011+:105C20008CC80024AD6800088CC70020AD67000C4C
71012+:105C30008CC200148C8300700043C82B1320000713
71013+:105C4000000000008CC20014144CFFE400000000AF
71014+:105C5000354A008003E00008A16A00018C820070D0
71015+:105C60000A0000E6000000009089003027BDFFF820
71016+:105C70008FA8001CA3A900008FA300003C0DFF808B
71017+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
71018+:105C9000A100000400C05821A7A000028D06000446
71019+:105CA00000A048210167C8218FA500000080502175
71020+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
71021+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
71022+:105CD00000EDC02400C27824000C1DC003236825F9
71023+:105CE00001F87025AD0D0000AD0E00048D240024D8
71024+:105CF000AFAD0000AD0400088D2C00202404FFFF90
71025+:105D0000AD0C000C9547003230E6FFFFAD060010E9
71026+:105D10009145004830A200FF000219C25060000106
71027+:105D20008D240034AD0400148D4700388FAA00186C
71028+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
71029+:105D4000AD00002CAD00001803E00008AD000020FD
71030+:105D500027BDFFE0AFB20018AFB10014AFB0001024
71031+:105D6000AFBF001C9098003000C088213C0D00FFA0
71032+:105D7000330F007FA0CF0000908E003135ACFFFFC5
71033+:105D80003C0AFF00A0CE000194A6001EA220000441
71034+:105D90008CAB00148E29000400A08021016C282403
71035+:105DA000012A40240080902101052025A62600021A
71036+:105DB000AE24000426050020262400080E000092D0
71037+:105DC00024060002924700302605002826240014ED
71038+:105DD00000071E000003160324060004044000030D
71039+:105DE0002403FFFF965900323323FFFF0E00009279
71040+:105DF000AE230010262400248FBF001C8FB2001891
71041+:105E00008FB100148FB00010240500030000302172
71042+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
71043+:105E2000AFB00018AFBF002090A9003024020001DD
71044+:105E300000E050213123003F00A040218FB00040FE
71045+:105E40000080882100C04821106200148FA700380C
71046+:105E5000240B000500A0202100C02821106B001396
71047+:105E6000020030210E000128000000009225007C75
71048+:105E700030A400021080000326030030AE00003082
71049+:105E8000260300348FBF00208FB1001C8FB0001894
71050+:105E90000060102103E0000827BD00280E0000A7C5
71051+:105EA000AFB000100A00016F000000008FA3003C9B
71052+:105EB000010020210120282101403021AFA3001042
71053+:105EC0000E0000EEAFB000140A00016F00000000E9
71054+:105ED0003C06800034C20E008C4400108F850044C4
71055+:105EE000ACA400208C43001803E00008ACA30024FD
71056+:105EF0003C06800034C20E008C4400148F850044A0
71057+:105F0000ACA400208C43001C03E00008ACA30024D8
71058+:105F10009382000C1040001B2483000F2404FFF028
71059+:105F20000064382410E00019978B00109784000E4D
71060+:105F30009389000D3C0A601C0A0001AC01644023F7
71061+:105F400001037021006428231126000231C2FFFFE3
71062+:105F500030A2FFFF0047302B50C0000E00E4482164
71063+:105F60008D4D000C31A3FFFF00036400000C2C03D7
71064+:105F700004A1FFF30000302130637FFF0A0001A479
71065+:105F80002406000103E00008000000009784000ED2
71066+:105F900000E448213123FFFF3168FFFF0068382B00
71067+:105FA00054E0FFF8A783000E938A000D114000050E
71068+:105FB000240F0001006BC023A380000D03E0000844
71069+:105FC000A798000E006BC023A38F000D03E000080C
71070+:105FD000A798000E03E000080000000027BDFFE8BE
71071+:105FE000AFB000103C10800036030140308BFFFF43
71072+:105FF00093AA002BAFBF0014A46B000436040E005C
71073+:106000009488001630C600FF8FA90030A4680006EF
71074+:10601000AC650008A0660012A46A001AAC670020F4
71075+:106020008FA5002CA4690018012020210E000198E2
71076+:10603000AC6500143C021000AE0201788FBF001462
71077+:106040008FB0001003E0000827BD00188F85000006
71078+:106050002484000727BDFFF83084FFF83C06800049
71079+:1060600094CB008A316AFFFFAFAA00008FA900001D
71080+:10607000012540232507FFFF30E31FFF0064102B9D
71081+:106080001440FFF700056882000D288034CC4000E2
71082+:1060900000AC102103E0000827BD00088F8200003B
71083+:1060A0002486000730C5FFF800A2182130641FFFC6
71084+:1060B00003E00008AF8400008F87003C8F84004419
71085+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
71086+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
71087+:1060E000AFB20030AFB000283C0B80008C8600249B
71088+:1060F000AD6700808C8A002035670E00356901008D
71089+:10610000ACEA00108C8800248D2500040000B82122
71090+:10611000ACE800188CE3001000A688230000A02142
71091+:10612000ACE300148CE20018ACE2001C122000FE6C
71092+:1061300000E0B021936C0008118000F40000000022
71093+:10614000976F001031EEFFFF022E682B15A000EFB5
71094+:1061500000000000977200103250FFFFAED0000028
71095+:106160003C0380008C740000329300081260FFFD35
71096+:106170000000000096D800088EC700043305FFFF1A
71097+:1061800030B5000112A000E4000000000000000D86
71098+:1061900030BFA0402419004013F9011B30B4A00007
71099+:1061A000128000DF000000009373000812600008F6
71100+:1061B00000000000976D001031ACFFFF00EC202BB9
71101+:1061C0001080000330AE004011C000D50000000078
71102+:1061D000A7850040AF87003893630008022028217C
71103+:1061E000AFB10020146000F527B40020AF60000CB0
71104+:1061F000978F004031F14000162000022403001662
71105+:106200002403000E24054007A363000AAF650014B1
71106+:10621000938A00428F70001431550001001512401E
71107+:1062200002024825AF690014979F00408F78001440
71108+:1062300033F9001003194025AF680014979200400D
71109+:106240003247000810E0016E000000008F67001464
71110+:106250003C1210003C11800000F27825AF6F001452
71111+:1062600036230E00946E000A3C0D81002406000EB9
71112+:1062700031CCFFFF018D2025AF640004A36600022E
71113+:106280009373000A3406FFFC266B0004A36B000A1C
71114+:1062900097980040330820001100015F00000000C3
71115+:1062A0003C05800034A90E00979900409538000CF9
71116+:1062B00097870040001940423312C00031030003A9
71117+:1062C00000127B0330F11000006F6825001172038B
71118+:1062D00001AE6025000C20C0A76400129793004017
71119+:1062E000936A000A001359823175003C02AA1021FA
71120+:1062F0002450003CA3700009953F000C33F93FFF88
71121+:10630000A779001097700012936900090130F821F5
71122+:1063100027E5000230B900070019C0233308000741
71123+:10632000A368000B9371000997720012976F001019
71124+:10633000322700FF8F910038978D004000F218211E
71125+:10634000006F702101C6602131A6004010C0000519
71126+:106350003185FFFF00B1102B3C1280001040001768
71127+:10636000000098210225A82B56A0013E8FA50020F1
71128+:106370003C048000348A0E008D5300143C068000DB
71129+:10638000AD5300108D4B001CAD4B0018AD45000007
71130+:106390008CCD000031AC00081180FFFD34CE0E0022
71131+:1063A00095C3000800A0882100009021A783004029
71132+:1063B0008DC6000424130001AF860038976F0010CB
71133+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
71134+:1063D000AE85000093620008144000DD000000005C
71135+:1063E0000E0001E7240400108F900048004028218F
71136+:1063F0003C023200320600FF000654000142F8253C
71137+:1064000026090001AF890048ACBF0000937900095C
71138+:1064100097780012936F000A332800FF3303FFFFC1
71139+:106420000103382100076C0031EE00FF01AE60254A
71140+:10643000ACAC00048F840048978B0040316A200088
71141+:106440001140010AACA4000897640012308BFFFFD2
71142+:1064500006400108ACAB000C978E004031C5000827
71143+:1064600014A0000226280006262800023C1F8000F7
71144+:1064700037E70E0094F900148CE5001C8F670004C8
71145+:10648000937800023324FFFF330300FFAFA3001013
71146+:106490008F6F0014AFA800180E0001CBAFAF00142F
71147+:1064A000240400100E0001FB000000008E9200008A
71148+:1064B00016400005000000008F7800142403FFBF81
71149+:1064C0000303A024AF7400148F67000C00F5C821EB
71150+:1064D000AF79000C9375000816A0000800000000BA
71151+:1064E00012600006000000008F6800143C0AEFFFF5
71152+:1064F0003549FFFE0109F824AF7F0014A37300089B
71153+:106500008FA500200A00034F02202021AED10000F9
71154+:106510000A00022D3C03800014E0FF1E30BFA040A3
71155+:106520000E0001900000A0212E9100010237B0253D
71156+:1065300012C000188FBF00488F87003C24170F003F
71157+:1065400010F700D43C0680008CD901780720FFFEAC
71158+:10655000241F0F0010FF00F634CA0E008D560014E1
71159+:1065600034C7014024080240ACF600048D49001CE9
71160+:106570003C141000ACE90008A0E00012A4E0001AEE
71161+:10658000ACE00020A4E00018ACE80014ACD4017822
71162+:106590008FBF00488FB700448FB600408FB5003CD6
71163+:1065A0008FB400388FB300348FB200308FB1002C1D
71164+:1065B0008FB0002803E0000827BD00508F910038FD
71165+:1065C000978800403C1280000220A821310700403B
71166+:1065D00014E0FF7C00009821977900108F9200381A
71167+:1065E0003338FFFF131200A8000020210080A021F3
71168+:1065F000108000F300A088211620FECE00000000CD
71169+:106600000A00031F2E9100013C0380008C62017878
71170+:106610000440FFFE240808008F860000AC68017863
71171+:106620003C038000946D008A31ACFFFF0186582343
71172+:10663000256AFFFF31441FFF2C8900081520FFF950
71173+:10664000000000008F8F0048347040008F83003CB2
71174+:1066500000E0A021240E0F0025E70001AF870048CD
71175+:1066600000D03021023488233C08800031F500FF3F
71176+:10667000106E0005240700019398004233130001B7
71177+:106680000013924036470001001524003C0A010027
71178+:10669000008A4825ACC900008F82004830BF003610
71179+:1066A00030B90008ACC200041320009900FF9825FF
71180+:1066B00035120E009650000A8F8700003C0F8100B3
71181+:1066C0003203FFFF24ED000835060140006F60250E
71182+:1066D0003C0E100031AB1FFF269200062405000E71
71183+:1066E000ACCC0020026E9825A4C5001AAF8B000028
71184+:1066F000A4D20018162000083C1080008F89003CAE
71185+:1067000024020F00512200022417000136730040BA
71186+:106710000E0001883C10800036060E008CCB001461
71187+:10672000360A014002402021AD4B00048CC5001CFC
71188+:10673000AD450008A1550012AD5300140E0001989C
71189+:106740003C151000AE1501780A000352000000004D
71190+:10675000936F0009976E0012936D000B31E500FFF7
71191+:1067600000AE202131AC00FF008C80212602000AFF
71192+:106770003050FFFF0E0001E7020020218F86004805
71193+:106780003C0341003C05800024CB0001AF8B004856
71194+:10679000936A00099769001230C600FF315F00FF5D
71195+:1067A0003128FFFF03E8382124F900020006C40065
71196+:1067B0000319782501E37025AC4E00008F6D000CA5
71197+:1067C00034A40E00948B001401B26025AC4C00047C
71198+:1067D0008C85001C8F670004936A00023164FFFF00
71199+:1067E000314900FFAFA900108F680014AFB1001845
71200+:1067F0000E0001CBAFA800140A0002FD0200202108
71201+:10680000AF600004A36000029798004033082000A6
71202+:106810001500FEA300003021A760001297840040FD
71203+:10682000936B000A3C10800030931F0000135183CB
71204+:10683000014BA82126A20028A362000936090E00F8
71205+:10684000953F000C0A000295A77F00108F7000147E
71206+:10685000360900400E000188AF6900140A0002C921
71207+:10686000000000000A00034F000020210641FEFA4C
71208+:10687000ACA0000C8CAC000C3C0D8000018D902570
71209+:106880000A0002EAACB2000C000090210A0002C526
71210+:1068900024130001128000073C028000344B0E00DC
71211+:1068A0009566000830D300401260004900000000E7
71212+:1068B0003C0680008CD001780600FFFE34C50E0037
71213+:1068C00094B500103C03050034CC014032B8FFFF02
71214+:1068D00003039025AD92000C8CAF0014240D200012
71215+:1068E0003C041000AD8F00048CAE001CAD8E00087F
71216+:1068F000A1800012A580001AAD800020A58000189C
71217+:10690000AD8D0014ACC401780A0003263C0680005B
71218+:106910008F9F0000351801402692000227F90008D9
71219+:1069200033281FFFA71200180A000391AF88000048
71220+:106930003C02800034450140ACA0000C1280001BDA
71221+:1069400034530E0034510E008E370010ACB70004E3
71222+:106950008E2400183C0B8000ACA400083570014068
71223+:1069600024040040A20000128FBF0048A600001AB5
71224+:106970008FB70044AE0000208FB60040A60000187C
71225+:106980008FB5003CAE0400148FB400388FB30034D0
71226+:106990008FB200308FB1002C8FB000283C02100065
71227+:1069A00027BD005003E00008AD6201788E66001438
71228+:1069B000ACA600048E64001C0A00042A3C0B800074
71229+:1069C0000E0001902E9100010A0003200237B0252D
71230+:1069D000000000000000000D00000000240003691A
71231+:1069E0000A0004013C06800027BDFFD8AFBF00208D
71232+:1069F0003C0980003C1F20FFAFB200183C0760003C
71233+:106A000035320E002402001037F9FFFDACE23008E9
71234+:106A1000AFB3001CAFB10014AFB00010AE5900000E
71235+:106A20000000000000000000000000000000000066
71236+:106A3000000000003C1800FF3713FFFDAE530000BC
71237+:106A40003C0B60048D7050002411FF7F3C0E00024F
71238+:106A50000211782435EC380C35CD0109ACED4C1819
71239+:106A6000240A0009AD6C50008CE80438AD2A0008F7
71240+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
71241+:106A800000051E023062000F2486C0B310400007CC
71242+:106A9000AF8200088CE54C1C3C09001F3528FC0027
71243+:106AA00000A81824000321C2AF8400048CF1080858
71244+:106AB0003C0F57092412F0000232702435F0001008
71245+:106AC00001D0602601CF68262DAA00012D8B000180
71246+:106AD000014B382550E00009A380000C3C1F601CCE
71247+:106AE0008FF8000824190001A399000C33137C00CF
71248+:106AF000A7930010A780000EA380000DAF80004870
71249+:106B000014C00003AF8000003C066000ACC0442C01
71250+:106B10000E0005B93C1080000E000F1A361101005E
71251+:106B20003C12080026523DD03C13080026733E500C
71252+:106B30008E03000038640001308200011440FFFC25
71253+:106B40003C0B800A8E2600002407FF8024C90240E7
71254+:106B5000312A007F014B402101272824AE06002066
71255+:106B6000AF880044AE0500243C048000AF86003CA2
71256+:106B70008C8C01780580FFFE24180800922F0008F5
71257+:106B8000AC980178A38F0042938E004231CD000172
71258+:106B900011A0000F24050D0024DFF8002FF90301D8
71259+:106BA0001320001C000629C224A4FFF00004104298
71260+:106BB000000231400E00020200D2D8213C02400007
71261+:106BC0003C068000ACC201380A0004A000000000AE
71262+:106BD00010C50023240D0F0010CD00273C1F800896
71263+:106BE00037F9008093380000240E0050330F00FF67
71264+:106BF00015EEFFF33C0240000E000A3600000000D4
71265+:106C00003C0240003C068000ACC201380A0004A0EF
71266+:106C1000000000008F83000400A3402B1500000B30
71267+:106C20008F8B0008006B50212547FFFF00E5482BA4
71268+:106C30001520000600A36023000C19400E0002027C
71269+:106C40000073D8210A0004C43C0240000000000D7B
71270+:106C50000E000202000000000A0004C43C024000D2
71271+:106C60003C1B0800277B3F500E0002020000000082
71272+:106C70000A0004C43C0240003C1B0800277B3F7014
71273+:106C80000E000202000000000A0004C43C024000A2
71274+:106C90003C0660043C09080025290104ACC9502CBD
71275+:106CA0008CC850003C0580003C0200023507008083
71276+:106CB000ACC750003C040800248415A43C03080021
71277+:106CC0002463155CACA50008ACA2000C3C010800D4
71278+:106CD000AC243D603C010800AC233D6403E00008A7
71279+:106CE0002402000100A030213C1C0800279C3D68C4
71280+:106CF0003C0C04003C0B0002008B3826008C402624
71281+:106D00002CE200010007502B2D050001000A4880ED
71282+:106D10003C03080024633D60004520250123182121
71283+:106D20001080000300001021AC6600002402000166
71284+:106D300003E00008000000003C1C0800279C3D68A0
71285+:106D40003C0B04003C0A0002008A3026008B3826E7
71286+:106D50002CC200010006482B2CE5000100094080F0
71287+:106D60003C03080024633D600045202501031821F1
71288+:106D700010800005000010213C0C0800258C155CDB
71289+:106D8000AC6C00002402000103E0000800000000D9
71290+:106D90003C0900023C08040000883026008938269F
71291+:106DA0002CC30001008028212CE400010083102561
71292+:106DB0001040000B000030213C1C0800279C3D685F
71293+:106DC0003C0A80008D4E00082406000101CA682597
71294+:106DD000AD4D00088D4C000C01855825AD4B000CC5
71295+:106DE00003E0000800C010213C1C0800279C3D68FF
71296+:106DF0003C0580008CA6000C000420272402000122
71297+:106E000000C4182403E00008ACA3000C3C020002FC
71298+:106E10001082000B3C0560003C0704001087000353
71299+:106E20000000000003E00008000000008CA908D06A
71300+:106E3000240AFFFD012A402403E00008ACA808D082
71301+:106E40008CA408D02406FFFE0086182403E0000866
71302+:106E5000ACA308D03C05601A34A600108CC3008097
71303+:106E600027BDFFF88CC50084AFA3000093A40000E9
71304+:106E70002402000110820003AFA5000403E0000813
71305+:106E800027BD000893A7000114E0001497AC00028E
71306+:106E900097B800023C0F8000330EFFFC01CF682141
71307+:106EA000ADA50000A3A000003C0660008CC708D080
71308+:106EB0002408FFFE3C04601A00E82824ACC508D072
71309+:106EC0008FA300048FA200003499001027BD000892
71310+:106ED000AF22008003E00008AF2300843C0B800059
71311+:106EE000318AFFFC014B48218D2800000A00057DF6
71312+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
71313+:106F0000279C3D683C0580008CA4000C8CA20004EA
71314+:106F10003C0300020044282410A0000A00A3182407
71315+:106F20003C0604003C0400021460000900A6102482
71316+:106F30001440000F3C0404000000000D3C1C08003D
71317+:106F4000279C3D688FBF001003E0000827BD001894
71318+:106F50003C0208008C423D600040F809000000003F
71319+:106F60003C1C0800279C3D680A0005A68FBF001046
71320+:106F70003C0208008C423D640040F809000000001B
71321+:106F80000A0005AC00000000000411C003E0000886
71322+:106F9000244202403C04080024843FB42405001A23
71323+:106FA0000A00009C0000302127BDFFE0AFB00010B8
71324+:106FB0003C108000AFBF0018AFB1001436110100C3
71325+:106FC000922200090E0005B63044007F8E3F00007B
71326+:106FD0008F89003C3C0F008003E26021258800403F
71327+:106FE0000049F821240DFF80310E00783198007897
71328+:106FF00035F9000135F100020319382501D1482582
71329+:10700000010D302403ED5824018D2824240A00406A
71330+:1070100024040080240300C0AE0B0024AE0008103E
71331+:10702000AE0A0814AE040818AE03081CAE05080426
71332+:10703000AE070820AE060808AE0908243609090084
71333+:107040009539000C3605098033ED007F3338FFFF9A
71334+:10705000001889C0AE110800AE0F0828952C000C4E
71335+:107060008FBF00188FB10014318BFFFF000B51C090
71336+:10707000AE0A002C8CA400508FB000108CA3003CF2
71337+:107080008D2700048CA8001C8CA600383C0E800ABA
71338+:1070900001AE102127BD0020AF820044AF84005014
71339+:1070A000AF830054AF87004CAF88005C03E000085A
71340+:1070B000AF8600603C09080091293FD924A800024E
71341+:1070C0003C05110000093C0000E8302500C51825EA
71342+:1070D00024820008AC83000003E00008AC800004B8
71343+:1070E0003C098000352309009128010B906A0011AA
71344+:1070F0002402002800804821314700FF00A07021B1
71345+:1071000000C068213108004010E20002340C86DD26
71346+:10711000240C08003C0A800035420A9A944700007B
71347+:10712000354B0A9C35460AA030F9FFFFAD39000007
71348+:107130008D780000354B0A8024040001AD3800042E
71349+:107140008CCF0000AD2F00089165001930A300031B
71350+:107150001064009028640002148000AF240500022F
71351+:107160001065009E240F0003106F00B435450AA47B
71352+:10717000240A0800118A0048000000005100003D68
71353+:107180003C0B80003C0480003483090090670012AF
71354+:1071900030E200FF004D7821000FC8802724000155
71355+:1071A0003C0A8000354F090091E50019354C0980F3
71356+:1071B0008D87002830A300FF0003150000475825E5
71357+:1071C0000004C4003C19600001793025370806FF2F
71358+:1071D000AD260000AD2800048DEA002C25280028EB
71359+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
71360+:1071F000AD2500108DE400383C05800034AC093C1E
71361+:10720000AD2400148DE3001CAD2300188DE7002091
71362+:10721000AD27001C8DE20024AD2200208DF900284E
71363+:1072200034A20100AD3900248D830000AD0E0004AE
71364+:1072300034B90900AD0300008C47000C250200148E
71365+:10724000AD070008932B00123C04080090843FD83F
71366+:10725000AD000010317800FF030D302100064F0013
71367+:1072600000047C00012F702535CDFFFC03E00008F1
71368+:10727000AD0D000C35780900930600123C0508009E
71369+:1072800094A53FC830C800FF010D5021000A60805E
71370+:107290000A00063C018520211500005B000000006B
71371+:1072A0003C08080095083FCE3C06080094C63FC83D
71372+:1072B000010610213C0B800035790900933800113C
71373+:1072C000932A001935660A80330800FF94CF002AFC
71374+:1072D00000086082314500FF978A0058000C1E00AC
71375+:1072E000000524003047FFFF006410250047C0253B
71376+:1072F00001EA30213C0B4000030B402500066400EE
71377+:10730000AD280000AD2C0004932500183C030006B6
71378+:107310002528001400053E0000E31025AD220008DA
71379+:107320008F24002C3C05800034AC093CAD24000CBB
71380+:107330008F38001C34A20100254F0001AD38001029
71381+:107340008D830000AD0E000431EB7FFFAD03000024
71382+:107350008C47000C34B90900A78B0058AD07000812
71383+:10736000932B00123C04080090843FD8250200149F
71384+:10737000317800FF030D302100064F0000047C002F
71385+:10738000012F702535CDFFFCAD00001003E0000893
71386+:10739000AD0D000C3C02080094423FD23C050800B1
71387+:1073A00094A53FC835440AA43C07080094E73FC4AD
71388+:1073B000948B00000045C8210327C023000B1C004C
71389+:1073C0002706FFF200665025AD2A000CAD20001004
71390+:1073D000AD2C00140A00063025290018354F0AA4E8
71391+:1073E00095E50000956400280005140000043C00A9
71392+:1073F0003459810000EC5825AD39000CAD2B00103C
71393+:107400000A000630252900143C0C0800958C3FCE5C
71394+:107410000A000681258200015460FF56240A0800F4
71395+:1074200035580AA49706000000061C00006C502581
71396+:10743000AD2A000C0A000630252900103C03080084
71397+:1074400094633FD23C07080094E73FC83C0F080014
71398+:1074500095EF3FC494A4000095790028006710219F
71399+:10746000004F582300041C00001934002578FFEE5B
71400+:1074700000D87825346A8100AD2A000CAD2F0010A9
71401+:10748000AD200014AD2C00180A0006302529001C80
71402+:1074900003E00008240207D027BDFFE0AFB20018C8
71403+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
71404+:1074B000008088218F8800548F87004C3C0580080D
71405+:1074C00034B20080011128213C1080002402008089
71406+:1074D000240300C000A72023AE0208183C06800841
71407+:1074E000AE03081C18800004AF850054ACC500042E
71408+:1074F0008CC90004AF89004C1220000936040980B1
71409+:107500000E0006F800000000924C00278E0B00745D
71410+:1075100001825004014B3021AE46000C3604098034
71411+:107520008C8E001C8F8F005C01CF682319A0000493
71412+:107530008FBF001C8C90001CAF90005C8FBF001CA4
71413+:107540008FB200188FB100148FB000100A00007EB7
71414+:1075500027BD00208F8600508F8300548F82004CFF
71415+:107560003C05800834A40080AC860050AC83003C0D
71416+:1075700003E00008ACA200043C0308008C63005444
71417+:1075800027BDFFF8308400FF2462000130A500FF12
71418+:107590003C010800AC22005430C600FF3C078000CC
71419+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
71420+:1075B0008FAA0000358BFFFF014B4824000627C02F
71421+:1075C00001244025AFA8000034E201009043000AE6
71422+:1075D000A3A000023C1980FFA3A300018FAF00000D
71423+:1075E00030AE007F3738FFFF01F86024000E6E00D8
71424+:1075F0003C0A002034E50140018D58253549200022
71425+:107600002406FF803C04100027BD0008ACAB000C32
71426+:10761000ACA90014A4A00018A0A6001203E0000862
71427+:10762000ACE40178308800FF30A700FF3C03800005
71428+:107630008C6201780440FFFE3C0C8000358A0A0011
71429+:107640008D4B00203584014035850980AC8B0004CA
71430+:107650008D4900240007302B00061540AC89000836
71431+:10766000A088001090A3004CA083002D03E0000828
71432+:10767000A480001827BDFFE8308400FFAFBF0010D2
71433+:107680000E00075D30A500FF8F8300548FBF0010F0
71434+:107690003C06800034C50140344700402404FF907C
71435+:1076A0003C02100027BD0018ACA3000CA0A40012DF
71436+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
71437+:1076C0003C088008AFBF001CAFB20018AFB1001477
71438+:1076D000AFB00010351000808E0600183C07800007
71439+:1076E000309200FF00C72025AE0400180E00007C79
71440+:1076F00030B100FF92030005346200080E00007EE6
71441+:10770000A2020005024020210E000771022028215C
71442+:10771000024020218FBF001C8FB200188FB10014CF
71443+:107720008FB0001024050005240600010A0007326E
71444+:1077300027BD00203C05800034A309809066000826
71445+:1077400030C200081040000F3C0A01013549080A08
71446+:10775000AC8900008CA80074AC8800043C070800C9
71447+:1077600090E73FD830E5001050A00008AC8000083A
71448+:107770003C0D800835AC00808D8B0058AC8B000828
71449+:107780002484000C03E00008008010210A0007B5E3
71450+:107790002484000C27BDFFE83C098000AFB0001036
71451+:1077A000AFBF00143526098090C8000924020006E6
71452+:1077B00000A05821310300FF3527090000808021F7
71453+:1077C000240500041062007B2408000294CF005CB2
71454+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
71455+:1077E00090CA00083144002010800008000000000A
71456+:1077F00090C2004E3C1F010337F90300305800FFD0
71457+:107800000319302524050008AE06000490F9001184
71458+:1078100090E6001290E40011333800FF00187082E7
71459+:1078200030CF00FF01CF5021014B6821308900FF8C
71460+:1078300031AAFFFF39230028000A60801460002C61
71461+:10784000020C482390E400123C198000372F0100FD
71462+:10785000308C00FF018B1821000310800045F821B7
71463+:10786000001F8400360706FFAD270004373F0900DC
71464+:1078700093EC001193EE0012372609800005C082B8
71465+:107880008DE4000C8CC5003431CD00FF01AB10211C
71466+:107890000058182100A4F8230008840000033F00CA
71467+:1078A00000F0302533F9FFFF318F00FC00D970253F
71468+:1078B0000158202101E9682100045080ADAE000C80
71469+:1078C0000E00007C012A80213C088008240B000463
71470+:1078D000350500800E00007EA0AB000902001021DB
71471+:1078E0008FBF00148FB0001003E0000827BD001800
71472+:1078F00090EC001190E300193C18080097183FCE57
71473+:10790000318200FF0002F882307000FF001FCE00BD
71474+:1079100000103C000327302500D870253C0F4000A4
71475+:1079200001CF68253C198000AD2D0000373F0900CC
71476+:1079300093EC001193EE0012372F010037260980D7
71477+:107940000005C0828DE4000C8CC5003431CD00FFF1
71478+:1079500001AB10210058182100A4F823000884006E
71479+:1079600000033F0000F0302533F9FFFF318F00FCAA
71480+:1079700000D970250158202101E9682100045080B8
71481+:10798000ADAE000C0E00007C012A80213C0880086E
71482+:10799000240B0004350500800E00007EA0AB00091A
71483+:1079A000020010218FBF00148FB0001003E0000808
71484+:1079B00027BD00180A0007C72408001227BDFFD002
71485+:1079C0003C038000AFB60028AFB50024AFB4002060
71486+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
71487+:1079E000AFB000103467010090E6000B309400FF48
71488+:1079F00030B500FF30C200300000B02110400099C7
71489+:107A000000008821346409809088000800082E0056
71490+:107A100000051E03046000C0240400048F86005487
71491+:107A20003C010800A0243FD83C0C8000AD800048F9
71492+:107A30003C048000348E010091CD000B31A5002064
71493+:107A400010A000073C078000349309809272000860
71494+:107A50000012860000107E0305E000C43C1F800871
71495+:107A600034EC0100918A000B34EB09809169000825
71496+:107A7000314400400004402B3123000800C8982303
71497+:107A80001460000224120003000090213C108000CA
71498+:107A900036180A8036040900970E002C90830011D6
71499+:107AA0009089001293050018307F00FF312800FFF5
71500+:107AB000024810210002C880930D0018033F78216E
71501+:107AC00001F1302130B100FF00D11821A78E0058FC
71502+:107AD0003C010800A4263FCE3C010800A4233FD06F
71503+:107AE00015A00002000000000000000D920B010B29
71504+:107AF0003065FFFF3C010800A4233FD2316A0040FB
71505+:107B00003C010800A4203FC83C010800A4203FC459
71506+:107B10001140000224A4000A24A4000B3091FFFFAE
71507+:107B20000E0001E7022020219206010B3C0C080008
71508+:107B3000958C3FD2004020210006698231A70001C8
71509+:107B40000E00060101872821004020210260282123
71510+:107B50000E00060C024030210E0007A1004020213B
71511+:107B600016C00069004020219212010B32560040DD
71512+:107B700012C000053C0500FF8C93000034AEFFFFEF
71513+:107B8000026E8024AC9000000E0001FB0220202138
71514+:107B90003C0F080091EF3FD831F10003122000168E
71515+:107BA0003C1380088F8200543C09800835280080EF
71516+:107BB000245F0001AD1F003C3C0580088CB9000427
71517+:107BC00003E02021033FC0231B000002AF9F0054AD
71518+:107BD0008CA400040E0006F8ACA400043C0780004E
71519+:107BE0008CEB00743C04800834830080004B5021EF
71520+:107BF000AC6A000C3C1380083670008002802021A3
71521+:107C000002A02821A200006B0E00075D3C1480003A
71522+:107C10008F920054368C0140AD92000C8F86004844
71523+:107C20003C151000344D000624D60001AF960048E4
71524+:107C30008FBF002CA18600128FB60028AD8D0014D6
71525+:107C40008FB3001CAE9501788FB200188FB5002459
71526+:107C50008FB400208FB100148FB0001003E0000833
71527+:107C600027BD003034640980908F0008000F760033
71528+:107C7000000E6E0305A00033347F090093F8001B4B
71529+:107C8000241900103C010800A0393FD8331300022A
71530+:107C90001260FF678F8600548F8200601446FF6574
71531+:107CA0003C0480000E00007C000000003C048008C2
71532+:107CB0003485008090A8000924060016310300FFD7
71533+:107CC0001066000D0000000090AB00093C070800A2
71534+:107CD00090E73FD824090008316400FF34EA00012E
71535+:107CE0003C010800A02A3FD81089002F240C000A6C
71536+:107CF000108C00282402000C0E00007E0000000002
71537+:107D00000A0008608F8600540E0007B9024028213F
71538+:107D10000A0008AE004020213C0B8008356A008034
71539+:107D20008D4600548CE9000C1120FF3DAF860054B5
71540+:107D3000240700143C010800A0273FD80A00085F70
71541+:107D40003C0C800090910008241200023C010800C5
71542+:107D5000A0323FD8323000201200000B2416000160
71543+:107D60008F8600540A0008602411000837F800804C
71544+:107D70008F020038AFE200048FF90004AF19003C15
71545+:107D80000A00086C3C0780008F8600540A000860D7
71546+:107D900024110004A0A200090E00007E00000000D3
71547+:107DA0000A0008608F860054240200140A00093A71
71548+:107DB000A0A2000927BDFFE8AFB000103C10800072
71549+:107DC000AFBF001436020100904400090E00075DA9
71550+:107DD000240500013C0480089099000E3483008043
71551+:107DE000909F000F906F00269089000A33F800FFE3
71552+:107DF00000196E000018740031EC00FF01AE502530
71553+:107E0000000C5A00014B3825312800FF3603014091
71554+:107E10003445600000E830252402FF813C04100056
71555+:107E2000AC66000C8FBF0014AC650014A062001299
71556+:107E3000AE0401788FB0001003E0000827BD0018E1
71557+:107E400027BDFFE8308400FFAFBF00100E00075DC4
71558+:107E500030A500FF3C05800034A4014034470040B9
71559+:107E60002406FF92AC870014A08600128F83005472
71560+:107E70008FBF00103C02100027BD0018AC83000C1F
71561+:107E800003E00008ACA2017827BDFFD8AFB0001016
71562+:107E9000308400FF30B000FF3C058000AFB100141B
71563+:107EA000AFBF0020AFB3001CAFB20018000410C277
71564+:107EB00034A60100320300023051000114600007B3
71565+:107EC00090D200093C098008353300809268000593
71566+:107ED0003107000810E0000C308A00100240202119
71567+:107EE0000E00078302202821240200018FBF0020FA
71568+:107EF0008FB3001C8FB200188FB100148FB0001028
71569+:107F000003E0000827BD00281540003434A50A000E
71570+:107F10008CB800248CAF0008130F004B00003821F0
71571+:107F20003C0D800835B30080926C00682406000286
71572+:107F3000318B00FF116600843C06800034C20100D2
71573+:107F40009263004C90590009307F00FF53F9000400
71574+:107F50003213007C10E00069000000003213007C46
71575+:107F60005660005C0240202116200009320D0001FD
71576+:107F70003C0C800035840100358B0A008D6500249F
71577+:107F80008C86000414A6FFD900001021320D0001D8
71578+:107F900011A0000E024020213C1880003710010083
71579+:107FA0008E0F000C8F8E005011EE000800000000B4
71580+:107FB0000E000843022028218E19000C3C1F800867
71581+:107FC00037F00080AE190050024020210E000771EA
71582+:107FD000022028210A00098F240200013C05080024
71583+:107FE0008CA5006424A400013C010800AC240064BA
71584+:107FF0001600000D00000000022028210E0007716D
71585+:1080000002402021926E0068240C000231CD00FF56
71586+:1080100011AC0022024020210E00094100000000A6
71587+:108020000A00098F240200010E00007024040001E0
71588+:10803000926B0025020B30250E00007EA266002503
71589+:108040000A0009D3022028218E6200188CDF000468
71590+:108050008CB9002400021E0217F9FFB13065007FC1
71591+:108060009268004C264400013093007F1265004066
71592+:10807000310300FF1464FFAB3C0D8008264700016C
71593+:1080800030F1007F30E200FF1225000B24070001D1
71594+:10809000004090210A00099C2411000124050004DD
71595+:1080A0000E000732240600010E0009410000000006
71596+:1080B0000A00098F240200012405FF8002452024C4
71597+:1080C00000859026324200FF004090210A00099C62
71598+:1080D000241100010E00084302202821320700303D
71599+:1080E00010E0FFA132100082024020210E00078321
71600+:1080F000022028210A00098F240200018E6900183D
71601+:108100000240202102202821012640250E0009647A
71602+:10811000AE6800189264004C240500032406000198
71603+:108120000E000732308400FF0E00007024040001AE
71604+:1081300092710025021150250E00007EA26A0025D2
71605+:108140000A00098F240200018E6F00183C1880007D
71606+:108150000240202101F87025022028210E0007711D
71607+:10816000AE6E00189264004C0A000A1B240500043D
71608+:10817000324A0080394900801469FF6A3C0D80084A
71609+:108180000A0009F42647000127BDFFC0AFB0001860
71610+:108190003C108000AFBF0038AFB70034AFB600303E
71611+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
71612+:1081B0000E0005BEAFB1001C360201009045000B59
71613+:1081C0000E00097690440008144000E78FBF003885
71614+:1081D0003C08800835070080A0E0006B3606098067
71615+:1081E00090C50000240300503C17080026F73F907C
71616+:1081F00030A400FF3C13080026733FA01083000347
71617+:108200003C1080000000B82100009821241F0010BD
71618+:108210003611010036120A00361509808E580024E6
71619+:108220008E3400048EAF00208F8C00543C01080077
71620+:10823000A03F3FD836190A80972B002C8EF60000FD
71621+:10824000932A00180298702301EC68233C0108006F
71622+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
71623+:10826000AC2C3FDCA78B005802C0F809315400FF4A
71624+:1082700030490002152000E930420001504000C49E
71625+:108280009227000992A90008312800081500000271
71626+:10829000241500030000A8213C0A80003543090092
71627+:1082A00035440A008C8D00249072001190700012E9
71628+:1082B000907F0011325900FF321100FF02B11021EE
71629+:1082C0000002C08033EF00FF0319B021028F70213C
71630+:1082D00002D4602125CB00103C010800A4363FCE1B
71631+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
71632+:1082F0003C010800A42B3FCC3556010035540980C1
71633+:1083000035510E008F8700548F89005C8E850020C8
71634+:1083100024080006012730233C010800AC283FD484
71635+:1083200000A7282304C000B50000902104A000B3DA
71636+:1083300000C5502B114000B5000000003C010800B2
71637+:10834000AC263FB88E6200000040F8090000000033
71638+:108350003046000214C0007400408021304B000100
71639+:10836000556000118E6200043C0D08008DAD3FBCCD
71640+:108370003C0EC0003C04800001AE6025AE2C000025
71641+:108380008C980000330F000811E0FFFD0000000092
71642+:10839000963F000824120001A79F00408E39000478
71643+:1083A000AF9900388E6200040040F8090000000018
71644+:1083B0000202802532030002146000B300000000B6
71645+:1083C0003C09080095293FC43C06080094C63FD0EC
71646+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
71647+:1083E000012670213C0308008C633FE03C08080034
71648+:1083F00095083FDA01CA20218ED9000C00E9282116
71649+:10840000249F000200A878210067C02133E4FFFF09
71650+:10841000AF9900503C010800AC383FE03C01080037
71651+:10842000A42F3FC83C010800A42E3FD20E0001E754
71652+:10843000000000008F8D0048004020213C01080012
71653+:10844000A02D3FD98E62000825AC0001AF8C0048FA
71654+:108450000040F809000000008F85005402A0302180
71655+:108460000E00060C004020210E0007A10040202134
71656+:108470008E6B000C0160F809004020213C0A0800C6
71657+:10848000954A3FD23C06080094C63FC601464821A3
71658+:10849000252800020E0001FB3104FFFF3C05080007
71659+:1084A0008CA53FB43C0708008CE73FBC00A7202305
71660+:1084B0003C010800AC243FB414800006000000001A
71661+:1084C0003C0208008C423FD4344B00403C01080081
71662+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
71663+:1084E0008F920044AE4D00208E2C0018AE4C00241C
71664+:1084F0003C04080094843FC80E0006FA0000000007
71665+:108500008F9F00548E6700103C010800AC3F3FDC99
71666+:1085100000E0F809000000003C1908008F393FB462
71667+:108520001720FF798F870054979300583C11800ED5
71668+:10853000321601000E000729A633002C16C0004594
71669+:10854000320300105460004C8EE5000432080040F5
71670+:108550005500001D8EF000088EE4000C0080F80924
71671+:10856000000000008FBF00388FB700348FB6003096
71672+:108570008FB5002C8FB400288FB300248FB2002059
71673+:108580008FB1001C8FB0001803E0000827BD004029
71674+:108590008F86003C36110E0000072E0000A6202515
71675+:1085A000AE0400808E4300208E500024AFA3001044
71676+:1085B000AE2300148FB20010AE320010AE30001C9B
71677+:1085C0000A000A75AE3000180200F8090000000029
71678+:1085D0008EE4000C0080F809000000000A000B2E59
71679+:1085E0008FBF003824180001240F0001A5C000200F
71680+:1085F000A5D800220A000B10ADCF00243C010800D2
71681+:10860000AC203FB80A000AA68E6200003C010800B8
71682+:10861000AC253FB80A000AA68E6200009224000929
71683+:108620000E000771000028218FBF00388FB700347B
71684+:108630008FB600308FB5002C8FB400288FB3002484
71685+:108640008FB200208FB1001C8FB0001803E000082B
71686+:1086500027BD00403C1480009295010900002821AC
71687+:108660000E00084332A400FF320300105060FFB830
71688+:10867000320800408EE5000400A0F8090000000068
71689+:108680000A000B28320800405240FFA89793005878
71690+:108690008E3400148F930044AE7400208E35001C7D
71691+:1086A000AE7500240A000B1F979300588F820014A8
71692+:1086B0000004218003E00008008210213C078008AC
71693+:1086C00034E200809043006900804021106000097E
71694+:1086D0003C0401003C0708008CE73FDC8F8300303E
71695+:1086E00000E32023048000089389001C14E30003A6
71696+:1086F0000100202103E00008008010213C0401005B
71697+:1087000003E00008008010211120000B00673823CF
71698+:108710003C0D800035AC0980918B007C316A0002F1
71699+:10872000114000202409003400E9702B15C0FFF12E
71700+:108730000100202100E938232403FFFC00A3C82402
71701+:1087400000E3C02400F9782B15E0FFEA030820219C
71702+:1087500030C400030004102314C000143049000387
71703+:108760000000302100A9782101E6702100EE682B7D
71704+:1087700011A0FFE03C0401002D3800010006C82BC9
71705+:10878000010548210319382414E0FFDA2524FFFCF1
71706+:108790002402FFFC00A218240068202103E0000846
71707+:1087A000008010210A000B9E240900303C0C800040
71708+:1087B0003586098090CB007C316A00041540FFE9C2
71709+:1087C000240600040A000BAD000030213C03080021
71710+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
71711+:1087E000AFB1001410620005AFB00010000329C043
71712+:1087F00024A40280AF840014AF8300183C108000D2
71713+:1088000036020A0094450032361101000E000B7F3B
71714+:1088100030A43FFF8E240000241FFF803C11008005
71715+:108820000082C021031F60243309007F000CC9406F
71716+:1088300003294025330E0078362F00033C0D10002D
71717+:10884000010D502501CF5825AE0C002836080980AF
71718+:10885000AE0C080CAE0B082CAE0A08309103006970
71719+:108860003C06800C0126382110600006AF870034DA
71720+:108870008D09003C8D03006C0123382318E0008231
71721+:10888000000000003C0B8008356A00803C1080002E
71722+:10889000A1400069360609808CC200383C06800081
71723+:1088A00034C50A0090A8003C310C00201180001A49
71724+:1088B000AF820030240D00013C0E800035D10A004B
71725+:1088C000A38D001CAF8000248E2400248F850024FB
71726+:1088D000240D0008AF800020AF8000283C01080074
71727+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
71728+:1088F000000030219228003C8FBF00188FB1001477
71729+:108900008FB0001000086142AF82002C27BD00200C
71730+:1089100003E000083182000190B80032240E00010B
71731+:10892000330F00FF000F2182108E00412419000236
71732+:108930001099006434C40AC03C03800034640A0007
71733+:108940008C8F002415E0001E34660900909F0030D3
71734+:108950002418000533F9003F1338004E24030001AA
71735+:108960008F860020A383001CAF860028AF860024DA
71736+:108970003C0E800035D10A008E2400248F8500240F
71737+:10898000240D00083C010800A42D3FC63C0108004E
71738+:10899000A4203FDA0E000B83000000009228003C68
71739+:1089A0008FBF00188FB100148FB000100008614213
71740+:1089B000AF82002C27BD002003E0000831820001B7
71741+:1089C0008C8A00088C8B00248CD000643C0E8000C4
71742+:1089D00035D10A00014B2823AF900024A380001C4E
71743+:1089E000AF8500288E2400248F8600208F850024E8
71744+:1089F000240D00083C010800A42D3FC63C010800DE
71745+:108A0000A4203FDA0E000B83000000009228003CF7
71746+:108A10008FBF00188FB100148FB0001000086142A2
71747+:108A2000AF82002C27BD002003E000083182000146
71748+:108A300090A200303051003F5224002834C50AC0B3
71749+:108A40008CB000241600002234CB09008CA600480C
71750+:108A50003C0A7FFF3545FFFF00C510243C0E800017
71751+:108A6000AF82002035C509008F8800208CAD0060E2
71752+:108A7000010D602B15800002010020218CA40060F4
71753+:108A80000A000C22AF8400208D02006C0A000BFC4F
71754+:108A90003C0680008C8200488F8600203C097FFFC6
71755+:108AA0003527FFFF004788243C0480082403000189
71756+:108AB000AF910028AC80006CA383001C0A000C302E
71757+:108AC000AF8600248C9F00140A000C22AF9F002068
71758+:108AD0008D6200680A000C6C3C0E800034C4098072
71759+:108AE0008C8900708CA300140123382B10E0000443
71760+:108AF000000000008C8200700A000C6C3C0E8000AC
71761+:108B00008CA200140A000C6C3C0E80008F8500249F
71762+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
71763+:108B2000AFB000103C04800034870A0090E60030AB
71764+:108B30002402000530C3003F106200B934840900EC
71765+:108B40008F91002000A080213C048000348E0A0018
71766+:108B50008DCD00043C0608008CC63FB831A73FFF0E
71767+:108B600000E6602B5580000100E03021938F001C4F
71768+:108B700011E0007800D0282B349F098093F9007C05
71769+:108B800033380002130000792403003400C3102B93
71770+:108B9000144000D90000000000C3302300D0282B6F
71771+:108BA0003C010800A4233FC414A0006E0200182159
71772+:108BB0003C0408008C843FB40064402B5500000145
71773+:108BC000006020213C05800034A90A00912A003C65
71774+:108BD0003C010800AC243FBC31430020146000037A
71775+:108BE0000000482134AB0E008D6900188F88002CDE
71776+:108BF0000128202B1080005F000000003C050800C9
71777+:108C00008CA53FBC00A96821010D602B1180005C80
71778+:108C100000B0702B0109382300E028213C01080036
71779+:108C2000AC273FBC12000003240AFFFC10B0008DEB
71780+:108C30003224000300AA18243C010800A4203FDAD3
71781+:108C40003C010800AC233FBC006028218F84002435
71782+:108C5000120400063C0B80088D6C006C0200202181
71783+:108C6000AF91002025900001AD70006C8F8D002821
71784+:108C700000858823AF91002401A52023AF8400281C
71785+:108C80001220000224070018240700103C18800856
71786+:108C90003706008090CF00683C010800A0273FD82D
71787+:108CA0002407000131EE00FF11C70047000000005B
71788+:108CB00014800018000028213C06800034D109806F
71789+:108CC00034CD010091A600098E2C001824C40001A7
71790+:108CD000000C86023205007F308B007F1165007F1B
71791+:108CE0002407FF803C19800837290080A124004C0C
71792+:108CF0003C0808008D083FD4241800023C010800FD
71793+:108D0000A0384019350F00083C010800AC2F3FD4B3
71794+:108D1000240500103C02800034440A009083003C8B
71795+:108D2000307F002013E0000500A02021240A00016C
71796+:108D30003C010800AC2A3FBC34A400018FBF0018DE
71797+:108D40008FB100148FB000100080102103E00008E4
71798+:108D500027BD00203C010800A4203FC410A0FF94C0
71799+:108D6000020018210A000CC000C018210A000CB72C
71800+:108D7000240300303C0508008CA53FBC00B0702BDC
71801+:108D800011C0FFA8000000003C19080097393FC43B
71802+:108D90000325C0210307782B11E000072CAA00044B
71803+:108DA0003C0360008C625404305F003F17E0FFE337
71804+:108DB000240400422CAA00041140FF9A240400421B
71805+:108DC0000A000D248FBF00181528FFB9000000000D
71806+:108DD0008CCA00183C1F800024020002015F182585
71807+:108DE000ACC3001837F90A00A0C200689329003C00
71808+:108DF0002404000400A01021312800203C010800B8
71809+:108E0000A0244019110000022405001024020001D2
71810+:108E10003C010800AC223FB40A000D1A3C0280005D
71811+:108E20008F8800288C8900600109282B14A000027B
71812+:108E3000010088218C9100603C048000348B0E007E
71813+:108E40008D640018240A000102202821022030210C
71814+:108E5000A38A001C0E000B83022080210A000CA6AE
71815+:108E6000AF82002C00045823122000073164000355
71816+:108E70003C0E800035C7098090ED007C31AC0004C9
71817+:108E800015800019248F00043C010800A4243FDA57
71818+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
71819+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
71820+:108EB0002404004230A200031440000200A2182340
71821+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
71822+:108ED000A4203FDA0A000CE70060282100C77024B4
71823+:108EE0000A000D0D01C720263C010800A42F3FDA1F
71824+:108EF0000A000D78000000003C010800AC203FBCD7
71825+:108F00000A000D23240400428F8300283C058000C2
71826+:108F100034AA0A00146000060000102191470030B6
71827+:108F20002406000530E400FF108600030000000066
71828+:108F300003E0000800000000914B0048316900FF89
71829+:108F4000000941C21500FFFA3C0680083C040800F5
71830+:108F500094843FC43C0308008C633FDC3C19080048
71831+:108F60008F393FBC3C0F080095EF3FDA0064C02109
71832+:108F70008CCD00040319702101CF602134AB0E00A9
71833+:108F8000018D282318A0001D00000000914F004C07
71834+:108F90008F8C0034956D001031EE00FF8D89000438
71835+:108FA00001AE30238D8A000030CEFFFF000E290075
71836+:108FB0000125C82100003821014720210325182B55
71837+:108FC0000083C021AD990004AD980000918F000A84
71838+:108FD00001CF6821A18D000A956500128F8A0034A7
71839+:108FE000A5450008954B003825690001A5490038C2
71840+:108FF0009148000D35070008A147000D03E0000867
71841+:109000000000000027BDFFD8AFB000189388001CF7
71842+:109010008FB000143C0A80003C197FFF8F8700242A
71843+:109020003738FFFFAFBF0020AFB1001C355F0A002B
71844+:109030000218182493EB003C00087FC03C02BFFFDD
71845+:10904000006F60252CF000013449FFFF3C1F080031
71846+:109050008FFF3FDC8F9900303C18080097183FD2F3
71847+:1090600001897824001047803C07EFFF3C05F0FFA2
71848+:1090700001E818253C1180003169002034E2FFFF2F
71849+:1090800034ADFFFF362E098027A50010240600020C
71850+:1090900003F96023270B0002354A0E0000621824F2
71851+:1090A0000080802115200002000040218D48001C16
71852+:1090B000A7AB0012058000392407000030E800FF4C
71853+:1090C00000083F00006758253C028008AFAB001441
71854+:1090D000344F008091EA00683C08080091083FD9AD
71855+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
71856+:1090F00094423FCCA3A80011016CC024001FCF40B4
71857+:10910000031918258FA70010AFA300143C0C08000A
71858+:10911000918C3FDBA7A200168FAB001400ED482412
71859+:109120003C0F01003C0A0FFF012FC82531980003B6
71860+:10913000355FFFFF016D40243C027000033F38247F
71861+:1091400000181E0000E2482501037825AFAF001487
71862+:10915000AFA9001091CC007C0E000092A3AC0015CA
71863+:10916000362D0A0091A6003C30C400201080000675
71864+:10917000260200083C11080096313FC8262EFFFF4A
71865+:109180003C010800A42E3FC88FBF00208FB1001CF7
71866+:109190008FB0001803E0000827BD00288F8B002C3B
71867+:1091A000010B502B5540FFC5240700010A000E0497
71868+:1091B00030E800FF9383001C3C02800027BDFFD8ED
71869+:1091C00034480A0000805021AFBF002034460AC056
71870+:1091D000010028211060000E3444098091070030FE
71871+:1091E000240B00058F89002030EC003F118B000B11
71872+:1091F00000003821AFA900103C0B80088D69006C7D
71873+:10920000AFAA00180E00015AAFA90014A380001CD9
71874+:109210008FBF002003E0000827BD00288D1F0048F5
71875+:109220003C1808008F183FBC8F9900283C027FFF34
71876+:109230008D0800443443FFFFAFA900103C0B8008A9
71877+:109240008D69006C03E370240319782101CF682332
71878+:1092500001A83821AFAA00180E00015AAFA90014C6
71879+:109260000A000E58A380001C3C05800034A60A00AA
71880+:1092700090C7003C3C06080094C63FDA3C02080058
71881+:109280008C423FD430E30020000624001060001E12
71882+:10929000004438253C0880083505008090A300680C
71883+:1092A00000004821240800010000282124040001B6
71884+:1092B0003C0680008CCD017805A0FFFE34CF014034
71885+:1092C000ADE800083C0208008C423FDCA5E5000444
71886+:1092D000A5E40006ADE2000C3C04080090843FD9F0
71887+:1092E0003C03800834790080A1E40012ADE700144B
71888+:1092F000A5E900189338004C3C0E1000A1F8002D91
71889+:1093000003E00008ACCE017834A90E008D28001CC3
71890+:109310003C0C08008D8C3FBC952B0016952A001440
71891+:10932000018648213164FFFF0A000E803145FFFFAE
71892+:109330003C04800034830A009065003C30A2002089
71893+:109340001040001934870E00000040210000382131
71894+:10935000000020213C0680008CC901780520FFFE1A
71895+:1093600034CA014034CF010091EB0009AD48000838
71896+:109370003C0E08008DCE3FDC240DFF91240C0040F4
71897+:109380003C081000A5440004A5470006AD4E000CA3
71898+:10939000A14D0012AD4C0014A5400018A14B002DAA
71899+:1093A00003E00008ACC801788CE8001894E60012CD
71900+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
71901+:1093C0003C04800034830A009065003C30A20020F9
71902+:1093D0001040002727BDFFF82409000100003821B4
71903+:1093E000240800013C0680008CCA01780540FFFE7D
71904+:1093F0003C0280FF34C40100908D00093C0C080041
71905+:10940000918C4019A3AD00038FAB00003185007F24
71906+:109410003459FFFF01665025AFAA00009083000A6F
71907+:10942000A3A0000200057E00A3A300018FB80000E6
71908+:1094300034CB0140240C30000319702401CF68257F
71909+:10944000AD6D000C27BD0008AD6C0014A5600018C0
71910+:10945000AD690008A56700042409FF80A56800061F
71911+:109460003C081000A169001203E00008ACC80178B4
71912+:1094700034870E008CE9001894E6001294E4001082
71913+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
71914+:10949000AFB100143C118000AFB00010AFBF001896
71915+:1094A00036380A00970F0032363001000E000B7F6D
71916+:1094B00031E43FFF8E0E0000240DFF803C042000AD
71917+:1094C00001C25821016D6024000C4940316A007FBF
71918+:1094D000012A4025010438253C048008AE270830C5
71919+:1094E0003486008090C500682403000230A200FF8B
71920+:1094F000104300048F9F00208F990024AC9F0068C8
71921+:10950000AC9900648FBF00188FB100148FB00010A9
71922+:1095100003E0000827BD00203C0A0800254A3A80E5
71923+:109520003C09080025293B103C08080025082F1C91
71924+:109530003C07080024E73BDC3C06080024C639044D
71925+:109540003C05080024A536583C0408002484325CFD
71926+:109550003C030800246339B83C0208002442375415
71927+:109560003C010800AC2A3F983C010800AC293F941C
71928+:109570003C010800AC283F903C010800AC273F9C10
71929+:109580003C010800AC263FAC3C010800AC253FA4E0
71930+:109590003C010800AC243FA03C010800AC233FB0D4
71931+:1095A0003C010800AC223FA803E0000800000000D6
71932+:1095B00080000940800009008008010080080080C8
71933+:1095C00080080000800E00008008008080080000F5
71934+:1095D00080000A8080000A00800009808000090065
71935+:00000001FF
71936diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
71937index 53f1e8a..2b96b597 100644
71938--- a/fs/9p/vfs_inode.c
71939+++ b/fs/9p/vfs_inode.c
71940@@ -1311,7 +1311,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
71941 void
71942 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
71943 {
71944- char *s = nd_get_link(nd);
71945+ const char *s = nd_get_link(nd);
71946
71947 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
71948 dentry, IS_ERR(s) ? "<error>" : s);
71949diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
71950index 2d0cbbd..a6d6149 100644
71951--- a/fs/Kconfig.binfmt
71952+++ b/fs/Kconfig.binfmt
71953@@ -103,7 +103,7 @@ config HAVE_AOUT
71954
71955 config BINFMT_AOUT
71956 tristate "Kernel support for a.out and ECOFF binaries"
71957- depends on HAVE_AOUT
71958+ depends on HAVE_AOUT && BROKEN
71959 ---help---
71960 A.out (Assembler.OUTput) is a set of formats for libraries and
71961 executables used in the earliest versions of UNIX. Linux used
71962diff --git a/fs/afs/inode.c b/fs/afs/inode.c
71963index e06f5a2..81d07ac 100644
71964--- a/fs/afs/inode.c
71965+++ b/fs/afs/inode.c
71966@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
71967 struct afs_vnode *vnode;
71968 struct super_block *sb;
71969 struct inode *inode;
71970- static atomic_t afs_autocell_ino;
71971+ static atomic_unchecked_t afs_autocell_ino;
71972
71973 _enter("{%x:%u},%*.*s,",
71974 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
71975@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
71976 data.fid.unique = 0;
71977 data.fid.vnode = 0;
71978
71979- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
71980+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
71981 afs_iget5_autocell_test, afs_iget5_set,
71982 &data);
71983 if (!inode) {
71984diff --git a/fs/aio.c b/fs/aio.c
71985index 480440f..623fd88 100644
71986--- a/fs/aio.c
71987+++ b/fs/aio.c
71988@@ -441,7 +441,7 @@ static int aio_setup_ring(struct kioctx *ctx)
71989 size += sizeof(struct io_event) * nr_events;
71990
71991 nr_pages = PFN_UP(size);
71992- if (nr_pages < 0)
71993+ if (nr_pages <= 0)
71994 return -EINVAL;
71995
71996 file = aio_private_file(ctx, nr_pages);
71997diff --git a/fs/attr.c b/fs/attr.c
71998index 6530ced..4a827e2 100644
71999--- a/fs/attr.c
72000+++ b/fs/attr.c
72001@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
72002 unsigned long limit;
72003
72004 limit = rlimit(RLIMIT_FSIZE);
72005+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
72006 if (limit != RLIM_INFINITY && offset > limit)
72007 goto out_sig;
72008 if (offset > inode->i_sb->s_maxbytes)
72009diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
72010index 35b755e..f4b9e0a 100644
72011--- a/fs/autofs4/waitq.c
72012+++ b/fs/autofs4/waitq.c
72013@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
72014 {
72015 unsigned long sigpipe, flags;
72016 mm_segment_t fs;
72017- const char *data = (const char *)addr;
72018+ const char __user *data = (const char __force_user *)addr;
72019 ssize_t wr = 0;
72020
72021 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
72022@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
72023 return 1;
72024 }
72025
72026+#ifdef CONFIG_GRKERNSEC_HIDESYM
72027+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
72028+#endif
72029+
72030 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72031 enum autofs_notify notify)
72032 {
72033@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72034
72035 /* If this is a direct mount request create a dummy name */
72036 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
72037+#ifdef CONFIG_GRKERNSEC_HIDESYM
72038+ /* this name does get written to userland via autofs4_write() */
72039+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
72040+#else
72041 qstr.len = sprintf(name, "%p", dentry);
72042+#endif
72043 else {
72044 qstr.len = autofs4_getpath(sbi, dentry, &name);
72045 if (!qstr.len) {
72046diff --git a/fs/befs/endian.h b/fs/befs/endian.h
72047index 2722387..56059b5 100644
72048--- a/fs/befs/endian.h
72049+++ b/fs/befs/endian.h
72050@@ -11,7 +11,7 @@
72051
72052 #include <asm/byteorder.h>
72053
72054-static inline u64
72055+static inline u64 __intentional_overflow(-1)
72056 fs64_to_cpu(const struct super_block *sb, fs64 n)
72057 {
72058 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72059@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
72060 return (__force fs64)cpu_to_be64(n);
72061 }
72062
72063-static inline u32
72064+static inline u32 __intentional_overflow(-1)
72065 fs32_to_cpu(const struct super_block *sb, fs32 n)
72066 {
72067 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72068@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
72069 return (__force fs32)cpu_to_be32(n);
72070 }
72071
72072-static inline u16
72073+static inline u16 __intentional_overflow(-1)
72074 fs16_to_cpu(const struct super_block *sb, fs16 n)
72075 {
72076 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72077diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
72078index 4c55668..eeae150 100644
72079--- a/fs/binfmt_aout.c
72080+++ b/fs/binfmt_aout.c
72081@@ -16,6 +16,7 @@
72082 #include <linux/string.h>
72083 #include <linux/fs.h>
72084 #include <linux/file.h>
72085+#include <linux/security.h>
72086 #include <linux/stat.h>
72087 #include <linux/fcntl.h>
72088 #include <linux/ptrace.h>
72089@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
72090 #endif
72091 # define START_STACK(u) ((void __user *)u.start_stack)
72092
72093+ memset(&dump, 0, sizeof(dump));
72094+
72095 fs = get_fs();
72096 set_fs(KERNEL_DS);
72097 has_dumped = 1;
72098@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
72099
72100 /* If the size of the dump file exceeds the rlimit, then see what would happen
72101 if we wrote the stack, but not the data area. */
72102+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
72103 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
72104 dump.u_dsize = 0;
72105
72106 /* Make sure we have enough room to write the stack and data areas. */
72107+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
72108 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
72109 dump.u_ssize = 0;
72110
72111@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
72112 rlim = rlimit(RLIMIT_DATA);
72113 if (rlim >= RLIM_INFINITY)
72114 rlim = ~0;
72115+
72116+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
72117 if (ex.a_data + ex.a_bss > rlim)
72118 return -ENOMEM;
72119
72120@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
72121
72122 install_exec_creds(bprm);
72123
72124+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72125+ current->mm->pax_flags = 0UL;
72126+#endif
72127+
72128+#ifdef CONFIG_PAX_PAGEEXEC
72129+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
72130+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
72131+
72132+#ifdef CONFIG_PAX_EMUTRAMP
72133+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
72134+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
72135+#endif
72136+
72137+#ifdef CONFIG_PAX_MPROTECT
72138+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
72139+ current->mm->pax_flags |= MF_PAX_MPROTECT;
72140+#endif
72141+
72142+ }
72143+#endif
72144+
72145 if (N_MAGIC(ex) == OMAGIC) {
72146 unsigned long text_addr, map_size;
72147 loff_t pos;
72148@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
72149 return error;
72150
72151 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
72152- PROT_READ | PROT_WRITE | PROT_EXEC,
72153+ PROT_READ | PROT_WRITE,
72154 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
72155 fd_offset + ex.a_text);
72156 if (error != N_DATADDR(ex))
72157diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
72158index cd46e41..244f778 100644
72159--- a/fs/binfmt_elf.c
72160+++ b/fs/binfmt_elf.c
72161@@ -35,6 +35,7 @@
72162 #include <linux/utsname.h>
72163 #include <linux/coredump.h>
72164 #include <linux/sched.h>
72165+#include <linux/xattr.h>
72166 #include <asm/uaccess.h>
72167 #include <asm/param.h>
72168 #include <asm/page.h>
72169@@ -48,7 +49,7 @@
72170
72171 static int load_elf_binary(struct linux_binprm *bprm);
72172 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
72173- int, int, unsigned long);
72174+ int, int, unsigned long) __intentional_overflow(-1);
72175
72176 #ifdef CONFIG_USELIB
72177 static int load_elf_library(struct file *);
72178@@ -66,6 +67,14 @@ static int elf_core_dump(struct coredump_params *cprm);
72179 #define elf_core_dump NULL
72180 #endif
72181
72182+#ifdef CONFIG_PAX_MPROTECT
72183+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
72184+#endif
72185+
72186+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72187+static void elf_handle_mmap(struct file *file);
72188+#endif
72189+
72190 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
72191 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
72192 #else
72193@@ -85,6 +94,15 @@ static struct linux_binfmt elf_format = {
72194 .load_binary = load_elf_binary,
72195 .load_shlib = load_elf_library,
72196 .core_dump = elf_core_dump,
72197+
72198+#ifdef CONFIG_PAX_MPROTECT
72199+ .handle_mprotect= elf_handle_mprotect,
72200+#endif
72201+
72202+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72203+ .handle_mmap = elf_handle_mmap,
72204+#endif
72205+
72206 .min_coredump = ELF_EXEC_PAGESIZE,
72207 };
72208
72209@@ -92,6 +110,8 @@ static struct linux_binfmt elf_format = {
72210
72211 static int set_brk(unsigned long start, unsigned long end)
72212 {
72213+ unsigned long e = end;
72214+
72215 start = ELF_PAGEALIGN(start);
72216 end = ELF_PAGEALIGN(end);
72217 if (end > start) {
72218@@ -100,7 +120,7 @@ static int set_brk(unsigned long start, unsigned long end)
72219 if (BAD_ADDR(addr))
72220 return addr;
72221 }
72222- current->mm->start_brk = current->mm->brk = end;
72223+ current->mm->start_brk = current->mm->brk = e;
72224 return 0;
72225 }
72226
72227@@ -161,12 +181,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72228 elf_addr_t __user *u_rand_bytes;
72229 const char *k_platform = ELF_PLATFORM;
72230 const char *k_base_platform = ELF_BASE_PLATFORM;
72231- unsigned char k_rand_bytes[16];
72232+ u32 k_rand_bytes[4];
72233 int items;
72234 elf_addr_t *elf_info;
72235 int ei_index = 0;
72236 const struct cred *cred = current_cred();
72237 struct vm_area_struct *vma;
72238+ unsigned long saved_auxv[AT_VECTOR_SIZE];
72239
72240 /*
72241 * In some cases (e.g. Hyper-Threading), we want to avoid L1
72242@@ -208,8 +229,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72243 * Generate 16 random bytes for userspace PRNG seeding.
72244 */
72245 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
72246- u_rand_bytes = (elf_addr_t __user *)
72247- STACK_ALLOC(p, sizeof(k_rand_bytes));
72248+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
72249+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
72250+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
72251+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
72252+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
72253+ u_rand_bytes = (elf_addr_t __user *) p;
72254 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
72255 return -EFAULT;
72256
72257@@ -324,9 +349,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72258 return -EFAULT;
72259 current->mm->env_end = p;
72260
72261+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
72262+
72263 /* Put the elf_info on the stack in the right place. */
72264 sp = (elf_addr_t __user *)envp + 1;
72265- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
72266+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
72267 return -EFAULT;
72268 return 0;
72269 }
72270@@ -515,14 +542,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
72271 an ELF header */
72272
72273 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72274- struct file *interpreter, unsigned long *interp_map_addr,
72275+ struct file *interpreter,
72276 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
72277 {
72278 struct elf_phdr *eppnt;
72279- unsigned long load_addr = 0;
72280+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
72281 int load_addr_set = 0;
72282 unsigned long last_bss = 0, elf_bss = 0;
72283- unsigned long error = ~0UL;
72284+ unsigned long error = -EINVAL;
72285 unsigned long total_size;
72286 int i;
72287
72288@@ -542,6 +569,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72289 goto out;
72290 }
72291
72292+#ifdef CONFIG_PAX_SEGMEXEC
72293+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
72294+ pax_task_size = SEGMEXEC_TASK_SIZE;
72295+#endif
72296+
72297 eppnt = interp_elf_phdata;
72298 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
72299 if (eppnt->p_type == PT_LOAD) {
72300@@ -565,8 +597,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72301 map_addr = elf_map(interpreter, load_addr + vaddr,
72302 eppnt, elf_prot, elf_type, total_size);
72303 total_size = 0;
72304- if (!*interp_map_addr)
72305- *interp_map_addr = map_addr;
72306 error = map_addr;
72307 if (BAD_ADDR(map_addr))
72308 goto out;
72309@@ -585,8 +615,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72310 k = load_addr + eppnt->p_vaddr;
72311 if (BAD_ADDR(k) ||
72312 eppnt->p_filesz > eppnt->p_memsz ||
72313- eppnt->p_memsz > TASK_SIZE ||
72314- TASK_SIZE - eppnt->p_memsz < k) {
72315+ eppnt->p_memsz > pax_task_size ||
72316+ pax_task_size - eppnt->p_memsz < k) {
72317 error = -ENOMEM;
72318 goto out;
72319 }
72320@@ -625,9 +655,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72321 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
72322
72323 /* Map the last of the bss segment */
72324- error = vm_brk(elf_bss, last_bss - elf_bss);
72325- if (BAD_ADDR(error))
72326- goto out;
72327+ if (last_bss > elf_bss) {
72328+ error = vm_brk(elf_bss, last_bss - elf_bss);
72329+ if (BAD_ADDR(error))
72330+ goto out;
72331+ }
72332 }
72333
72334 error = load_addr;
72335@@ -635,6 +667,336 @@ out:
72336 return error;
72337 }
72338
72339+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72340+#ifdef CONFIG_PAX_SOFTMODE
72341+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
72342+{
72343+ unsigned long pax_flags = 0UL;
72344+
72345+#ifdef CONFIG_PAX_PAGEEXEC
72346+ if (elf_phdata->p_flags & PF_PAGEEXEC)
72347+ pax_flags |= MF_PAX_PAGEEXEC;
72348+#endif
72349+
72350+#ifdef CONFIG_PAX_SEGMEXEC
72351+ if (elf_phdata->p_flags & PF_SEGMEXEC)
72352+ pax_flags |= MF_PAX_SEGMEXEC;
72353+#endif
72354+
72355+#ifdef CONFIG_PAX_EMUTRAMP
72356+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72357+ pax_flags |= MF_PAX_EMUTRAMP;
72358+#endif
72359+
72360+#ifdef CONFIG_PAX_MPROTECT
72361+ if (elf_phdata->p_flags & PF_MPROTECT)
72362+ pax_flags |= MF_PAX_MPROTECT;
72363+#endif
72364+
72365+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72366+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
72367+ pax_flags |= MF_PAX_RANDMMAP;
72368+#endif
72369+
72370+ return pax_flags;
72371+}
72372+#endif
72373+
72374+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
72375+{
72376+ unsigned long pax_flags = 0UL;
72377+
72378+#ifdef CONFIG_PAX_PAGEEXEC
72379+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
72380+ pax_flags |= MF_PAX_PAGEEXEC;
72381+#endif
72382+
72383+#ifdef CONFIG_PAX_SEGMEXEC
72384+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
72385+ pax_flags |= MF_PAX_SEGMEXEC;
72386+#endif
72387+
72388+#ifdef CONFIG_PAX_EMUTRAMP
72389+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
72390+ pax_flags |= MF_PAX_EMUTRAMP;
72391+#endif
72392+
72393+#ifdef CONFIG_PAX_MPROTECT
72394+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
72395+ pax_flags |= MF_PAX_MPROTECT;
72396+#endif
72397+
72398+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72399+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
72400+ pax_flags |= MF_PAX_RANDMMAP;
72401+#endif
72402+
72403+ return pax_flags;
72404+}
72405+#endif
72406+
72407+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72408+#ifdef CONFIG_PAX_SOFTMODE
72409+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
72410+{
72411+ unsigned long pax_flags = 0UL;
72412+
72413+#ifdef CONFIG_PAX_PAGEEXEC
72414+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
72415+ pax_flags |= MF_PAX_PAGEEXEC;
72416+#endif
72417+
72418+#ifdef CONFIG_PAX_SEGMEXEC
72419+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
72420+ pax_flags |= MF_PAX_SEGMEXEC;
72421+#endif
72422+
72423+#ifdef CONFIG_PAX_EMUTRAMP
72424+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72425+ pax_flags |= MF_PAX_EMUTRAMP;
72426+#endif
72427+
72428+#ifdef CONFIG_PAX_MPROTECT
72429+ if (pax_flags_softmode & MF_PAX_MPROTECT)
72430+ pax_flags |= MF_PAX_MPROTECT;
72431+#endif
72432+
72433+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72434+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
72435+ pax_flags |= MF_PAX_RANDMMAP;
72436+#endif
72437+
72438+ return pax_flags;
72439+}
72440+#endif
72441+
72442+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
72443+{
72444+ unsigned long pax_flags = 0UL;
72445+
72446+#ifdef CONFIG_PAX_PAGEEXEC
72447+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
72448+ pax_flags |= MF_PAX_PAGEEXEC;
72449+#endif
72450+
72451+#ifdef CONFIG_PAX_SEGMEXEC
72452+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
72453+ pax_flags |= MF_PAX_SEGMEXEC;
72454+#endif
72455+
72456+#ifdef CONFIG_PAX_EMUTRAMP
72457+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
72458+ pax_flags |= MF_PAX_EMUTRAMP;
72459+#endif
72460+
72461+#ifdef CONFIG_PAX_MPROTECT
72462+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
72463+ pax_flags |= MF_PAX_MPROTECT;
72464+#endif
72465+
72466+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72467+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
72468+ pax_flags |= MF_PAX_RANDMMAP;
72469+#endif
72470+
72471+ return pax_flags;
72472+}
72473+#endif
72474+
72475+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72476+static unsigned long pax_parse_defaults(void)
72477+{
72478+ unsigned long pax_flags = 0UL;
72479+
72480+#ifdef CONFIG_PAX_SOFTMODE
72481+ if (pax_softmode)
72482+ return pax_flags;
72483+#endif
72484+
72485+#ifdef CONFIG_PAX_PAGEEXEC
72486+ pax_flags |= MF_PAX_PAGEEXEC;
72487+#endif
72488+
72489+#ifdef CONFIG_PAX_SEGMEXEC
72490+ pax_flags |= MF_PAX_SEGMEXEC;
72491+#endif
72492+
72493+#ifdef CONFIG_PAX_MPROTECT
72494+ pax_flags |= MF_PAX_MPROTECT;
72495+#endif
72496+
72497+#ifdef CONFIG_PAX_RANDMMAP
72498+ if (randomize_va_space)
72499+ pax_flags |= MF_PAX_RANDMMAP;
72500+#endif
72501+
72502+ return pax_flags;
72503+}
72504+
72505+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
72506+{
72507+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
72508+
72509+#ifdef CONFIG_PAX_EI_PAX
72510+
72511+#ifdef CONFIG_PAX_SOFTMODE
72512+ if (pax_softmode)
72513+ return pax_flags;
72514+#endif
72515+
72516+ pax_flags = 0UL;
72517+
72518+#ifdef CONFIG_PAX_PAGEEXEC
72519+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
72520+ pax_flags |= MF_PAX_PAGEEXEC;
72521+#endif
72522+
72523+#ifdef CONFIG_PAX_SEGMEXEC
72524+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
72525+ pax_flags |= MF_PAX_SEGMEXEC;
72526+#endif
72527+
72528+#ifdef CONFIG_PAX_EMUTRAMP
72529+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
72530+ pax_flags |= MF_PAX_EMUTRAMP;
72531+#endif
72532+
72533+#ifdef CONFIG_PAX_MPROTECT
72534+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
72535+ pax_flags |= MF_PAX_MPROTECT;
72536+#endif
72537+
72538+#ifdef CONFIG_PAX_ASLR
72539+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
72540+ pax_flags |= MF_PAX_RANDMMAP;
72541+#endif
72542+
72543+#endif
72544+
72545+ return pax_flags;
72546+
72547+}
72548+
72549+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
72550+{
72551+
72552+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72553+ unsigned long i;
72554+
72555+ for (i = 0UL; i < elf_ex->e_phnum; i++)
72556+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
72557+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
72558+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
72559+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
72560+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
72561+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
72562+ return PAX_PARSE_FLAGS_FALLBACK;
72563+
72564+#ifdef CONFIG_PAX_SOFTMODE
72565+ if (pax_softmode)
72566+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
72567+ else
72568+#endif
72569+
72570+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
72571+ break;
72572+ }
72573+#endif
72574+
72575+ return PAX_PARSE_FLAGS_FALLBACK;
72576+}
72577+
72578+static unsigned long pax_parse_xattr_pax(struct file * const file)
72579+{
72580+
72581+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72582+ ssize_t xattr_size, i;
72583+ unsigned char xattr_value[sizeof("pemrs") - 1];
72584+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
72585+
72586+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
72587+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
72588+ return PAX_PARSE_FLAGS_FALLBACK;
72589+
72590+ for (i = 0; i < xattr_size; i++)
72591+ switch (xattr_value[i]) {
72592+ default:
72593+ return PAX_PARSE_FLAGS_FALLBACK;
72594+
72595+#define parse_flag(option1, option2, flag) \
72596+ case option1: \
72597+ if (pax_flags_hardmode & MF_PAX_##flag) \
72598+ return PAX_PARSE_FLAGS_FALLBACK;\
72599+ pax_flags_hardmode |= MF_PAX_##flag; \
72600+ break; \
72601+ case option2: \
72602+ if (pax_flags_softmode & MF_PAX_##flag) \
72603+ return PAX_PARSE_FLAGS_FALLBACK;\
72604+ pax_flags_softmode |= MF_PAX_##flag; \
72605+ break;
72606+
72607+ parse_flag('p', 'P', PAGEEXEC);
72608+ parse_flag('e', 'E', EMUTRAMP);
72609+ parse_flag('m', 'M', MPROTECT);
72610+ parse_flag('r', 'R', RANDMMAP);
72611+ parse_flag('s', 'S', SEGMEXEC);
72612+
72613+#undef parse_flag
72614+ }
72615+
72616+ if (pax_flags_hardmode & pax_flags_softmode)
72617+ return PAX_PARSE_FLAGS_FALLBACK;
72618+
72619+#ifdef CONFIG_PAX_SOFTMODE
72620+ if (pax_softmode)
72621+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
72622+ else
72623+#endif
72624+
72625+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
72626+#else
72627+ return PAX_PARSE_FLAGS_FALLBACK;
72628+#endif
72629+
72630+}
72631+
72632+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
72633+{
72634+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
72635+
72636+ pax_flags = pax_parse_defaults();
72637+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
72638+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
72639+ xattr_pax_flags = pax_parse_xattr_pax(file);
72640+
72641+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72642+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72643+ pt_pax_flags != xattr_pax_flags)
72644+ return -EINVAL;
72645+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72646+ pax_flags = xattr_pax_flags;
72647+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72648+ pax_flags = pt_pax_flags;
72649+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72650+ pax_flags = ei_pax_flags;
72651+
72652+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
72653+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72654+ if ((__supported_pte_mask & _PAGE_NX))
72655+ pax_flags &= ~MF_PAX_SEGMEXEC;
72656+ else
72657+ pax_flags &= ~MF_PAX_PAGEEXEC;
72658+ }
72659+#endif
72660+
72661+ if (0 > pax_check_flags(&pax_flags))
72662+ return -EINVAL;
72663+
72664+ current->mm->pax_flags = pax_flags;
72665+ return 0;
72666+}
72667+#endif
72668+
72669 /*
72670 * These are the functions used to load ELF style executables and shared
72671 * libraries. There is no binary dependent code anywhere else.
72672@@ -648,6 +1010,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
72673 {
72674 unsigned long random_variable = 0;
72675
72676+#ifdef CONFIG_PAX_RANDUSTACK
72677+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
72678+ return stack_top - current->mm->delta_stack;
72679+#endif
72680+
72681 if ((current->flags & PF_RANDOMIZE) &&
72682 !(current->personality & ADDR_NO_RANDOMIZE)) {
72683 random_variable = (unsigned long) get_random_int();
72684@@ -667,7 +1034,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72685 unsigned long load_addr = 0, load_bias = 0;
72686 int load_addr_set = 0;
72687 char * elf_interpreter = NULL;
72688- unsigned long error;
72689+ unsigned long error = 0;
72690 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
72691 unsigned long elf_bss, elf_brk;
72692 int retval, i;
72693@@ -682,6 +1049,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72694 struct elfhdr interp_elf_ex;
72695 } *loc;
72696 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
72697+ unsigned long pax_task_size;
72698
72699 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
72700 if (!loc) {
72701@@ -840,6 +1208,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
72702 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
72703 may depend on the personality. */
72704 SET_PERSONALITY2(loc->elf_ex, &arch_state);
72705+
72706+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72707+ current->mm->pax_flags = 0UL;
72708+#endif
72709+
72710+#ifdef CONFIG_PAX_DLRESOLVE
72711+ current->mm->call_dl_resolve = 0UL;
72712+#endif
72713+
72714+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
72715+ current->mm->call_syscall = 0UL;
72716+#endif
72717+
72718+#ifdef CONFIG_PAX_ASLR
72719+ current->mm->delta_mmap = 0UL;
72720+ current->mm->delta_stack = 0UL;
72721+#endif
72722+
72723+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72724+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
72725+ send_sig(SIGKILL, current, 0);
72726+ goto out_free_dentry;
72727+ }
72728+#endif
72729+
72730+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
72731+ pax_set_initial_flags(bprm);
72732+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
72733+ if (pax_set_initial_flags_func)
72734+ (pax_set_initial_flags_func)(bprm);
72735+#endif
72736+
72737+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72738+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
72739+ current->mm->context.user_cs_limit = PAGE_SIZE;
72740+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
72741+ }
72742+#endif
72743+
72744+#ifdef CONFIG_PAX_SEGMEXEC
72745+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
72746+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
72747+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
72748+ pax_task_size = SEGMEXEC_TASK_SIZE;
72749+ current->mm->def_flags |= VM_NOHUGEPAGE;
72750+ } else
72751+#endif
72752+
72753+ pax_task_size = TASK_SIZE;
72754+
72755+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
72756+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72757+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
72758+ put_cpu();
72759+ }
72760+#endif
72761+
72762+#ifdef CONFIG_PAX_ASLR
72763+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
72764+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
72765+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
72766+ }
72767+#endif
72768+
72769+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72770+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72771+ executable_stack = EXSTACK_DISABLE_X;
72772+ current->personality &= ~READ_IMPLIES_EXEC;
72773+ } else
72774+#endif
72775+
72776 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
72777 current->personality |= READ_IMPLIES_EXEC;
72778
72779@@ -915,8 +1354,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
72780 if (current->flags & PF_RANDOMIZE)
72781 load_bias += arch_mmap_rnd();
72782 load_bias = ELF_PAGESTART(load_bias);
72783- total_size = total_mapping_size(elf_phdata,
72784- loc->elf_ex.e_phnum);
72785+
72786+#ifdef CONFIG_PAX_RANDMMAP
72787+ /* PaX: randomize base address at the default exe base if requested */
72788+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
72789+#ifdef CONFIG_SPARC64
72790+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
72791+#else
72792+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
72793+#endif
72794+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
72795+ elf_flags |= MAP_FIXED;
72796+ }
72797+#endif
72798+
72799+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
72800 if (!total_size) {
72801 retval = -EINVAL;
72802 goto out_free_dentry;
72803@@ -952,9 +1404,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
72804 * allowed task size. Note that p_filesz must always be
72805 * <= p_memsz so it is only necessary to check p_memsz.
72806 */
72807- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
72808- elf_ppnt->p_memsz > TASK_SIZE ||
72809- TASK_SIZE - elf_ppnt->p_memsz < k) {
72810+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
72811+ elf_ppnt->p_memsz > pax_task_size ||
72812+ pax_task_size - elf_ppnt->p_memsz < k) {
72813 /* set_brk can never work. Avoid overflows. */
72814 retval = -EINVAL;
72815 goto out_free_dentry;
72816@@ -990,16 +1442,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
72817 if (retval)
72818 goto out_free_dentry;
72819 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
72820- retval = -EFAULT; /* Nobody gets to see this, but.. */
72821- goto out_free_dentry;
72822+ /*
72823+ * This bss-zeroing can fail if the ELF
72824+ * file specifies odd protections. So
72825+ * we don't check the return value
72826+ */
72827 }
72828
72829+#ifdef CONFIG_PAX_RANDMMAP
72830+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
72831+ unsigned long start, size, flags;
72832+ vm_flags_t vm_flags;
72833+
72834+ start = ELF_PAGEALIGN(elf_brk);
72835+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
72836+ flags = MAP_FIXED | MAP_PRIVATE;
72837+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
72838+
72839+ down_write(&current->mm->mmap_sem);
72840+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
72841+ retval = -ENOMEM;
72842+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
72843+// if (current->personality & ADDR_NO_RANDOMIZE)
72844+// vm_flags |= VM_READ | VM_MAYREAD;
72845+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
72846+ retval = IS_ERR_VALUE(start) ? start : 0;
72847+ }
72848+ up_write(&current->mm->mmap_sem);
72849+ if (retval == 0)
72850+ retval = set_brk(start + size, start + size + PAGE_SIZE);
72851+ if (retval < 0)
72852+ goto out_free_dentry;
72853+ }
72854+#endif
72855+
72856 if (elf_interpreter) {
72857- unsigned long interp_map_addr = 0;
72858-
72859 elf_entry = load_elf_interp(&loc->interp_elf_ex,
72860 interpreter,
72861- &interp_map_addr,
72862 load_bias, interp_elf_phdata);
72863 if (!IS_ERR((void *)elf_entry)) {
72864 /*
72865@@ -1050,6 +1529,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72866 current->mm->end_data = end_data;
72867 current->mm->start_stack = bprm->p;
72868
72869+#ifndef CONFIG_PAX_RANDMMAP
72870 if ((current->flags & PF_RANDOMIZE) && (randomize_va_space > 1)) {
72871 current->mm->brk = current->mm->start_brk =
72872 arch_randomize_brk(current->mm);
72873@@ -1057,6 +1537,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72874 current->brk_randomized = 1;
72875 #endif
72876 }
72877+#endif
72878
72879 if (current->personality & MMAP_PAGE_ZERO) {
72880 /* Why this, you ask??? Well SVr4 maps page 0 as read-only,
72881@@ -1225,7 +1706,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
72882 * Decide what to dump of a segment, part, all or none.
72883 */
72884 static unsigned long vma_dump_size(struct vm_area_struct *vma,
72885- unsigned long mm_flags)
72886+ unsigned long mm_flags, long signr)
72887 {
72888 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
72889
72890@@ -1263,7 +1744,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
72891 if (vma->vm_file == NULL)
72892 return 0;
72893
72894- if (FILTER(MAPPED_PRIVATE))
72895+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
72896 goto whole;
72897
72898 /*
72899@@ -1470,9 +1951,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
72900 {
72901 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
72902 int i = 0;
72903- do
72904+ do {
72905 i += 2;
72906- while (auxv[i - 2] != AT_NULL);
72907+ } while (auxv[i - 2] != AT_NULL);
72908 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
72909 }
72910
72911@@ -1481,7 +1962,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
72912 {
72913 mm_segment_t old_fs = get_fs();
72914 set_fs(KERNEL_DS);
72915- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
72916+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
72917 set_fs(old_fs);
72918 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
72919 }
72920@@ -2201,7 +2682,7 @@ static int elf_core_dump(struct coredump_params *cprm)
72921 vma = next_vma(vma, gate_vma)) {
72922 unsigned long dump_size;
72923
72924- dump_size = vma_dump_size(vma, cprm->mm_flags);
72925+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
72926 vma_filesz[i++] = dump_size;
72927 vma_data_size += dump_size;
72928 }
72929@@ -2309,6 +2790,167 @@ out:
72930
72931 #endif /* CONFIG_ELF_CORE */
72932
72933+#ifdef CONFIG_PAX_MPROTECT
72934+/* PaX: non-PIC ELF libraries need relocations on their executable segments
72935+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
72936+ * we'll remove VM_MAYWRITE for good on RELRO segments.
72937+ *
72938+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
72939+ * basis because we want to allow the common case and not the special ones.
72940+ */
72941+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
72942+{
72943+ struct elfhdr elf_h;
72944+ struct elf_phdr elf_p;
72945+ unsigned long i;
72946+ unsigned long oldflags;
72947+ bool is_textrel_rw, is_textrel_rx, is_relro;
72948+
72949+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
72950+ return;
72951+
72952+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
72953+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
72954+
72955+#ifdef CONFIG_PAX_ELFRELOCS
72956+ /* possible TEXTREL */
72957+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
72958+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
72959+#else
72960+ is_textrel_rw = false;
72961+ is_textrel_rx = false;
72962+#endif
72963+
72964+ /* possible RELRO */
72965+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
72966+
72967+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
72968+ return;
72969+
72970+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
72971+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
72972+
72973+#ifdef CONFIG_PAX_ETEXECRELOCS
72974+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
72975+#else
72976+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
72977+#endif
72978+
72979+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
72980+ !elf_check_arch(&elf_h) ||
72981+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
72982+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
72983+ return;
72984+
72985+ for (i = 0UL; i < elf_h.e_phnum; i++) {
72986+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
72987+ return;
72988+ switch (elf_p.p_type) {
72989+ case PT_DYNAMIC:
72990+ if (!is_textrel_rw && !is_textrel_rx)
72991+ continue;
72992+ i = 0UL;
72993+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
72994+ elf_dyn dyn;
72995+
72996+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
72997+ break;
72998+ if (dyn.d_tag == DT_NULL)
72999+ break;
73000+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
73001+ gr_log_textrel(vma);
73002+ if (is_textrel_rw)
73003+ vma->vm_flags |= VM_MAYWRITE;
73004+ else
73005+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
73006+ vma->vm_flags &= ~VM_MAYWRITE;
73007+ break;
73008+ }
73009+ i++;
73010+ }
73011+ is_textrel_rw = false;
73012+ is_textrel_rx = false;
73013+ continue;
73014+
73015+ case PT_GNU_RELRO:
73016+ if (!is_relro)
73017+ continue;
73018+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
73019+ vma->vm_flags &= ~VM_MAYWRITE;
73020+ is_relro = false;
73021+ continue;
73022+
73023+#ifdef CONFIG_PAX_PT_PAX_FLAGS
73024+ case PT_PAX_FLAGS: {
73025+ const char *msg_mprotect = "", *msg_emutramp = "";
73026+ char *buffer_lib, *buffer_exe;
73027+
73028+ if (elf_p.p_flags & PF_NOMPROTECT)
73029+ msg_mprotect = "MPROTECT disabled";
73030+
73031+#ifdef CONFIG_PAX_EMUTRAMP
73032+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
73033+ msg_emutramp = "EMUTRAMP enabled";
73034+#endif
73035+
73036+ if (!msg_mprotect[0] && !msg_emutramp[0])
73037+ continue;
73038+
73039+ if (!printk_ratelimit())
73040+ continue;
73041+
73042+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
73043+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
73044+ if (buffer_lib && buffer_exe) {
73045+ char *path_lib, *path_exe;
73046+
73047+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
73048+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
73049+
73050+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
73051+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
73052+
73053+ }
73054+ free_page((unsigned long)buffer_exe);
73055+ free_page((unsigned long)buffer_lib);
73056+ continue;
73057+ }
73058+#endif
73059+
73060+ }
73061+ }
73062+}
73063+#endif
73064+
73065+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
73066+
73067+extern int grsec_enable_log_rwxmaps;
73068+
73069+static void elf_handle_mmap(struct file *file)
73070+{
73071+ struct elfhdr elf_h;
73072+ struct elf_phdr elf_p;
73073+ unsigned long i;
73074+
73075+ if (!grsec_enable_log_rwxmaps)
73076+ return;
73077+
73078+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73079+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73080+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
73081+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73082+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73083+ return;
73084+
73085+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73086+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73087+ return;
73088+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
73089+ gr_log_ptgnustack(file);
73090+ }
73091+}
73092+#endif
73093+
73094 static int __init init_elf_binfmt(void)
73095 {
73096 register_binfmt(&elf_format);
73097diff --git a/fs/block_dev.c b/fs/block_dev.c
73098index c7e4163..6939003 100644
73099--- a/fs/block_dev.c
73100+++ b/fs/block_dev.c
73101@@ -732,7 +732,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
73102 else if (bdev->bd_contains == bdev)
73103 return true; /* is a whole device which isn't held */
73104
73105- else if (whole->bd_holder == bd_may_claim)
73106+ else if (whole->bd_holder == (void *)bd_may_claim)
73107 return true; /* is a partition of a device that is being partitioned */
73108 else if (whole->bd_holder != NULL)
73109 return false; /* is a partition of a held device */
73110diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
73111index 0f11ebc..1bf3321 100644
73112--- a/fs/btrfs/ctree.c
73113+++ b/fs/btrfs/ctree.c
73114@@ -1180,9 +1180,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
73115 free_extent_buffer(buf);
73116 add_root_to_dirty_list(root);
73117 } else {
73118- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
73119- parent_start = parent->start;
73120- else
73121+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
73122+ if (parent)
73123+ parent_start = parent->start;
73124+ else
73125+ parent_start = 0;
73126+ } else
73127 parent_start = 0;
73128
73129 WARN_ON(trans->transid != btrfs_header_generation(parent));
73130diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
73131index a2ae427..53c2e98 100644
73132--- a/fs/btrfs/delayed-inode.c
73133+++ b/fs/btrfs/delayed-inode.c
73134@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
73135
73136 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
73137 {
73138- int seq = atomic_inc_return(&delayed_root->items_seq);
73139+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
73140 if ((atomic_dec_return(&delayed_root->items) <
73141 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
73142 waitqueue_active(&delayed_root->wait))
73143@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
73144
73145 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
73146 {
73147- int val = atomic_read(&delayed_root->items_seq);
73148+ int val = atomic_read_unchecked(&delayed_root->items_seq);
73149
73150 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
73151 return 1;
73152@@ -1437,7 +1437,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
73153 int seq;
73154 int ret;
73155
73156- seq = atomic_read(&delayed_root->items_seq);
73157+ seq = atomic_read_unchecked(&delayed_root->items_seq);
73158
73159 ret = btrfs_wq_run_delayed_node(delayed_root, fs_info, 0);
73160 if (ret)
73161diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
73162index f70119f..ab5894d 100644
73163--- a/fs/btrfs/delayed-inode.h
73164+++ b/fs/btrfs/delayed-inode.h
73165@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
73166 */
73167 struct list_head prepare_list;
73168 atomic_t items; /* for delayed items */
73169- atomic_t items_seq; /* for delayed items */
73170+ atomic_unchecked_t items_seq; /* for delayed items */
73171 int nodes; /* for delayed nodes */
73172 wait_queue_head_t wait;
73173 };
73174@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
73175 struct btrfs_delayed_root *delayed_root)
73176 {
73177 atomic_set(&delayed_root->items, 0);
73178- atomic_set(&delayed_root->items_seq, 0);
73179+ atomic_set_unchecked(&delayed_root->items_seq, 0);
73180 delayed_root->nodes = 0;
73181 spin_lock_init(&delayed_root->lock);
73182 init_waitqueue_head(&delayed_root->wait);
73183diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
73184index 9e66f5e..f7caaf0 100644
73185--- a/fs/btrfs/super.c
73186+++ b/fs/btrfs/super.c
73187@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
73188 function, line, errstr);
73189 return;
73190 }
73191- ACCESS_ONCE(trans->transaction->aborted) = errno;
73192+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
73193 /* Wake up anybody who may be waiting on this transaction */
73194 wake_up(&root->fs_info->transaction_wait);
73195 wake_up(&root->fs_info->transaction_blocked_wait);
73196diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
73197index e8a4c86..f8c22ae 100644
73198--- a/fs/btrfs/sysfs.c
73199+++ b/fs/btrfs/sysfs.c
73200@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
73201 for (set = 0; set < FEAT_MAX; set++) {
73202 int i;
73203 struct attribute *attrs[2];
73204- struct attribute_group agroup = {
73205+ attribute_group_no_const agroup = {
73206 .name = "features",
73207 .attrs = attrs,
73208 };
73209diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
73210index 2299bfd..4098e72 100644
73211--- a/fs/btrfs/tests/free-space-tests.c
73212+++ b/fs/btrfs/tests/free-space-tests.c
73213@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73214 * extent entry.
73215 */
73216 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
73217- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73218+ pax_open_kernel();
73219+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73220+ pax_close_kernel();
73221
73222 /*
73223 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
73224@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73225 if (ret)
73226 return ret;
73227
73228- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73229+ pax_open_kernel();
73230+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73231+ pax_close_kernel();
73232 __btrfs_remove_free_space_cache(cache->free_space_ctl);
73233
73234 return 0;
73235diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
73236index 6916a78..4598936 100644
73237--- a/fs/btrfs/tree-log.h
73238+++ b/fs/btrfs/tree-log.h
73239@@ -45,7 +45,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
73240 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
73241 struct btrfs_trans_handle *trans)
73242 {
73243- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
73244+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
73245 }
73246
73247 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
73248diff --git a/fs/buffer.c b/fs/buffer.c
73249index c7a5602..18eabd1 100644
73250--- a/fs/buffer.c
73251+++ b/fs/buffer.c
73252@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
73253 bh_cachep = kmem_cache_create("buffer_head",
73254 sizeof(struct buffer_head), 0,
73255 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
73256- SLAB_MEM_SPREAD),
73257+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
73258 NULL);
73259
73260 /*
73261diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
73262index 6af790f..ec4c1e6 100644
73263--- a/fs/cachefiles/bind.c
73264+++ b/fs/cachefiles/bind.c
73265@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
73266 args);
73267
73268 /* start by checking things over */
73269- ASSERT(cache->fstop_percent >= 0 &&
73270- cache->fstop_percent < cache->fcull_percent &&
73271+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
73272 cache->fcull_percent < cache->frun_percent &&
73273 cache->frun_percent < 100);
73274
73275- ASSERT(cache->bstop_percent >= 0 &&
73276- cache->bstop_percent < cache->bcull_percent &&
73277+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
73278 cache->bcull_percent < cache->brun_percent &&
73279 cache->brun_percent < 100);
73280
73281diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
73282index f601def..b2cf704 100644
73283--- a/fs/cachefiles/daemon.c
73284+++ b/fs/cachefiles/daemon.c
73285@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
73286 if (n > buflen)
73287 return -EMSGSIZE;
73288
73289- if (copy_to_user(_buffer, buffer, n) != 0)
73290+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
73291 return -EFAULT;
73292
73293 return n;
73294@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
73295 if (test_bit(CACHEFILES_DEAD, &cache->flags))
73296 return -EIO;
73297
73298- if (datalen < 0 || datalen > PAGE_SIZE - 1)
73299+ if (datalen > PAGE_SIZE - 1)
73300 return -EOPNOTSUPP;
73301
73302 /* drag the command string into the kernel so we can parse it */
73303@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
73304 if (args[0] != '%' || args[1] != '\0')
73305 return -EINVAL;
73306
73307- if (fstop < 0 || fstop >= cache->fcull_percent)
73308+ if (fstop >= cache->fcull_percent)
73309 return cachefiles_daemon_range_error(cache, args);
73310
73311 cache->fstop_percent = fstop;
73312@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
73313 if (args[0] != '%' || args[1] != '\0')
73314 return -EINVAL;
73315
73316- if (bstop < 0 || bstop >= cache->bcull_percent)
73317+ if (bstop >= cache->bcull_percent)
73318 return cachefiles_daemon_range_error(cache, args);
73319
73320 cache->bstop_percent = bstop;
73321diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
73322index 8c52472..c4e3a69 100644
73323--- a/fs/cachefiles/internal.h
73324+++ b/fs/cachefiles/internal.h
73325@@ -66,7 +66,7 @@ struct cachefiles_cache {
73326 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
73327 struct rb_root active_nodes; /* active nodes (can't be culled) */
73328 rwlock_t active_lock; /* lock for active_nodes */
73329- atomic_t gravecounter; /* graveyard uniquifier */
73330+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
73331 unsigned frun_percent; /* when to stop culling (% files) */
73332 unsigned fcull_percent; /* when to start culling (% files) */
73333 unsigned fstop_percent; /* when to stop allocating (% files) */
73334@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
73335 * proc.c
73336 */
73337 #ifdef CONFIG_CACHEFILES_HISTOGRAM
73338-extern atomic_t cachefiles_lookup_histogram[HZ];
73339-extern atomic_t cachefiles_mkdir_histogram[HZ];
73340-extern atomic_t cachefiles_create_histogram[HZ];
73341+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73342+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73343+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
73344
73345 extern int __init cachefiles_proc_init(void);
73346 extern void cachefiles_proc_cleanup(void);
73347 static inline
73348-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
73349+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
73350 {
73351 unsigned long jif = jiffies - start_jif;
73352 if (jif >= HZ)
73353 jif = HZ - 1;
73354- atomic_inc(&histogram[jif]);
73355+ atomic_inc_unchecked(&histogram[jif]);
73356 }
73357
73358 #else
73359diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
73360index ab857ab..ff8d593 100644
73361--- a/fs/cachefiles/namei.c
73362+++ b/fs/cachefiles/namei.c
73363@@ -309,7 +309,7 @@ try_again:
73364 /* first step is to make up a grave dentry in the graveyard */
73365 sprintf(nbuffer, "%08x%08x",
73366 (uint32_t) get_seconds(),
73367- (uint32_t) atomic_inc_return(&cache->gravecounter));
73368+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
73369
73370 /* do the multiway lock magic */
73371 trap = lock_rename(cache->graveyard, dir);
73372diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
73373index eccd339..4c1d995 100644
73374--- a/fs/cachefiles/proc.c
73375+++ b/fs/cachefiles/proc.c
73376@@ -14,9 +14,9 @@
73377 #include <linux/seq_file.h>
73378 #include "internal.h"
73379
73380-atomic_t cachefiles_lookup_histogram[HZ];
73381-atomic_t cachefiles_mkdir_histogram[HZ];
73382-atomic_t cachefiles_create_histogram[HZ];
73383+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73384+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73385+atomic_unchecked_t cachefiles_create_histogram[HZ];
73386
73387 /*
73388 * display the latency histogram
73389@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
73390 return 0;
73391 default:
73392 index = (unsigned long) v - 3;
73393- x = atomic_read(&cachefiles_lookup_histogram[index]);
73394- y = atomic_read(&cachefiles_mkdir_histogram[index]);
73395- z = atomic_read(&cachefiles_create_histogram[index]);
73396+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
73397+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
73398+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
73399 if (x == 0 && y == 0 && z == 0)
73400 return 0;
73401
73402diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
73403index 4248307..f41e44e 100644
73404--- a/fs/ceph/dir.c
73405+++ b/fs/ceph/dir.c
73406@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
73407 struct dentry *dentry, *last;
73408 struct ceph_dentry_info *di;
73409 int err = 0;
73410+ char d_name[DNAME_INLINE_LEN];
73411+ const unsigned char *name;
73412
73413 /* claim ref on last dentry we returned */
73414 last = fi->dentry;
73415@@ -190,7 +192,12 @@ more:
73416
73417 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
73418 dentry, dentry, d_inode(dentry));
73419- if (!dir_emit(ctx, dentry->d_name.name,
73420+ name = dentry->d_name.name;
73421+ if (name == dentry->d_iname) {
73422+ memcpy(d_name, name, dentry->d_name.len);
73423+ name = d_name;
73424+ }
73425+ if (!dir_emit(ctx, name,
73426 dentry->d_name.len,
73427 ceph_translate_ino(dentry->d_sb, d_inode(dentry)->i_ino),
73428 d_inode(dentry)->i_mode >> 12)) {
73429@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
73430 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
73431 struct ceph_mds_client *mdsc = fsc->mdsc;
73432 unsigned frag = fpos_frag(ctx->pos);
73433- int off = fpos_off(ctx->pos);
73434+ unsigned int off = fpos_off(ctx->pos);
73435 int err;
73436 u32 ftype;
73437 struct ceph_mds_reply_info_parsed *rinfo;
73438diff --git a/fs/ceph/super.c b/fs/ceph/super.c
73439index 4e99053..a7e2a5f 100644
73440--- a/fs/ceph/super.c
73441+++ b/fs/ceph/super.c
73442@@ -885,7 +885,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
73443 /*
73444 * construct our own bdi so we can control readahead, etc.
73445 */
73446-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
73447+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
73448
73449 static int ceph_register_bdi(struct super_block *sb,
73450 struct ceph_fs_client *fsc)
73451@@ -902,7 +902,7 @@ static int ceph_register_bdi(struct super_block *sb,
73452 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
73453
73454 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
73455- atomic_long_inc_return(&bdi_seq));
73456+ atomic_long_inc_return_unchecked(&bdi_seq));
73457 if (!err)
73458 sb->s_bdi = &fsc->backing_dev_info;
73459 return err;
73460diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
73461index 7febcf2..62a5721 100644
73462--- a/fs/cifs/cifs_debug.c
73463+++ b/fs/cifs/cifs_debug.c
73464@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73465
73466 if (strtobool(&c, &bv) == 0) {
73467 #ifdef CONFIG_CIFS_STATS2
73468- atomic_set(&totBufAllocCount, 0);
73469- atomic_set(&totSmBufAllocCount, 0);
73470+ atomic_set_unchecked(&totBufAllocCount, 0);
73471+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73472 #endif /* CONFIG_CIFS_STATS2 */
73473 spin_lock(&cifs_tcp_ses_lock);
73474 list_for_each(tmp1, &cifs_tcp_ses_list) {
73475@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73476 tcon = list_entry(tmp3,
73477 struct cifs_tcon,
73478 tcon_list);
73479- atomic_set(&tcon->num_smbs_sent, 0);
73480+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
73481 if (server->ops->clear_stats)
73482 server->ops->clear_stats(tcon);
73483 }
73484@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73485 smBufAllocCount.counter, cifs_min_small);
73486 #ifdef CONFIG_CIFS_STATS2
73487 seq_printf(m, "Total Large %d Small %d Allocations\n",
73488- atomic_read(&totBufAllocCount),
73489- atomic_read(&totSmBufAllocCount));
73490+ atomic_read_unchecked(&totBufAllocCount),
73491+ atomic_read_unchecked(&totSmBufAllocCount));
73492 #endif /* CONFIG_CIFS_STATS2 */
73493
73494 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
73495@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73496 if (tcon->need_reconnect)
73497 seq_puts(m, "\tDISCONNECTED ");
73498 seq_printf(m, "\nSMBs: %d",
73499- atomic_read(&tcon->num_smbs_sent));
73500+ atomic_read_unchecked(&tcon->num_smbs_sent));
73501 if (server->ops->print_stats)
73502 server->ops->print_stats(m, tcon);
73503 }
73504diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
73505index 0a9fb6b..9def7fa 100644
73506--- a/fs/cifs/cifsfs.c
73507+++ b/fs/cifs/cifsfs.c
73508@@ -1082,7 +1082,7 @@ cifs_init_request_bufs(void)
73509 */
73510 cifs_req_cachep = kmem_cache_create("cifs_request",
73511 CIFSMaxBufSize + max_hdr_size, 0,
73512- SLAB_HWCACHE_ALIGN, NULL);
73513+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
73514 if (cifs_req_cachep == NULL)
73515 return -ENOMEM;
73516
73517@@ -1109,7 +1109,7 @@ cifs_init_request_bufs(void)
73518 efficient to alloc 1 per page off the slab compared to 17K (5page)
73519 alloc of large cifs buffers even when page debugging is on */
73520 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
73521- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
73522+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
73523 NULL);
73524 if (cifs_sm_req_cachep == NULL) {
73525 mempool_destroy(cifs_req_poolp);
73526@@ -1194,8 +1194,8 @@ init_cifs(void)
73527 atomic_set(&bufAllocCount, 0);
73528 atomic_set(&smBufAllocCount, 0);
73529 #ifdef CONFIG_CIFS_STATS2
73530- atomic_set(&totBufAllocCount, 0);
73531- atomic_set(&totSmBufAllocCount, 0);
73532+ atomic_set_unchecked(&totBufAllocCount, 0);
73533+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73534 #endif /* CONFIG_CIFS_STATS2 */
73535
73536 atomic_set(&midCount, 0);
73537diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
73538index 22b289a..bbbba082 100644
73539--- a/fs/cifs/cifsglob.h
73540+++ b/fs/cifs/cifsglob.h
73541@@ -823,35 +823,35 @@ struct cifs_tcon {
73542 __u16 Flags; /* optional support bits */
73543 enum statusEnum tidStatus;
73544 #ifdef CONFIG_CIFS_STATS
73545- atomic_t num_smbs_sent;
73546+ atomic_unchecked_t num_smbs_sent;
73547 union {
73548 struct {
73549- atomic_t num_writes;
73550- atomic_t num_reads;
73551- atomic_t num_flushes;
73552- atomic_t num_oplock_brks;
73553- atomic_t num_opens;
73554- atomic_t num_closes;
73555- atomic_t num_deletes;
73556- atomic_t num_mkdirs;
73557- atomic_t num_posixopens;
73558- atomic_t num_posixmkdirs;
73559- atomic_t num_rmdirs;
73560- atomic_t num_renames;
73561- atomic_t num_t2renames;
73562- atomic_t num_ffirst;
73563- atomic_t num_fnext;
73564- atomic_t num_fclose;
73565- atomic_t num_hardlinks;
73566- atomic_t num_symlinks;
73567- atomic_t num_locks;
73568- atomic_t num_acl_get;
73569- atomic_t num_acl_set;
73570+ atomic_unchecked_t num_writes;
73571+ atomic_unchecked_t num_reads;
73572+ atomic_unchecked_t num_flushes;
73573+ atomic_unchecked_t num_oplock_brks;
73574+ atomic_unchecked_t num_opens;
73575+ atomic_unchecked_t num_closes;
73576+ atomic_unchecked_t num_deletes;
73577+ atomic_unchecked_t num_mkdirs;
73578+ atomic_unchecked_t num_posixopens;
73579+ atomic_unchecked_t num_posixmkdirs;
73580+ atomic_unchecked_t num_rmdirs;
73581+ atomic_unchecked_t num_renames;
73582+ atomic_unchecked_t num_t2renames;
73583+ atomic_unchecked_t num_ffirst;
73584+ atomic_unchecked_t num_fnext;
73585+ atomic_unchecked_t num_fclose;
73586+ atomic_unchecked_t num_hardlinks;
73587+ atomic_unchecked_t num_symlinks;
73588+ atomic_unchecked_t num_locks;
73589+ atomic_unchecked_t num_acl_get;
73590+ atomic_unchecked_t num_acl_set;
73591 } cifs_stats;
73592 #ifdef CONFIG_CIFS_SMB2
73593 struct {
73594- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73595- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73596+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73597+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73598 } smb2_stats;
73599 #endif /* CONFIG_CIFS_SMB2 */
73600 } stats;
73601@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
73602 }
73603
73604 #ifdef CONFIG_CIFS_STATS
73605-#define cifs_stats_inc atomic_inc
73606+#define cifs_stats_inc atomic_inc_unchecked
73607
73608 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
73609 unsigned int bytes)
73610@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
73611 /* Various Debug counters */
73612 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
73613 #ifdef CONFIG_CIFS_STATS2
73614-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
73615-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
73616+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
73617+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
73618 #endif
73619 GLOBAL_EXTERN atomic_t smBufAllocCount;
73620 GLOBAL_EXTERN atomic_t midCount;
73621diff --git a/fs/cifs/file.c b/fs/cifs/file.c
73622index 3f50cee..7741620 100644
73623--- a/fs/cifs/file.c
73624+++ b/fs/cifs/file.c
73625@@ -2054,10 +2054,14 @@ static int cifs_writepages(struct address_space *mapping,
73626 index = mapping->writeback_index; /* Start from prev offset */
73627 end = -1;
73628 } else {
73629- index = wbc->range_start >> PAGE_CACHE_SHIFT;
73630- end = wbc->range_end >> PAGE_CACHE_SHIFT;
73631- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
73632+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
73633 range_whole = true;
73634+ index = 0;
73635+ end = ULONG_MAX;
73636+ } else {
73637+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
73638+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
73639+ }
73640 scanned = true;
73641 }
73642 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
73643diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
73644index 8442b8b..ea6986f 100644
73645--- a/fs/cifs/misc.c
73646+++ b/fs/cifs/misc.c
73647@@ -170,7 +170,7 @@ cifs_buf_get(void)
73648 memset(ret_buf, 0, buf_size + 3);
73649 atomic_inc(&bufAllocCount);
73650 #ifdef CONFIG_CIFS_STATS2
73651- atomic_inc(&totBufAllocCount);
73652+ atomic_inc_unchecked(&totBufAllocCount);
73653 #endif /* CONFIG_CIFS_STATS2 */
73654 }
73655
73656@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
73657 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
73658 atomic_inc(&smBufAllocCount);
73659 #ifdef CONFIG_CIFS_STATS2
73660- atomic_inc(&totSmBufAllocCount);
73661+ atomic_inc_unchecked(&totSmBufAllocCount);
73662 #endif /* CONFIG_CIFS_STATS2 */
73663
73664 }
73665diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
73666index fc537c2..47d654c 100644
73667--- a/fs/cifs/smb1ops.c
73668+++ b/fs/cifs/smb1ops.c
73669@@ -622,27 +622,27 @@ static void
73670 cifs_clear_stats(struct cifs_tcon *tcon)
73671 {
73672 #ifdef CONFIG_CIFS_STATS
73673- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
73674- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
73675- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
73676- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73677- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
73678- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
73679- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73680- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
73681- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
73682- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
73683- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
73684- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
73685- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
73686- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
73687- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
73688- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
73689- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
73690- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
73691- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
73692- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
73693- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
73694+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
73695+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
73696+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
73697+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73698+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
73699+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
73700+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73701+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
73702+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
73703+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
73704+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
73705+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
73706+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
73707+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
73708+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
73709+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
73710+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
73711+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
73712+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
73713+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
73714+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
73715 #endif
73716 }
73717
73718@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
73719 {
73720 #ifdef CONFIG_CIFS_STATS
73721 seq_printf(m, " Oplocks breaks: %d",
73722- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
73723+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
73724 seq_printf(m, "\nReads: %d Bytes: %llu",
73725- atomic_read(&tcon->stats.cifs_stats.num_reads),
73726+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
73727 (long long)(tcon->bytes_read));
73728 seq_printf(m, "\nWrites: %d Bytes: %llu",
73729- atomic_read(&tcon->stats.cifs_stats.num_writes),
73730+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
73731 (long long)(tcon->bytes_written));
73732 seq_printf(m, "\nFlushes: %d",
73733- atomic_read(&tcon->stats.cifs_stats.num_flushes));
73734+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
73735 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
73736- atomic_read(&tcon->stats.cifs_stats.num_locks),
73737- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
73738- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
73739+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
73740+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
73741+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
73742 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
73743- atomic_read(&tcon->stats.cifs_stats.num_opens),
73744- atomic_read(&tcon->stats.cifs_stats.num_closes),
73745- atomic_read(&tcon->stats.cifs_stats.num_deletes));
73746+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
73747+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
73748+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
73749 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
73750- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
73751- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
73752+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
73753+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
73754 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
73755- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
73756- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
73757+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
73758+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
73759 seq_printf(m, "\nRenames: %d T2 Renames %d",
73760- atomic_read(&tcon->stats.cifs_stats.num_renames),
73761- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
73762+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
73763+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
73764 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
73765- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
73766- atomic_read(&tcon->stats.cifs_stats.num_fnext),
73767- atomic_read(&tcon->stats.cifs_stats.num_fclose));
73768+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
73769+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
73770+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
73771 #endif
73772 }
73773
73774diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
73775index 54daee5..2669fcb 100644
73776--- a/fs/cifs/smb2ops.c
73777+++ b/fs/cifs/smb2ops.c
73778@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
73779 #ifdef CONFIG_CIFS_STATS
73780 int i;
73781 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
73782- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
73783- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
73784+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
73785+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
73786 }
73787 #endif
73788 }
73789@@ -459,65 +459,65 @@ static void
73790 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
73791 {
73792 #ifdef CONFIG_CIFS_STATS
73793- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
73794- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
73795+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
73796+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
73797 seq_printf(m, "\nNegotiates: %d sent %d failed",
73798- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
73799- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
73800+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
73801+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
73802 seq_printf(m, "\nSessionSetups: %d sent %d failed",
73803- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
73804- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
73805+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
73806+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
73807 seq_printf(m, "\nLogoffs: %d sent %d failed",
73808- atomic_read(&sent[SMB2_LOGOFF_HE]),
73809- atomic_read(&failed[SMB2_LOGOFF_HE]));
73810+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
73811+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
73812 seq_printf(m, "\nTreeConnects: %d sent %d failed",
73813- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
73814- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
73815+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
73816+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
73817 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
73818- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
73819- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
73820+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
73821+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
73822 seq_printf(m, "\nCreates: %d sent %d failed",
73823- atomic_read(&sent[SMB2_CREATE_HE]),
73824- atomic_read(&failed[SMB2_CREATE_HE]));
73825+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
73826+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
73827 seq_printf(m, "\nCloses: %d sent %d failed",
73828- atomic_read(&sent[SMB2_CLOSE_HE]),
73829- atomic_read(&failed[SMB2_CLOSE_HE]));
73830+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
73831+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
73832 seq_printf(m, "\nFlushes: %d sent %d failed",
73833- atomic_read(&sent[SMB2_FLUSH_HE]),
73834- atomic_read(&failed[SMB2_FLUSH_HE]));
73835+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
73836+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
73837 seq_printf(m, "\nReads: %d sent %d failed",
73838- atomic_read(&sent[SMB2_READ_HE]),
73839- atomic_read(&failed[SMB2_READ_HE]));
73840+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
73841+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
73842 seq_printf(m, "\nWrites: %d sent %d failed",
73843- atomic_read(&sent[SMB2_WRITE_HE]),
73844- atomic_read(&failed[SMB2_WRITE_HE]));
73845+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
73846+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
73847 seq_printf(m, "\nLocks: %d sent %d failed",
73848- atomic_read(&sent[SMB2_LOCK_HE]),
73849- atomic_read(&failed[SMB2_LOCK_HE]));
73850+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
73851+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
73852 seq_printf(m, "\nIOCTLs: %d sent %d failed",
73853- atomic_read(&sent[SMB2_IOCTL_HE]),
73854- atomic_read(&failed[SMB2_IOCTL_HE]));
73855+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
73856+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
73857 seq_printf(m, "\nCancels: %d sent %d failed",
73858- atomic_read(&sent[SMB2_CANCEL_HE]),
73859- atomic_read(&failed[SMB2_CANCEL_HE]));
73860+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
73861+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
73862 seq_printf(m, "\nEchos: %d sent %d failed",
73863- atomic_read(&sent[SMB2_ECHO_HE]),
73864- atomic_read(&failed[SMB2_ECHO_HE]));
73865+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
73866+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
73867 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
73868- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
73869- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
73870+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
73871+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
73872 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
73873- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
73874- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
73875+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
73876+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
73877 seq_printf(m, "\nQueryInfos: %d sent %d failed",
73878- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
73879- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
73880+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
73881+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
73882 seq_printf(m, "\nSetInfos: %d sent %d failed",
73883- atomic_read(&sent[SMB2_SET_INFO_HE]),
73884- atomic_read(&failed[SMB2_SET_INFO_HE]));
73885+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
73886+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
73887 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
73888- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
73889- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
73890+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
73891+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
73892 #endif
73893 }
73894
73895diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
73896index 54cbe19..fcd4a1b 100644
73897--- a/fs/cifs/smb2pdu.c
73898+++ b/fs/cifs/smb2pdu.c
73899@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
73900 default:
73901 cifs_dbg(VFS, "info level %u isn't supported\n",
73902 srch_inf->info_level);
73903- rc = -EINVAL;
73904- goto qdir_exit;
73905+ return -EINVAL;
73906 }
73907
73908 req->FileIndex = cpu_to_le32(index);
73909diff --git a/fs/coda/cache.c b/fs/coda/cache.c
73910index 5bb630a..043dc70 100644
73911--- a/fs/coda/cache.c
73912+++ b/fs/coda/cache.c
73913@@ -24,7 +24,7 @@
73914 #include "coda_linux.h"
73915 #include "coda_cache.h"
73916
73917-static atomic_t permission_epoch = ATOMIC_INIT(0);
73918+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
73919
73920 /* replace or extend an acl cache hit */
73921 void coda_cache_enter(struct inode *inode, int mask)
73922@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
73923 struct coda_inode_info *cii = ITOC(inode);
73924
73925 spin_lock(&cii->c_lock);
73926- cii->c_cached_epoch = atomic_read(&permission_epoch);
73927+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
73928 if (!uid_eq(cii->c_uid, current_fsuid())) {
73929 cii->c_uid = current_fsuid();
73930 cii->c_cached_perm = mask;
73931@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
73932 {
73933 struct coda_inode_info *cii = ITOC(inode);
73934 spin_lock(&cii->c_lock);
73935- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
73936+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
73937 spin_unlock(&cii->c_lock);
73938 }
73939
73940 /* remove all acl caches */
73941 void coda_cache_clear_all(struct super_block *sb)
73942 {
73943- atomic_inc(&permission_epoch);
73944+ atomic_inc_unchecked(&permission_epoch);
73945 }
73946
73947
73948@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
73949 spin_lock(&cii->c_lock);
73950 hit = (mask & cii->c_cached_perm) == mask &&
73951 uid_eq(cii->c_uid, current_fsuid()) &&
73952- cii->c_cached_epoch == atomic_read(&permission_epoch);
73953+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
73954 spin_unlock(&cii->c_lock);
73955
73956 return hit;
73957diff --git a/fs/compat.c b/fs/compat.c
73958index 6fd272d..dd34ba2 100644
73959--- a/fs/compat.c
73960+++ b/fs/compat.c
73961@@ -54,7 +54,7 @@
73962 #include <asm/ioctls.h>
73963 #include "internal.h"
73964
73965-int compat_log = 1;
73966+int compat_log = 0;
73967
73968 int compat_printk(const char *fmt, ...)
73969 {
73970@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
73971
73972 set_fs(KERNEL_DS);
73973 /* The __user pointer cast is valid because of the set_fs() */
73974- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
73975+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
73976 set_fs(oldfs);
73977 /* truncating is ok because it's a user address */
73978 if (!ret)
73979@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
73980 goto out;
73981
73982 ret = -EINVAL;
73983- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
73984+ if (nr_segs > UIO_MAXIOV)
73985 goto out;
73986 if (nr_segs > fast_segs) {
73987 ret = -ENOMEM;
73988@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
73989 struct compat_readdir_callback {
73990 struct dir_context ctx;
73991 struct compat_old_linux_dirent __user *dirent;
73992+ struct file * file;
73993 int result;
73994 };
73995
73996@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
73997 buf->result = -EOVERFLOW;
73998 return -EOVERFLOW;
73999 }
74000+
74001+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74002+ return 0;
74003+
74004 buf->result++;
74005 dirent = buf->dirent;
74006 if (!access_ok(VERIFY_WRITE, dirent,
74007@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
74008 if (!f.file)
74009 return -EBADF;
74010
74011+ buf.file = f.file;
74012 error = iterate_dir(f.file, &buf.ctx);
74013 if (buf.result)
74014 error = buf.result;
74015@@ -913,6 +919,7 @@ struct compat_getdents_callback {
74016 struct dir_context ctx;
74017 struct compat_linux_dirent __user *current_dir;
74018 struct compat_linux_dirent __user *previous;
74019+ struct file * file;
74020 int count;
74021 int error;
74022 };
74023@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
74024 buf->error = -EOVERFLOW;
74025 return -EOVERFLOW;
74026 }
74027+
74028+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74029+ return 0;
74030+
74031 dirent = buf->previous;
74032 if (dirent) {
74033 if (__put_user(offset, &dirent->d_off))
74034@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
74035 if (!f.file)
74036 return -EBADF;
74037
74038+ buf.file = f.file;
74039 error = iterate_dir(f.file, &buf.ctx);
74040 if (error >= 0)
74041 error = buf.error;
74042@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
74043 struct dir_context ctx;
74044 struct linux_dirent64 __user *current_dir;
74045 struct linux_dirent64 __user *previous;
74046+ struct file * file;
74047 int count;
74048 int error;
74049 };
74050@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
74051 buf->error = -EINVAL; /* only used if we fail.. */
74052 if (reclen > buf->count)
74053 return -EINVAL;
74054+
74055+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74056+ return 0;
74057+
74058 dirent = buf->previous;
74059
74060 if (dirent) {
74061@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
74062 if (!f.file)
74063 return -EBADF;
74064
74065+ buf.file = f.file;
74066 error = iterate_dir(f.file, &buf.ctx);
74067 if (error >= 0)
74068 error = buf.error;
74069diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
74070index 4d24d17..4f8c09e 100644
74071--- a/fs/compat_binfmt_elf.c
74072+++ b/fs/compat_binfmt_elf.c
74073@@ -30,11 +30,13 @@
74074 #undef elf_phdr
74075 #undef elf_shdr
74076 #undef elf_note
74077+#undef elf_dyn
74078 #undef elf_addr_t
74079 #define elfhdr elf32_hdr
74080 #define elf_phdr elf32_phdr
74081 #define elf_shdr elf32_shdr
74082 #define elf_note elf32_note
74083+#define elf_dyn Elf32_Dyn
74084 #define elf_addr_t Elf32_Addr
74085
74086 /*
74087diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
74088index 6b8e2f0..9b13a5e 100644
74089--- a/fs/compat_ioctl.c
74090+++ b/fs/compat_ioctl.c
74091@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
74092 return -EFAULT;
74093 if (__get_user(udata, &ss32->iomem_base))
74094 return -EFAULT;
74095- ss.iomem_base = compat_ptr(udata);
74096+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
74097 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
74098 __get_user(ss.port_high, &ss32->port_high))
74099 return -EFAULT;
74100@@ -704,8 +704,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
74101 for (i = 0; i < nmsgs; i++) {
74102 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
74103 return -EFAULT;
74104- if (get_user(datap, &umsgs[i].buf) ||
74105- put_user(compat_ptr(datap), &tmsgs[i].buf))
74106+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
74107+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
74108 return -EFAULT;
74109 }
74110 return sys_ioctl(fd, cmd, (unsigned long)tdata);
74111@@ -798,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
74112 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
74113 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
74114 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
74115- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
74116+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
74117 return -EFAULT;
74118
74119 return ioctl_preallocate(file, p);
74120@@ -1620,8 +1620,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
74121 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
74122 {
74123 unsigned int a, b;
74124- a = *(unsigned int *)p;
74125- b = *(unsigned int *)q;
74126+ a = *(const unsigned int *)p;
74127+ b = *(const unsigned int *)q;
74128 if (a > b)
74129 return 1;
74130 if (a < b)
74131diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
74132index c81ce7f..f3de5fd 100644
74133--- a/fs/configfs/dir.c
74134+++ b/fs/configfs/dir.c
74135@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74136 }
74137 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
74138 struct configfs_dirent *next;
74139- const char *name;
74140+ const unsigned char * name;
74141+ char d_name[sizeof(next->s_dentry->d_iname)];
74142 int len;
74143 struct inode *inode = NULL;
74144
74145@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74146 continue;
74147
74148 name = configfs_get_name(next);
74149- len = strlen(name);
74150+ if (next->s_dentry && name == next->s_dentry->d_iname) {
74151+ len = next->s_dentry->d_name.len;
74152+ memcpy(d_name, name, len);
74153+ name = d_name;
74154+ } else
74155+ len = strlen(name);
74156
74157 /*
74158 * We'll have a dentry and an inode for
74159diff --git a/fs/configfs/item.c b/fs/configfs/item.c
74160index e65f9ff..3ed264d 100644
74161--- a/fs/configfs/item.c
74162+++ b/fs/configfs/item.c
74163@@ -116,7 +116,7 @@ void config_item_init_type_name(struct config_item *item,
74164 const char *name,
74165 struct config_item_type *type)
74166 {
74167- config_item_set_name(item, name);
74168+ config_item_set_name(item, "%s", name);
74169 item->ci_type = type;
74170 config_item_init(item);
74171 }
74172@@ -125,7 +125,7 @@ EXPORT_SYMBOL(config_item_init_type_name);
74173 void config_group_init_type_name(struct config_group *group, const char *name,
74174 struct config_item_type *type)
74175 {
74176- config_item_set_name(&group->cg_item, name);
74177+ config_item_set_name(&group->cg_item, "%s", name);
74178 group->cg_item.ci_type = type;
74179 config_group_init(group);
74180 }
74181diff --git a/fs/coredump.c b/fs/coredump.c
74182index bbbe139..b76fae5 100644
74183--- a/fs/coredump.c
74184+++ b/fs/coredump.c
74185@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
74186 struct pipe_inode_info *pipe = file->private_data;
74187
74188 pipe_lock(pipe);
74189- pipe->readers++;
74190- pipe->writers--;
74191+ atomic_inc(&pipe->readers);
74192+ atomic_dec(&pipe->writers);
74193 wake_up_interruptible_sync(&pipe->wait);
74194 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
74195 pipe_unlock(pipe);
74196@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
74197 * We actually want wait_event_freezable() but then we need
74198 * to clear TIF_SIGPENDING and improve dump_interrupted().
74199 */
74200- wait_event_interruptible(pipe->wait, pipe->readers == 1);
74201+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
74202
74203 pipe_lock(pipe);
74204- pipe->readers--;
74205- pipe->writers++;
74206+ atomic_dec(&pipe->readers);
74207+ atomic_inc(&pipe->writers);
74208 pipe_unlock(pipe);
74209 }
74210
74211@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
74212 struct files_struct *displaced;
74213 bool need_nonrelative = false;
74214 bool core_dumped = false;
74215- static atomic_t core_dump_count = ATOMIC_INIT(0);
74216+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
74217+ long signr = siginfo->si_signo;
74218+ int dumpable;
74219 struct coredump_params cprm = {
74220 .siginfo = siginfo,
74221 .regs = signal_pt_regs(),
74222@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
74223 .mm_flags = mm->flags,
74224 };
74225
74226- audit_core_dumps(siginfo->si_signo);
74227+ audit_core_dumps(signr);
74228+
74229+ dumpable = __get_dumpable(cprm.mm_flags);
74230+
74231+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
74232+ gr_handle_brute_attach(dumpable);
74233
74234 binfmt = mm->binfmt;
74235 if (!binfmt || !binfmt->core_dump)
74236 goto fail;
74237- if (!__get_dumpable(cprm.mm_flags))
74238+ if (!dumpable)
74239 goto fail;
74240
74241 cred = prepare_creds();
74242@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
74243 need_nonrelative = true;
74244 }
74245
74246- retval = coredump_wait(siginfo->si_signo, &core_state);
74247+ retval = coredump_wait(signr, &core_state);
74248 if (retval < 0)
74249 goto fail_creds;
74250
74251@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
74252 }
74253 cprm.limit = RLIM_INFINITY;
74254
74255- dump_count = atomic_inc_return(&core_dump_count);
74256+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
74257 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
74258 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
74259 task_tgid_vnr(current), current->comm);
74260@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
74261 } else {
74262 struct inode *inode;
74263
74264+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
74265+
74266 if (cprm.limit < binfmt->min_coredump)
74267 goto fail_unlock;
74268
74269@@ -681,7 +690,7 @@ close_fail:
74270 filp_close(cprm.file, NULL);
74271 fail_dropcount:
74272 if (ispipe)
74273- atomic_dec(&core_dump_count);
74274+ atomic_dec_unchecked(&core_dump_count);
74275 fail_unlock:
74276 kfree(cn.corename);
74277 coredump_finish(mm, core_dumped);
74278@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
74279 struct file *file = cprm->file;
74280 loff_t pos = file->f_pos;
74281 ssize_t n;
74282+
74283+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
74284 if (cprm->written + nr > cprm->limit)
74285 return 0;
74286 while (nr) {
74287diff --git a/fs/dcache.c b/fs/dcache.c
74288index 5d03eb0..d874b57 100644
74289--- a/fs/dcache.c
74290+++ b/fs/dcache.c
74291@@ -545,7 +545,7 @@ static void __dentry_kill(struct dentry *dentry)
74292 * dentry_iput drops the locks, at which point nobody (except
74293 * transient RCU lookups) can reach this dentry.
74294 */
74295- BUG_ON(dentry->d_lockref.count > 0);
74296+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
74297 this_cpu_dec(nr_dentry);
74298 if (dentry->d_op && dentry->d_op->d_release)
74299 dentry->d_op->d_release(dentry);
74300@@ -598,7 +598,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
74301 struct dentry *parent = dentry->d_parent;
74302 if (IS_ROOT(dentry))
74303 return NULL;
74304- if (unlikely(dentry->d_lockref.count < 0))
74305+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
74306 return NULL;
74307 if (likely(spin_trylock(&parent->d_lock)))
74308 return parent;
74309@@ -660,8 +660,8 @@ static inline bool fast_dput(struct dentry *dentry)
74310 */
74311 if (unlikely(ret < 0)) {
74312 spin_lock(&dentry->d_lock);
74313- if (dentry->d_lockref.count > 1) {
74314- dentry->d_lockref.count--;
74315+ if (__lockref_read(&dentry->d_lockref) > 1) {
74316+ __lockref_dec(&dentry->d_lockref);
74317 spin_unlock(&dentry->d_lock);
74318 return 1;
74319 }
74320@@ -716,7 +716,7 @@ static inline bool fast_dput(struct dentry *dentry)
74321 * else could have killed it and marked it dead. Either way, we
74322 * don't need to do anything else.
74323 */
74324- if (dentry->d_lockref.count) {
74325+ if (__lockref_read(&dentry->d_lockref)) {
74326 spin_unlock(&dentry->d_lock);
74327 return 1;
74328 }
74329@@ -726,7 +726,7 @@ static inline bool fast_dput(struct dentry *dentry)
74330 * lock, and we just tested that it was zero, so we can just
74331 * set it to 1.
74332 */
74333- dentry->d_lockref.count = 1;
74334+ __lockref_set(&dentry->d_lockref, 1);
74335 return 0;
74336 }
74337
74338@@ -788,7 +788,7 @@ repeat:
74339 dentry->d_flags |= DCACHE_REFERENCED;
74340 dentry_lru_add(dentry);
74341
74342- dentry->d_lockref.count--;
74343+ __lockref_dec(&dentry->d_lockref);
74344 spin_unlock(&dentry->d_lock);
74345 return;
74346
74347@@ -803,7 +803,7 @@ EXPORT_SYMBOL(dput);
74348 /* This must be called with d_lock held */
74349 static inline void __dget_dlock(struct dentry *dentry)
74350 {
74351- dentry->d_lockref.count++;
74352+ __lockref_inc(&dentry->d_lockref);
74353 }
74354
74355 static inline void __dget(struct dentry *dentry)
74356@@ -844,8 +844,8 @@ repeat:
74357 goto repeat;
74358 }
74359 rcu_read_unlock();
74360- BUG_ON(!ret->d_lockref.count);
74361- ret->d_lockref.count++;
74362+ BUG_ON(!__lockref_read(&ret->d_lockref));
74363+ __lockref_inc(&ret->d_lockref);
74364 spin_unlock(&ret->d_lock);
74365 return ret;
74366 }
74367@@ -923,9 +923,9 @@ restart:
74368 spin_lock(&inode->i_lock);
74369 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
74370 spin_lock(&dentry->d_lock);
74371- if (!dentry->d_lockref.count) {
74372+ if (!__lockref_read(&dentry->d_lockref)) {
74373 struct dentry *parent = lock_parent(dentry);
74374- if (likely(!dentry->d_lockref.count)) {
74375+ if (likely(!__lockref_read(&dentry->d_lockref))) {
74376 __dentry_kill(dentry);
74377 dput(parent);
74378 goto restart;
74379@@ -960,7 +960,7 @@ static void shrink_dentry_list(struct list_head *list)
74380 * We found an inuse dentry which was not removed from
74381 * the LRU because of laziness during lookup. Do not free it.
74382 */
74383- if (dentry->d_lockref.count > 0) {
74384+ if (__lockref_read(&dentry->d_lockref) > 0) {
74385 spin_unlock(&dentry->d_lock);
74386 if (parent)
74387 spin_unlock(&parent->d_lock);
74388@@ -998,8 +998,8 @@ static void shrink_dentry_list(struct list_head *list)
74389 dentry = parent;
74390 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
74391 parent = lock_parent(dentry);
74392- if (dentry->d_lockref.count != 1) {
74393- dentry->d_lockref.count--;
74394+ if (__lockref_read(&dentry->d_lockref) != 1) {
74395+ __lockref_inc(&dentry->d_lockref);
74396 spin_unlock(&dentry->d_lock);
74397 if (parent)
74398 spin_unlock(&parent->d_lock);
74399@@ -1039,7 +1039,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
74400 * counts, just remove them from the LRU. Otherwise give them
74401 * another pass through the LRU.
74402 */
74403- if (dentry->d_lockref.count) {
74404+ if (__lockref_read(&dentry->d_lockref)) {
74405 d_lru_isolate(lru, dentry);
74406 spin_unlock(&dentry->d_lock);
74407 return LRU_REMOVED;
74408@@ -1373,7 +1373,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
74409 } else {
74410 if (dentry->d_flags & DCACHE_LRU_LIST)
74411 d_lru_del(dentry);
74412- if (!dentry->d_lockref.count) {
74413+ if (!__lockref_read(&dentry->d_lockref)) {
74414 d_shrink_add(dentry, &data->dispose);
74415 data->found++;
74416 }
74417@@ -1421,7 +1421,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74418 return D_WALK_CONTINUE;
74419
74420 /* root with refcount 1 is fine */
74421- if (dentry == _data && dentry->d_lockref.count == 1)
74422+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
74423 return D_WALK_CONTINUE;
74424
74425 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
74426@@ -1430,7 +1430,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74427 dentry->d_inode ?
74428 dentry->d_inode->i_ino : 0UL,
74429 dentry,
74430- dentry->d_lockref.count,
74431+ __lockref_read(&dentry->d_lockref),
74432 dentry->d_sb->s_type->name,
74433 dentry->d_sb->s_id);
74434 WARN_ON(1);
74435@@ -1571,7 +1571,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74436 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
74437 if (name->len > DNAME_INLINE_LEN-1) {
74438 size_t size = offsetof(struct external_name, name[1]);
74439- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
74440+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
74441 if (!p) {
74442 kmem_cache_free(dentry_cache, dentry);
74443 return NULL;
74444@@ -1594,7 +1594,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74445 smp_wmb();
74446 dentry->d_name.name = dname;
74447
74448- dentry->d_lockref.count = 1;
74449+ __lockref_set(&dentry->d_lockref, 1);
74450 dentry->d_flags = 0;
74451 spin_lock_init(&dentry->d_lock);
74452 seqcount_init(&dentry->d_seq);
74453@@ -1603,6 +1603,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74454 dentry->d_sb = sb;
74455 dentry->d_op = NULL;
74456 dentry->d_fsdata = NULL;
74457+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
74458+ atomic_set(&dentry->chroot_refcnt, 0);
74459+#endif
74460 INIT_HLIST_BL_NODE(&dentry->d_hash);
74461 INIT_LIST_HEAD(&dentry->d_lru);
74462 INIT_LIST_HEAD(&dentry->d_subdirs);
74463@@ -2324,7 +2327,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
74464 goto next;
74465 }
74466
74467- dentry->d_lockref.count++;
74468+ __lockref_inc(&dentry->d_lockref);
74469 found = dentry;
74470 spin_unlock(&dentry->d_lock);
74471 break;
74472@@ -2392,7 +2395,7 @@ again:
74473 spin_lock(&dentry->d_lock);
74474 inode = dentry->d_inode;
74475 isdir = S_ISDIR(inode->i_mode);
74476- if (dentry->d_lockref.count == 1) {
74477+ if (__lockref_read(&dentry->d_lockref) == 1) {
74478 if (!spin_trylock(&inode->i_lock)) {
74479 spin_unlock(&dentry->d_lock);
74480 cpu_relax();
74481@@ -3334,7 +3337,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
74482
74483 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
74484 dentry->d_flags |= DCACHE_GENOCIDE;
74485- dentry->d_lockref.count--;
74486+ __lockref_dec(&dentry->d_lockref);
74487 }
74488 }
74489 return D_WALK_CONTINUE;
74490@@ -3450,7 +3453,8 @@ void __init vfs_caches_init(unsigned long mempages)
74491 mempages -= reserve;
74492
74493 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
74494- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
74495+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
74496+ SLAB_NO_SANITIZE, NULL);
74497
74498 dcache_init();
74499 inode_init();
74500diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
74501index 1275604..d2ca85b 100644
74502--- a/fs/debugfs/inode.c
74503+++ b/fs/debugfs/inode.c
74504@@ -407,6 +407,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
74505 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
74506 * returned.
74507 */
74508+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74509+extern int grsec_enable_sysfs_restrict;
74510+#endif
74511+
74512 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74513 {
74514 struct dentry *dentry = start_creating(name, parent);
74515@@ -419,7 +423,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74516 if (unlikely(!inode))
74517 return failed_creating(dentry);
74518
74519- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74520+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74521+ if (grsec_enable_sysfs_restrict)
74522+ inode->i_mode = S_IFDIR | S_IRWXU;
74523+ else
74524+#endif
74525+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74526 inode->i_op = &simple_dir_inode_operations;
74527 inode->i_fop = &simple_dir_operations;
74528
74529diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
74530index fc850b5..1677a2a 100644
74531--- a/fs/ecryptfs/inode.c
74532+++ b/fs/ecryptfs/inode.c
74533@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
74534 old_fs = get_fs();
74535 set_fs(get_ds());
74536 rc = d_inode(lower_dentry)->i_op->readlink(lower_dentry,
74537- (char __user *)lower_buf,
74538+ (char __force_user *)lower_buf,
74539 PATH_MAX);
74540 set_fs(old_fs);
74541 if (rc < 0)
74542diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
74543index e4141f2..d8263e8 100644
74544--- a/fs/ecryptfs/miscdev.c
74545+++ b/fs/ecryptfs/miscdev.c
74546@@ -304,7 +304,7 @@ check_list:
74547 goto out_unlock_msg_ctx;
74548 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
74549 if (msg_ctx->msg) {
74550- if (copy_to_user(&buf[i], packet_length, packet_length_size))
74551+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
74552 goto out_unlock_msg_ctx;
74553 i += packet_length_size;
74554 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
74555diff --git a/fs/exec.c b/fs/exec.c
74556index 1977c2a..40e7f8f 100644
74557--- a/fs/exec.c
74558+++ b/fs/exec.c
74559@@ -56,8 +56,20 @@
74560 #include <linux/pipe_fs_i.h>
74561 #include <linux/oom.h>
74562 #include <linux/compat.h>
74563+#include <linux/random.h>
74564+#include <linux/seq_file.h>
74565+#include <linux/coredump.h>
74566+#include <linux/mman.h>
74567+
74568+#ifdef CONFIG_PAX_REFCOUNT
74569+#include <linux/kallsyms.h>
74570+#include <linux/kdebug.h>
74571+#endif
74572+
74573+#include <trace/events/fs.h>
74574
74575 #include <asm/uaccess.h>
74576+#include <asm/sections.h>
74577 #include <asm/mmu_context.h>
74578 #include <asm/tlb.h>
74579
74580@@ -66,19 +78,34 @@
74581
74582 #include <trace/events/sched.h>
74583
74584+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
74585+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
74586+{
74587+ 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");
74588+}
74589+#endif
74590+
74591+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
74592+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
74593+EXPORT_SYMBOL(pax_set_initial_flags_func);
74594+#endif
74595+
74596 int suid_dumpable = 0;
74597
74598 static LIST_HEAD(formats);
74599 static DEFINE_RWLOCK(binfmt_lock);
74600
74601+extern int gr_process_kernel_exec_ban(void);
74602+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
74603+
74604 void __register_binfmt(struct linux_binfmt * fmt, int insert)
74605 {
74606 BUG_ON(!fmt);
74607 if (WARN_ON(!fmt->load_binary))
74608 return;
74609 write_lock(&binfmt_lock);
74610- insert ? list_add(&fmt->lh, &formats) :
74611- list_add_tail(&fmt->lh, &formats);
74612+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
74613+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
74614 write_unlock(&binfmt_lock);
74615 }
74616
74617@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
74618 void unregister_binfmt(struct linux_binfmt * fmt)
74619 {
74620 write_lock(&binfmt_lock);
74621- list_del(&fmt->lh);
74622+ pax_list_del((struct list_head *)&fmt->lh);
74623 write_unlock(&binfmt_lock);
74624 }
74625
74626@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74627 int write)
74628 {
74629 struct page *page;
74630- int ret;
74631
74632-#ifdef CONFIG_STACK_GROWSUP
74633- if (write) {
74634- ret = expand_downwards(bprm->vma, pos);
74635- if (ret < 0)
74636- return NULL;
74637- }
74638-#endif
74639- ret = get_user_pages(current, bprm->mm, pos,
74640- 1, write, 1, &page, NULL);
74641- if (ret <= 0)
74642+ if (0 > expand_downwards(bprm->vma, pos))
74643+ return NULL;
74644+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
74645 return NULL;
74646
74647 if (write) {
74648@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74649 if (size <= ARG_MAX)
74650 return page;
74651
74652+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74653+ // only allow 512KB for argv+env on suid/sgid binaries
74654+ // to prevent easy ASLR exhaustion
74655+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
74656+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
74657+ (size > (512 * 1024))) {
74658+ put_page(page);
74659+ return NULL;
74660+ }
74661+#endif
74662+
74663 /*
74664 * Limit to 1/4-th the stack size for the argv+env strings.
74665 * This ensures that:
74666@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74667 vma->vm_end = STACK_TOP_MAX;
74668 vma->vm_start = vma->vm_end - PAGE_SIZE;
74669 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
74670+
74671+#ifdef CONFIG_PAX_SEGMEXEC
74672+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
74673+#endif
74674+
74675 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
74676 INIT_LIST_HEAD(&vma->anon_vma_chain);
74677
74678@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74679 arch_bprm_mm_init(mm, vma);
74680 up_write(&mm->mmap_sem);
74681 bprm->p = vma->vm_end - sizeof(void *);
74682+
74683+#ifdef CONFIG_PAX_RANDUSTACK
74684+ if (randomize_va_space)
74685+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
74686+#endif
74687+
74688 return 0;
74689 err:
74690 up_write(&mm->mmap_sem);
74691@@ -396,7 +437,7 @@ struct user_arg_ptr {
74692 } ptr;
74693 };
74694
74695-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74696+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74697 {
74698 const char __user *native;
74699
74700@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74701 compat_uptr_t compat;
74702
74703 if (get_user(compat, argv.ptr.compat + nr))
74704- return ERR_PTR(-EFAULT);
74705+ return (const char __force_user *)ERR_PTR(-EFAULT);
74706
74707 return compat_ptr(compat);
74708 }
74709 #endif
74710
74711 if (get_user(native, argv.ptr.native + nr))
74712- return ERR_PTR(-EFAULT);
74713+ return (const char __force_user *)ERR_PTR(-EFAULT);
74714
74715 return native;
74716 }
74717@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
74718 if (!p)
74719 break;
74720
74721- if (IS_ERR(p))
74722+ if (IS_ERR((const char __force_kernel *)p))
74723 return -EFAULT;
74724
74725 if (i >= max)
74726@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
74727
74728 ret = -EFAULT;
74729 str = get_user_arg_ptr(argv, argc);
74730- if (IS_ERR(str))
74731+ if (IS_ERR((const char __force_kernel *)str))
74732 goto out;
74733
74734 len = strnlen_user(str, MAX_ARG_STRLEN);
74735@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
74736 int r;
74737 mm_segment_t oldfs = get_fs();
74738 struct user_arg_ptr argv = {
74739- .ptr.native = (const char __user *const __user *)__argv,
74740+ .ptr.native = (const char __user * const __force_user *)__argv,
74741 };
74742
74743 set_fs(KERNEL_DS);
74744@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
74745 unsigned long new_end = old_end - shift;
74746 struct mmu_gather tlb;
74747
74748- BUG_ON(new_start > new_end);
74749+ if (new_start >= new_end || new_start < mmap_min_addr)
74750+ return -ENOMEM;
74751
74752 /*
74753 * ensure there are no vmas between where we want to go
74754@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
74755 if (vma != find_vma(mm, new_start))
74756 return -EFAULT;
74757
74758+#ifdef CONFIG_PAX_SEGMEXEC
74759+ BUG_ON(pax_find_mirror_vma(vma));
74760+#endif
74761+
74762 /*
74763 * cover the whole range: [new_start, old_end)
74764 */
74765@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
74766 stack_top = arch_align_stack(stack_top);
74767 stack_top = PAGE_ALIGN(stack_top);
74768
74769- if (unlikely(stack_top < mmap_min_addr) ||
74770- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
74771- return -ENOMEM;
74772-
74773 stack_shift = vma->vm_end - stack_top;
74774
74775 bprm->p -= stack_shift;
74776@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
74777 bprm->exec -= stack_shift;
74778
74779 down_write(&mm->mmap_sem);
74780+
74781+ /* Move stack pages down in memory. */
74782+ if (stack_shift) {
74783+ ret = shift_arg_pages(vma, stack_shift);
74784+ if (ret)
74785+ goto out_unlock;
74786+ }
74787+
74788 vm_flags = VM_STACK_FLAGS;
74789
74790+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
74791+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
74792+ vm_flags &= ~VM_EXEC;
74793+
74794+#ifdef CONFIG_PAX_MPROTECT
74795+ if (mm->pax_flags & MF_PAX_MPROTECT)
74796+ vm_flags &= ~VM_MAYEXEC;
74797+#endif
74798+
74799+ }
74800+#endif
74801+
74802 /*
74803 * Adjust stack execute permissions; explicitly enable for
74804 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
74805@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
74806 goto out_unlock;
74807 BUG_ON(prev != vma);
74808
74809- /* Move stack pages down in memory. */
74810- if (stack_shift) {
74811- ret = shift_arg_pages(vma, stack_shift);
74812- if (ret)
74813- goto out_unlock;
74814- }
74815-
74816 /* mprotect_fixup is overkill to remove the temporary stack flags */
74817 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
74818
74819@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
74820 #endif
74821 current->mm->start_stack = bprm->p;
74822 ret = expand_stack(vma, stack_base);
74823+
74824+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
74825+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
74826+ unsigned long size;
74827+ vm_flags_t vm_flags;
74828+
74829+ size = STACK_TOP - vma->vm_end;
74830+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
74831+
74832+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
74833+
74834+#ifdef CONFIG_X86
74835+ if (!ret) {
74836+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
74837+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
74838+ }
74839+#endif
74840+
74841+ }
74842+#endif
74843+
74844 if (ret)
74845 ret = -EFAULT;
74846
74847@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
74848 if (err)
74849 goto exit;
74850
74851- if (name->name[0] != '\0')
74852+ if (name->name[0] != '\0') {
74853 fsnotify_open(file);
74854+ trace_open_exec(name->name);
74855+ }
74856
74857 out:
74858 return file;
74859@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
74860 old_fs = get_fs();
74861 set_fs(get_ds());
74862 /* The cast to a user pointer is valid due to the set_fs() */
74863- result = vfs_read(file, (void __user *)addr, count, &pos);
74864+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
74865 set_fs(old_fs);
74866 return result;
74867 }
74868@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
74869 tsk->mm = mm;
74870 tsk->active_mm = mm;
74871 activate_mm(active_mm, mm);
74872+ populate_stack();
74873 tsk->mm->vmacache_seqnum = 0;
74874 vmacache_flush(tsk);
74875 task_unlock(tsk);
74876@@ -1271,7 +1350,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
74877 }
74878 rcu_read_unlock();
74879
74880- if (p->fs->users > n_fs)
74881+ if (atomic_read(&p->fs->users) > n_fs)
74882 bprm->unsafe |= LSM_UNSAFE_SHARE;
74883 else
74884 p->fs->in_exec = 1;
74885@@ -1472,6 +1551,31 @@ static int exec_binprm(struct linux_binprm *bprm)
74886 return ret;
74887 }
74888
74889+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74890+static DEFINE_PER_CPU(u64, exec_counter);
74891+static int __init init_exec_counters(void)
74892+{
74893+ unsigned int cpu;
74894+
74895+ for_each_possible_cpu(cpu) {
74896+ per_cpu(exec_counter, cpu) = (u64)cpu;
74897+ }
74898+
74899+ return 0;
74900+}
74901+early_initcall(init_exec_counters);
74902+static inline void increment_exec_counter(void)
74903+{
74904+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
74905+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
74906+}
74907+#else
74908+static inline void increment_exec_counter(void) {}
74909+#endif
74910+
74911+extern void gr_handle_exec_args(struct linux_binprm *bprm,
74912+ struct user_arg_ptr argv);
74913+
74914 /*
74915 * sys_execve() executes a new program.
74916 */
74917@@ -1480,6 +1584,11 @@ static int do_execveat_common(int fd, struct filename *filename,
74918 struct user_arg_ptr envp,
74919 int flags)
74920 {
74921+#ifdef CONFIG_GRKERNSEC
74922+ struct file *old_exec_file;
74923+ struct acl_subject_label *old_acl;
74924+ struct rlimit old_rlim[RLIM_NLIMITS];
74925+#endif
74926 char *pathbuf = NULL;
74927 struct linux_binprm *bprm;
74928 struct file *file;
74929@@ -1489,6 +1598,8 @@ static int do_execveat_common(int fd, struct filename *filename,
74930 if (IS_ERR(filename))
74931 return PTR_ERR(filename);
74932
74933+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
74934+
74935 /*
74936 * We move the actual failure in case of RLIMIT_NPROC excess from
74937 * set*uid() to execve() because too many poorly written programs
74938@@ -1526,6 +1637,11 @@ static int do_execveat_common(int fd, struct filename *filename,
74939 if (IS_ERR(file))
74940 goto out_unmark;
74941
74942+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
74943+ retval = -EPERM;
74944+ goto out_unmark;
74945+ }
74946+
74947 sched_exec();
74948
74949 bprm->file = file;
74950@@ -1552,6 +1668,11 @@ static int do_execveat_common(int fd, struct filename *filename,
74951 }
74952 bprm->interp = bprm->filename;
74953
74954+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
74955+ retval = -EACCES;
74956+ goto out_unmark;
74957+ }
74958+
74959 retval = bprm_mm_init(bprm);
74960 if (retval)
74961 goto out_unmark;
74962@@ -1568,24 +1689,70 @@ static int do_execveat_common(int fd, struct filename *filename,
74963 if (retval < 0)
74964 goto out;
74965
74966+#ifdef CONFIG_GRKERNSEC
74967+ old_acl = current->acl;
74968+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
74969+ old_exec_file = current->exec_file;
74970+ get_file(file);
74971+ current->exec_file = file;
74972+#endif
74973+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74974+ /* limit suid stack to 8MB
74975+ * we saved the old limits above and will restore them if this exec fails
74976+ */
74977+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
74978+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
74979+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
74980+#endif
74981+
74982+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
74983+ retval = -EPERM;
74984+ goto out_fail;
74985+ }
74986+
74987+ if (!gr_tpe_allow(file)) {
74988+ retval = -EACCES;
74989+ goto out_fail;
74990+ }
74991+
74992+ if (gr_check_crash_exec(file)) {
74993+ retval = -EACCES;
74994+ goto out_fail;
74995+ }
74996+
74997+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
74998+ bprm->unsafe);
74999+ if (retval < 0)
75000+ goto out_fail;
75001+
75002 retval = copy_strings_kernel(1, &bprm->filename, bprm);
75003 if (retval < 0)
75004- goto out;
75005+ goto out_fail;
75006
75007 bprm->exec = bprm->p;
75008 retval = copy_strings(bprm->envc, envp, bprm);
75009 if (retval < 0)
75010- goto out;
75011+ goto out_fail;
75012
75013 retval = copy_strings(bprm->argc, argv, bprm);
75014 if (retval < 0)
75015- goto out;
75016+ goto out_fail;
75017+
75018+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
75019+
75020+ gr_handle_exec_args(bprm, argv);
75021
75022 retval = exec_binprm(bprm);
75023 if (retval < 0)
75024- goto out;
75025+ goto out_fail;
75026+#ifdef CONFIG_GRKERNSEC
75027+ if (old_exec_file)
75028+ fput(old_exec_file);
75029+#endif
75030
75031 /* execve succeeded */
75032+
75033+ increment_exec_counter();
75034 current->fs->in_exec = 0;
75035 current->in_execve = 0;
75036 acct_update_integrals(current);
75037@@ -1597,6 +1764,14 @@ static int do_execveat_common(int fd, struct filename *filename,
75038 put_files_struct(displaced);
75039 return retval;
75040
75041+out_fail:
75042+#ifdef CONFIG_GRKERNSEC
75043+ current->acl = old_acl;
75044+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
75045+ fput(current->exec_file);
75046+ current->exec_file = old_exec_file;
75047+#endif
75048+
75049 out:
75050 if (bprm->mm) {
75051 acct_arg_size(bprm, 0);
75052@@ -1743,3 +1918,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
75053 argv, envp, flags);
75054 }
75055 #endif
75056+
75057+int pax_check_flags(unsigned long *flags)
75058+{
75059+ int retval = 0;
75060+
75061+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
75062+ if (*flags & MF_PAX_SEGMEXEC)
75063+ {
75064+ *flags &= ~MF_PAX_SEGMEXEC;
75065+ retval = -EINVAL;
75066+ }
75067+#endif
75068+
75069+ if ((*flags & MF_PAX_PAGEEXEC)
75070+
75071+#ifdef CONFIG_PAX_PAGEEXEC
75072+ && (*flags & MF_PAX_SEGMEXEC)
75073+#endif
75074+
75075+ )
75076+ {
75077+ *flags &= ~MF_PAX_PAGEEXEC;
75078+ retval = -EINVAL;
75079+ }
75080+
75081+ if ((*flags & MF_PAX_MPROTECT)
75082+
75083+#ifdef CONFIG_PAX_MPROTECT
75084+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75085+#endif
75086+
75087+ )
75088+ {
75089+ *flags &= ~MF_PAX_MPROTECT;
75090+ retval = -EINVAL;
75091+ }
75092+
75093+ if ((*flags & MF_PAX_EMUTRAMP)
75094+
75095+#ifdef CONFIG_PAX_EMUTRAMP
75096+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75097+#endif
75098+
75099+ )
75100+ {
75101+ *flags &= ~MF_PAX_EMUTRAMP;
75102+ retval = -EINVAL;
75103+ }
75104+
75105+ return retval;
75106+}
75107+
75108+EXPORT_SYMBOL(pax_check_flags);
75109+
75110+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
75111+char *pax_get_path(const struct path *path, char *buf, int buflen)
75112+{
75113+ char *pathname = d_path(path, buf, buflen);
75114+
75115+ if (IS_ERR(pathname))
75116+ goto toolong;
75117+
75118+ pathname = mangle_path(buf, pathname, "\t\n\\");
75119+ if (!pathname)
75120+ goto toolong;
75121+
75122+ *pathname = 0;
75123+ return buf;
75124+
75125+toolong:
75126+ return "<path too long>";
75127+}
75128+EXPORT_SYMBOL(pax_get_path);
75129+
75130+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
75131+{
75132+ struct task_struct *tsk = current;
75133+ struct mm_struct *mm = current->mm;
75134+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
75135+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
75136+ char *path_exec = NULL;
75137+ char *path_fault = NULL;
75138+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
75139+ siginfo_t info = { };
75140+
75141+ if (buffer_exec && buffer_fault) {
75142+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
75143+
75144+ down_read(&mm->mmap_sem);
75145+ vma = mm->mmap;
75146+ while (vma && (!vma_exec || !vma_fault)) {
75147+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
75148+ vma_exec = vma;
75149+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
75150+ vma_fault = vma;
75151+ vma = vma->vm_next;
75152+ }
75153+ if (vma_exec)
75154+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
75155+ if (vma_fault) {
75156+ start = vma_fault->vm_start;
75157+ end = vma_fault->vm_end;
75158+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
75159+ if (vma_fault->vm_file)
75160+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
75161+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
75162+ path_fault = "<heap>";
75163+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
75164+ path_fault = "<stack>";
75165+ else
75166+ path_fault = "<anonymous mapping>";
75167+ }
75168+ up_read(&mm->mmap_sem);
75169+ }
75170+ if (tsk->signal->curr_ip)
75171+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
75172+ else
75173+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
75174+ 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),
75175+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
75176+ free_page((unsigned long)buffer_exec);
75177+ free_page((unsigned long)buffer_fault);
75178+ pax_report_insns(regs, pc, sp);
75179+ info.si_signo = SIGKILL;
75180+ info.si_errno = 0;
75181+ info.si_code = SI_KERNEL;
75182+ info.si_pid = 0;
75183+ info.si_uid = 0;
75184+ do_coredump(&info);
75185+}
75186+#endif
75187+
75188+#ifdef CONFIG_PAX_REFCOUNT
75189+void pax_report_refcount_overflow(struct pt_regs *regs)
75190+{
75191+ if (current->signal->curr_ip)
75192+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
75193+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
75194+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75195+ else
75196+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
75197+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75198+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
75199+ preempt_disable();
75200+ show_regs(regs);
75201+ preempt_enable();
75202+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
75203+}
75204+#endif
75205+
75206+#ifdef CONFIG_PAX_USERCOPY
75207+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
75208+static noinline int check_stack_object(const void *obj, unsigned long len)
75209+{
75210+ const void * const stack = task_stack_page(current);
75211+ const void * const stackend = stack + THREAD_SIZE;
75212+
75213+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75214+ const void *frame = NULL;
75215+ const void *oldframe;
75216+#endif
75217+
75218+ if (obj + len < obj)
75219+ return -1;
75220+
75221+ if (obj + len <= stack || stackend <= obj)
75222+ return 0;
75223+
75224+ if (obj < stack || stackend < obj + len)
75225+ return -1;
75226+
75227+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75228+ oldframe = __builtin_frame_address(1);
75229+ if (oldframe)
75230+ frame = __builtin_frame_address(2);
75231+ /*
75232+ low ----------------------------------------------> high
75233+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
75234+ ^----------------^
75235+ allow copies only within here
75236+ */
75237+ while (stack <= frame && frame < stackend) {
75238+ /* if obj + len extends past the last frame, this
75239+ check won't pass and the next frame will be 0,
75240+ causing us to bail out and correctly report
75241+ the copy as invalid
75242+ */
75243+ if (obj + len <= frame)
75244+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
75245+ oldframe = frame;
75246+ frame = *(const void * const *)frame;
75247+ }
75248+ return -1;
75249+#else
75250+ return 1;
75251+#endif
75252+}
75253+
75254+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
75255+{
75256+ if (current->signal->curr_ip)
75257+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75258+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75259+ else
75260+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75261+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75262+ dump_stack();
75263+ gr_handle_kernel_exploit();
75264+ do_group_exit(SIGKILL);
75265+}
75266+#endif
75267+
75268+#ifdef CONFIG_PAX_USERCOPY
75269+
75270+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
75271+{
75272+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
75273+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
75274+#ifdef CONFIG_MODULES
75275+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
75276+#else
75277+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
75278+#endif
75279+
75280+#else
75281+ unsigned long textlow = (unsigned long)_stext;
75282+ unsigned long texthigh = (unsigned long)_etext;
75283+
75284+#ifdef CONFIG_X86_64
75285+ /* check against linear mapping as well */
75286+ if (high > (unsigned long)__va(__pa(textlow)) &&
75287+ low < (unsigned long)__va(__pa(texthigh)))
75288+ return true;
75289+#endif
75290+
75291+#endif
75292+
75293+ if (high <= textlow || low >= texthigh)
75294+ return false;
75295+ else
75296+ return true;
75297+}
75298+#endif
75299+
75300+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
75301+{
75302+#ifdef CONFIG_PAX_USERCOPY
75303+ const char *type;
75304+#endif
75305+
75306+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
75307+ unsigned long stackstart = (unsigned long)task_stack_page(current);
75308+ unsigned long currentsp = (unsigned long)&stackstart;
75309+ if (unlikely((currentsp < stackstart + 512 ||
75310+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
75311+ BUG();
75312+#endif
75313+
75314+#ifndef CONFIG_PAX_USERCOPY_DEBUG
75315+ if (const_size)
75316+ return;
75317+#endif
75318+
75319+#ifdef CONFIG_PAX_USERCOPY
75320+ if (!n)
75321+ return;
75322+
75323+ type = check_heap_object(ptr, n);
75324+ if (!type) {
75325+ int ret = check_stack_object(ptr, n);
75326+ if (ret == 1 || ret == 2)
75327+ return;
75328+ if (ret == 0) {
75329+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
75330+ type = "<kernel text>";
75331+ else
75332+ return;
75333+ } else
75334+ type = "<process stack>";
75335+ }
75336+
75337+ pax_report_usercopy(ptr, n, to_user, type);
75338+#endif
75339+
75340+}
75341+EXPORT_SYMBOL(__check_object_size);
75342+
75343+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
75344+void __used pax_track_stack(void)
75345+{
75346+ unsigned long sp = (unsigned long)&sp;
75347+ if (sp < current_thread_info()->lowest_stack &&
75348+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
75349+ current_thread_info()->lowest_stack = sp;
75350+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
75351+ BUG();
75352+}
75353+EXPORT_SYMBOL(pax_track_stack);
75354+#endif
75355+
75356+#ifdef CONFIG_PAX_SIZE_OVERFLOW
75357+void __nocapture(1, 3, 4) __used report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
75358+{
75359+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
75360+ dump_stack();
75361+ do_group_exit(SIGKILL);
75362+}
75363+EXPORT_SYMBOL(report_size_overflow);
75364+#endif
75365diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
75366index 9f9992b..8b59411 100644
75367--- a/fs/ext2/balloc.c
75368+++ b/fs/ext2/balloc.c
75369@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
75370
75371 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75372 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75373- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75374+ if (free_blocks < root_blocks + 1 &&
75375 !uid_eq(sbi->s_resuid, current_fsuid()) &&
75376 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75377- !in_group_p (sbi->s_resgid))) {
75378+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75379 return 0;
75380 }
75381 return 1;
75382diff --git a/fs/ext2/super.c b/fs/ext2/super.c
75383index d0e746e..82e06f0 100644
75384--- a/fs/ext2/super.c
75385+++ b/fs/ext2/super.c
75386@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
75387 #ifdef CONFIG_EXT2_FS_XATTR
75388 if (test_opt(sb, XATTR_USER))
75389 seq_puts(seq, ",user_xattr");
75390- if (!test_opt(sb, XATTR_USER) &&
75391- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
75392+ if (!test_opt(sb, XATTR_USER))
75393 seq_puts(seq, ",nouser_xattr");
75394- }
75395 #endif
75396
75397 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75398@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
75399 if (def_mount_opts & EXT2_DEFM_UID16)
75400 set_opt(sbi->s_mount_opt, NO_UID32);
75401 #ifdef CONFIG_EXT2_FS_XATTR
75402- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
75403- set_opt(sbi->s_mount_opt, XATTR_USER);
75404+ /* always enable user xattrs */
75405+ set_opt(sbi->s_mount_opt, XATTR_USER);
75406 #endif
75407 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75408 if (def_mount_opts & EXT2_DEFM_ACL)
75409diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
75410index 0b6bfd3..93a2964 100644
75411--- a/fs/ext2/xattr.c
75412+++ b/fs/ext2/xattr.c
75413@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
75414 struct buffer_head *bh = NULL;
75415 struct ext2_xattr_entry *entry;
75416 char *end;
75417- size_t rest = buffer_size;
75418+ size_t rest = buffer_size, total_size = 0;
75419 int error;
75420
75421 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
75422@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
75423 buffer += size;
75424 }
75425 rest -= size;
75426+ total_size += size;
75427 }
75428 }
75429- error = buffer_size - rest; /* total size */
75430+ error = total_size;
75431
75432 cleanup:
75433 brelse(bh);
75434diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
75435index 158b5d4..2432610 100644
75436--- a/fs/ext3/balloc.c
75437+++ b/fs/ext3/balloc.c
75438@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
75439
75440 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75441 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75442- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75443+ if (free_blocks < root_blocks + 1 &&
75444 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
75445 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75446- !in_group_p (sbi->s_resgid))) {
75447+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75448 return 0;
75449 }
75450 return 1;
75451diff --git a/fs/ext3/super.c b/fs/ext3/super.c
75452index a9312f0..e3a11ec 100644
75453--- a/fs/ext3/super.c
75454+++ b/fs/ext3/super.c
75455@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
75456 #ifdef CONFIG_EXT3_FS_XATTR
75457 if (test_opt(sb, XATTR_USER))
75458 seq_puts(seq, ",user_xattr");
75459- if (!test_opt(sb, XATTR_USER) &&
75460- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
75461+ if (!test_opt(sb, XATTR_USER))
75462 seq_puts(seq, ",nouser_xattr");
75463- }
75464 #endif
75465 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75466 if (test_opt(sb, POSIX_ACL))
75467@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
75468 if (def_mount_opts & EXT3_DEFM_UID16)
75469 set_opt(sbi->s_mount_opt, NO_UID32);
75470 #ifdef CONFIG_EXT3_FS_XATTR
75471- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
75472- set_opt(sbi->s_mount_opt, XATTR_USER);
75473+ /* always enable user xattrs */
75474+ set_opt(sbi->s_mount_opt, XATTR_USER);
75475 #endif
75476 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75477 if (def_mount_opts & EXT3_DEFM_ACL)
75478diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
75479index 7cf3650..e3f4a51 100644
75480--- a/fs/ext3/xattr.c
75481+++ b/fs/ext3/xattr.c
75482@@ -330,7 +330,7 @@ static int
75483 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75484 char *buffer, size_t buffer_size)
75485 {
75486- size_t rest = buffer_size;
75487+ size_t rest = buffer_size, total_size = 0;
75488
75489 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
75490 const struct xattr_handler *handler =
75491@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75492 buffer += size;
75493 }
75494 rest -= size;
75495+ total_size += size;
75496 }
75497 }
75498- return buffer_size - rest;
75499+ return total_size;
75500 }
75501
75502 static int
75503diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
75504index 955bf49a..44ee359 100644
75505--- a/fs/ext4/balloc.c
75506+++ b/fs/ext4/balloc.c
75507@@ -556,8 +556,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
75508 /* Hm, nope. Are (enough) root reserved clusters available? */
75509 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
75510 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
75511- capable(CAP_SYS_RESOURCE) ||
75512- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
75513+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
75514+ capable_nolog(CAP_SYS_RESOURCE)) {
75515
75516 if (free_clusters >= (nclusters + dirty_clusters +
75517 resv_clusters))
75518diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
75519index 9a83f14..1dd1b38 100644
75520--- a/fs/ext4/ext4.h
75521+++ b/fs/ext4/ext4.h
75522@@ -1310,19 +1310,19 @@ struct ext4_sb_info {
75523 unsigned long s_mb_last_start;
75524
75525 /* stats for buddy allocator */
75526- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
75527- atomic_t s_bal_success; /* we found long enough chunks */
75528- atomic_t s_bal_allocated; /* in blocks */
75529- atomic_t s_bal_ex_scanned; /* total extents scanned */
75530- atomic_t s_bal_goals; /* goal hits */
75531- atomic_t s_bal_breaks; /* too long searches */
75532- atomic_t s_bal_2orders; /* 2^order hits */
75533+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
75534+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
75535+ atomic_unchecked_t s_bal_allocated; /* in blocks */
75536+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
75537+ atomic_unchecked_t s_bal_goals; /* goal hits */
75538+ atomic_unchecked_t s_bal_breaks; /* too long searches */
75539+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
75540 spinlock_t s_bal_lock;
75541 unsigned long s_mb_buddies_generated;
75542 unsigned long long s_mb_generation_time;
75543- atomic_t s_mb_lost_chunks;
75544- atomic_t s_mb_preallocated;
75545- atomic_t s_mb_discarded;
75546+ atomic_unchecked_t s_mb_lost_chunks;
75547+ atomic_unchecked_t s_mb_preallocated;
75548+ atomic_unchecked_t s_mb_discarded;
75549 atomic_t s_lock_busy;
75550
75551 /* locality groups */
75552diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
75553index 4126048..3788867 100644
75554--- a/fs/ext4/mballoc.c
75555+++ b/fs/ext4/mballoc.c
75556@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
75557 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
75558
75559 if (EXT4_SB(sb)->s_mb_stats)
75560- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
75561+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
75562
75563 break;
75564 }
75565@@ -2211,7 +2211,7 @@ repeat:
75566 ac->ac_status = AC_STATUS_CONTINUE;
75567 ac->ac_flags |= EXT4_MB_HINT_FIRST;
75568 cr = 3;
75569- atomic_inc(&sbi->s_mb_lost_chunks);
75570+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
75571 goto repeat;
75572 }
75573 }
75574@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
75575 if (sbi->s_mb_stats) {
75576 ext4_msg(sb, KERN_INFO,
75577 "mballoc: %u blocks %u reqs (%u success)",
75578- atomic_read(&sbi->s_bal_allocated),
75579- atomic_read(&sbi->s_bal_reqs),
75580- atomic_read(&sbi->s_bal_success));
75581+ atomic_read_unchecked(&sbi->s_bal_allocated),
75582+ atomic_read_unchecked(&sbi->s_bal_reqs),
75583+ atomic_read_unchecked(&sbi->s_bal_success));
75584 ext4_msg(sb, KERN_INFO,
75585 "mballoc: %u extents scanned, %u goal hits, "
75586 "%u 2^N hits, %u breaks, %u lost",
75587- atomic_read(&sbi->s_bal_ex_scanned),
75588- atomic_read(&sbi->s_bal_goals),
75589- atomic_read(&sbi->s_bal_2orders),
75590- atomic_read(&sbi->s_bal_breaks),
75591- atomic_read(&sbi->s_mb_lost_chunks));
75592+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
75593+ atomic_read_unchecked(&sbi->s_bal_goals),
75594+ atomic_read_unchecked(&sbi->s_bal_2orders),
75595+ atomic_read_unchecked(&sbi->s_bal_breaks),
75596+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
75597 ext4_msg(sb, KERN_INFO,
75598 "mballoc: %lu generated and it took %Lu",
75599 sbi->s_mb_buddies_generated,
75600 sbi->s_mb_generation_time);
75601 ext4_msg(sb, KERN_INFO,
75602 "mballoc: %u preallocated, %u discarded",
75603- atomic_read(&sbi->s_mb_preallocated),
75604- atomic_read(&sbi->s_mb_discarded));
75605+ atomic_read_unchecked(&sbi->s_mb_preallocated),
75606+ atomic_read_unchecked(&sbi->s_mb_discarded));
75607 }
75608
75609 free_percpu(sbi->s_locality_groups);
75610@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
75611 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
75612
75613 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
75614- atomic_inc(&sbi->s_bal_reqs);
75615- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75616+ atomic_inc_unchecked(&sbi->s_bal_reqs);
75617+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75618 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
75619- atomic_inc(&sbi->s_bal_success);
75620- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
75621+ atomic_inc_unchecked(&sbi->s_bal_success);
75622+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
75623 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
75624 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
75625- atomic_inc(&sbi->s_bal_goals);
75626+ atomic_inc_unchecked(&sbi->s_bal_goals);
75627 if (ac->ac_found > sbi->s_mb_max_to_scan)
75628- atomic_inc(&sbi->s_bal_breaks);
75629+ atomic_inc_unchecked(&sbi->s_bal_breaks);
75630 }
75631
75632 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
75633@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
75634 trace_ext4_mb_new_inode_pa(ac, pa);
75635
75636 ext4_mb_use_inode_pa(ac, pa);
75637- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
75638+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
75639
75640 ei = EXT4_I(ac->ac_inode);
75641 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75642@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
75643 trace_ext4_mb_new_group_pa(ac, pa);
75644
75645 ext4_mb_use_group_pa(ac, pa);
75646- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75647+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75648
75649 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75650 lg = ac->ac_lg;
75651@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
75652 * from the bitmap and continue.
75653 */
75654 }
75655- atomic_add(free, &sbi->s_mb_discarded);
75656+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
75657
75658 return err;
75659 }
75660@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
75661 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
75662 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
75663 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
75664- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75665+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75666 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
75667
75668 return 0;
75669diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
75670index 8313ca3..8a37d08 100644
75671--- a/fs/ext4/mmp.c
75672+++ b/fs/ext4/mmp.c
75673@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
75674 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
75675 const char *function, unsigned int line, const char *msg)
75676 {
75677- __ext4_warning(sb, function, line, msg);
75678+ __ext4_warning(sb, function, line, "%s", msg);
75679 __ext4_warning(sb, function, line,
75680 "MMP failure info: last update time: %llu, last update "
75681 "node: %s, last update device: %s\n",
75682diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
75683index cf0c472..ddf284d 100644
75684--- a/fs/ext4/resize.c
75685+++ b/fs/ext4/resize.c
75686@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75687
75688 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
75689 for (count2 = count; count > 0; count -= count2, block += count2) {
75690- ext4_fsblk_t start;
75691+ ext4_fsblk_t start, diff;
75692 struct buffer_head *bh;
75693 ext4_group_t group;
75694 int err;
75695@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75696 start = ext4_group_first_block_no(sb, group);
75697 group -= flex_gd->groups[0].group;
75698
75699- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
75700- if (count2 > count)
75701- count2 = count;
75702-
75703 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
75704 BUG_ON(flex_gd->count > 1);
75705 continue;
75706@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75707 err = ext4_journal_get_write_access(handle, bh);
75708 if (err)
75709 return err;
75710+
75711+ diff = block - start;
75712+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
75713+ if (count2 > count)
75714+ count2 = count;
75715+
75716 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
75717- block - start, count2);
75718- ext4_set_bits(bh->b_data, block - start, count2);
75719+ diff, count2);
75720+ ext4_set_bits(bh->b_data, diff, count2);
75721
75722 err = ext4_handle_dirty_metadata(handle, NULL, bh);
75723 if (unlikely(err))
75724diff --git a/fs/ext4/super.c b/fs/ext4/super.c
75725index ca12affd..18b4b75 100644
75726--- a/fs/ext4/super.c
75727+++ b/fs/ext4/super.c
75728@@ -1233,7 +1233,7 @@ static ext4_fsblk_t get_sb_block(void **data)
75729 }
75730
75731 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
75732-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
75733+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
75734 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
75735
75736 #ifdef CONFIG_QUOTA
75737@@ -2443,7 +2443,7 @@ struct ext4_attr {
75738 int offset;
75739 int deprecated_val;
75740 } u;
75741-};
75742+} __do_const;
75743
75744 static int parse_strtoull(const char *buf,
75745 unsigned long long max, unsigned long long *value)
75746diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
75747index 16e28c0..728c282 100644
75748--- a/fs/ext4/xattr.c
75749+++ b/fs/ext4/xattr.c
75750@@ -398,7 +398,7 @@ static int
75751 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
75752 char *buffer, size_t buffer_size)
75753 {
75754- size_t rest = buffer_size;
75755+ size_t rest = buffer_size, total_size = 0;
75756
75757 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
75758 const struct xattr_handler *handler =
75759@@ -415,9 +415,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
75760 buffer += size;
75761 }
75762 rest -= size;
75763+ total_size += size;
75764 }
75765 }
75766- return buffer_size - rest;
75767+ return total_size;
75768 }
75769
75770 static int
75771diff --git a/fs/fcntl.c b/fs/fcntl.c
75772index ee85cd4..9dd0d20 100644
75773--- a/fs/fcntl.c
75774+++ b/fs/fcntl.c
75775@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
75776 int force)
75777 {
75778 security_file_set_fowner(filp);
75779+ if (gr_handle_chroot_fowner(pid, type))
75780+ return;
75781+ if (gr_check_protected_task_fowner(pid, type))
75782+ return;
75783 f_modown(filp, pid, type, force);
75784 }
75785 EXPORT_SYMBOL(__f_setown);
75786diff --git a/fs/fhandle.c b/fs/fhandle.c
75787index d59712d..2281df9 100644
75788--- a/fs/fhandle.c
75789+++ b/fs/fhandle.c
75790@@ -8,6 +8,7 @@
75791 #include <linux/fs_struct.h>
75792 #include <linux/fsnotify.h>
75793 #include <linux/personality.h>
75794+#include <linux/grsecurity.h>
75795 #include <asm/uaccess.h>
75796 #include "internal.h"
75797 #include "mount.h"
75798@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
75799 } else
75800 retval = 0;
75801 /* copy the mount id */
75802- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
75803- sizeof(*mnt_id)) ||
75804+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
75805 copy_to_user(ufh, handle,
75806 sizeof(struct file_handle) + handle_bytes))
75807 retval = -EFAULT;
75808@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
75809 * the directory. Ideally we would like CAP_DAC_SEARCH.
75810 * But we don't have that
75811 */
75812- if (!capable(CAP_DAC_READ_SEARCH)) {
75813+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
75814 retval = -EPERM;
75815 goto out_err;
75816 }
75817diff --git a/fs/file.c b/fs/file.c
75818index 93c5f89..ed75817 100644
75819--- a/fs/file.c
75820+++ b/fs/file.c
75821@@ -16,6 +16,7 @@
75822 #include <linux/slab.h>
75823 #include <linux/vmalloc.h>
75824 #include <linux/file.h>
75825+#include <linux/security.h>
75826 #include <linux/fdtable.h>
75827 #include <linux/bitops.h>
75828 #include <linux/interrupt.h>
75829@@ -139,7 +140,7 @@ out:
75830 * Return <0 error code on error; 1 on successful completion.
75831 * The files->file_lock should be held on entry, and will be held on exit.
75832 */
75833-static int expand_fdtable(struct files_struct *files, int nr)
75834+static int expand_fdtable(struct files_struct *files, unsigned int nr)
75835 __releases(files->file_lock)
75836 __acquires(files->file_lock)
75837 {
75838@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
75839 * expanded and execution may have blocked.
75840 * The files->file_lock should be held on entry, and will be held on exit.
75841 */
75842-static int expand_files(struct files_struct *files, int nr)
75843+static int expand_files(struct files_struct *files, unsigned int nr)
75844 {
75845 struct fdtable *fdt;
75846
75847@@ -799,6 +800,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
75848 if (!file)
75849 return __close_fd(files, fd);
75850
75851+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
75852 if (fd >= rlimit(RLIMIT_NOFILE))
75853 return -EBADF;
75854
75855@@ -825,6 +827,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
75856 if (unlikely(oldfd == newfd))
75857 return -EINVAL;
75858
75859+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
75860 if (newfd >= rlimit(RLIMIT_NOFILE))
75861 return -EBADF;
75862
75863@@ -880,6 +883,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
75864 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
75865 {
75866 int err;
75867+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
75868 if (from >= rlimit(RLIMIT_NOFILE))
75869 return -EINVAL;
75870 err = alloc_fd(from, flags);
75871diff --git a/fs/filesystems.c b/fs/filesystems.c
75872index 5797d45..7d7d79a 100644
75873--- a/fs/filesystems.c
75874+++ b/fs/filesystems.c
75875@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
75876 int len = dot ? dot - name : strlen(name);
75877
75878 fs = __get_fs_type(name, len);
75879+#ifdef CONFIG_GRKERNSEC_MODHARDEN
75880+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
75881+#else
75882 if (!fs && (request_module("fs-%.*s", len, name) == 0))
75883+#endif
75884 fs = __get_fs_type(name, len);
75885
75886 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
75887diff --git a/fs/fs_struct.c b/fs/fs_struct.c
75888index 7dca743..1ff87ae 100644
75889--- a/fs/fs_struct.c
75890+++ b/fs/fs_struct.c
75891@@ -4,6 +4,7 @@
75892 #include <linux/path.h>
75893 #include <linux/slab.h>
75894 #include <linux/fs_struct.h>
75895+#include <linux/grsecurity.h>
75896 #include "internal.h"
75897
75898 /*
75899@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
75900 struct path old_root;
75901
75902 path_get(path);
75903+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
75904 spin_lock(&fs->lock);
75905 write_seqcount_begin(&fs->seq);
75906 old_root = fs->root;
75907 fs->root = *path;
75908+ gr_set_chroot_entries(current, path);
75909 write_seqcount_end(&fs->seq);
75910 spin_unlock(&fs->lock);
75911- if (old_root.dentry)
75912+ if (old_root.dentry) {
75913+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
75914 path_put(&old_root);
75915+ }
75916 }
75917
75918 /*
75919@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
75920 int hits = 0;
75921 spin_lock(&fs->lock);
75922 write_seqcount_begin(&fs->seq);
75923+ /* this root replacement is only done by pivot_root,
75924+ leave grsec's chroot tagging alone for this task
75925+ so that a pivoted root isn't treated as a chroot
75926+ */
75927 hits += replace_path(&fs->root, old_root, new_root);
75928 hits += replace_path(&fs->pwd, old_root, new_root);
75929 write_seqcount_end(&fs->seq);
75930@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
75931
75932 void free_fs_struct(struct fs_struct *fs)
75933 {
75934+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
75935 path_put(&fs->root);
75936 path_put(&fs->pwd);
75937 kmem_cache_free(fs_cachep, fs);
75938@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
75939 task_lock(tsk);
75940 spin_lock(&fs->lock);
75941 tsk->fs = NULL;
75942- kill = !--fs->users;
75943+ gr_clear_chroot_entries(tsk);
75944+ kill = !atomic_dec_return(&fs->users);
75945 spin_unlock(&fs->lock);
75946 task_unlock(tsk);
75947 if (kill)
75948@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
75949 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
75950 /* We don't need to lock fs - think why ;-) */
75951 if (fs) {
75952- fs->users = 1;
75953+ atomic_set(&fs->users, 1);
75954 fs->in_exec = 0;
75955 spin_lock_init(&fs->lock);
75956 seqcount_init(&fs->seq);
75957@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
75958 spin_lock(&old->lock);
75959 fs->root = old->root;
75960 path_get(&fs->root);
75961+ /* instead of calling gr_set_chroot_entries here,
75962+ we call it from every caller of this function
75963+ */
75964 fs->pwd = old->pwd;
75965 path_get(&fs->pwd);
75966 spin_unlock(&old->lock);
75967+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
75968 }
75969 return fs;
75970 }
75971@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
75972
75973 task_lock(current);
75974 spin_lock(&fs->lock);
75975- kill = !--fs->users;
75976+ kill = !atomic_dec_return(&fs->users);
75977 current->fs = new_fs;
75978+ gr_set_chroot_entries(current, &new_fs->root);
75979 spin_unlock(&fs->lock);
75980 task_unlock(current);
75981
75982@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
75983
75984 int current_umask(void)
75985 {
75986- return current->fs->umask;
75987+ return current->fs->umask | gr_acl_umask();
75988 }
75989 EXPORT_SYMBOL(current_umask);
75990
75991 /* to be mentioned only in INIT_TASK */
75992 struct fs_struct init_fs = {
75993- .users = 1,
75994+ .users = ATOMIC_INIT(1),
75995 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
75996 .seq = SEQCNT_ZERO(init_fs.seq),
75997 .umask = 0022,
75998diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
75999index 89acec7..a575262 100644
76000--- a/fs/fscache/cookie.c
76001+++ b/fs/fscache/cookie.c
76002@@ -19,7 +19,7 @@
76003
76004 struct kmem_cache *fscache_cookie_jar;
76005
76006-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
76007+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
76008
76009 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
76010 static int fscache_alloc_object(struct fscache_cache *cache,
76011@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
76012 parent ? (char *) parent->def->name : "<no-parent>",
76013 def->name, netfs_data, enable);
76014
76015- fscache_stat(&fscache_n_acquires);
76016+ fscache_stat_unchecked(&fscache_n_acquires);
76017
76018 /* if there's no parent cookie, then we don't create one here either */
76019 if (!parent) {
76020- fscache_stat(&fscache_n_acquires_null);
76021+ fscache_stat_unchecked(&fscache_n_acquires_null);
76022 _leave(" [no parent]");
76023 return NULL;
76024 }
76025@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76026 /* allocate and initialise a cookie */
76027 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
76028 if (!cookie) {
76029- fscache_stat(&fscache_n_acquires_oom);
76030+ fscache_stat_unchecked(&fscache_n_acquires_oom);
76031 _leave(" [ENOMEM]");
76032 return NULL;
76033 }
76034@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
76035
76036 switch (cookie->def->type) {
76037 case FSCACHE_COOKIE_TYPE_INDEX:
76038- fscache_stat(&fscache_n_cookie_index);
76039+ fscache_stat_unchecked(&fscache_n_cookie_index);
76040 break;
76041 case FSCACHE_COOKIE_TYPE_DATAFILE:
76042- fscache_stat(&fscache_n_cookie_data);
76043+ fscache_stat_unchecked(&fscache_n_cookie_data);
76044 break;
76045 default:
76046- fscache_stat(&fscache_n_cookie_special);
76047+ fscache_stat_unchecked(&fscache_n_cookie_special);
76048 break;
76049 }
76050
76051@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76052 } else {
76053 atomic_dec(&parent->n_children);
76054 __fscache_cookie_put(cookie);
76055- fscache_stat(&fscache_n_acquires_nobufs);
76056+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
76057 _leave(" = NULL");
76058 return NULL;
76059 }
76060@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76061 }
76062 }
76063
76064- fscache_stat(&fscache_n_acquires_ok);
76065+ fscache_stat_unchecked(&fscache_n_acquires_ok);
76066 _leave(" = %p", cookie);
76067 return cookie;
76068 }
76069@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
76070 cache = fscache_select_cache_for_object(cookie->parent);
76071 if (!cache) {
76072 up_read(&fscache_addremove_sem);
76073- fscache_stat(&fscache_n_acquires_no_cache);
76074+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
76075 _leave(" = -ENOMEDIUM [no cache]");
76076 return -ENOMEDIUM;
76077 }
76078@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
76079 object = cache->ops->alloc_object(cache, cookie);
76080 fscache_stat_d(&fscache_n_cop_alloc_object);
76081 if (IS_ERR(object)) {
76082- fscache_stat(&fscache_n_object_no_alloc);
76083+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
76084 ret = PTR_ERR(object);
76085 goto error;
76086 }
76087
76088- fscache_stat(&fscache_n_object_alloc);
76089+ fscache_stat_unchecked(&fscache_n_object_alloc);
76090
76091- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
76092+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
76093
76094 _debug("ALLOC OBJ%x: %s {%lx}",
76095 object->debug_id, cookie->def->name, object->events);
76096@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
76097
76098 _enter("{%s}", cookie->def->name);
76099
76100- fscache_stat(&fscache_n_invalidates);
76101+ fscache_stat_unchecked(&fscache_n_invalidates);
76102
76103 /* Only permit invalidation of data files. Invalidating an index will
76104 * require the caller to release all its attachments to the tree rooted
76105@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
76106 {
76107 struct fscache_object *object;
76108
76109- fscache_stat(&fscache_n_updates);
76110+ fscache_stat_unchecked(&fscache_n_updates);
76111
76112 if (!cookie) {
76113- fscache_stat(&fscache_n_updates_null);
76114+ fscache_stat_unchecked(&fscache_n_updates_null);
76115 _leave(" [no cookie]");
76116 return;
76117 }
76118@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
76119 */
76120 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
76121 {
76122- fscache_stat(&fscache_n_relinquishes);
76123+ fscache_stat_unchecked(&fscache_n_relinquishes);
76124 if (retire)
76125- fscache_stat(&fscache_n_relinquishes_retire);
76126+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
76127
76128 if (!cookie) {
76129- fscache_stat(&fscache_n_relinquishes_null);
76130+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
76131 _leave(" [no cookie]");
76132 return;
76133 }
76134@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
76135 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
76136 goto inconsistent;
76137
76138- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
76139+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
76140
76141 __fscache_use_cookie(cookie);
76142 if (fscache_submit_op(object, op) < 0)
76143diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
76144index 7872a62..d91b19f 100644
76145--- a/fs/fscache/internal.h
76146+++ b/fs/fscache/internal.h
76147@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
76148 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
76149 extern int fscache_wait_for_operation_activation(struct fscache_object *,
76150 struct fscache_operation *,
76151- atomic_t *,
76152- atomic_t *,
76153+ atomic_unchecked_t *,
76154+ atomic_unchecked_t *,
76155 void (*)(struct fscache_operation *));
76156 extern void fscache_invalidate_writes(struct fscache_cookie *);
76157
76158@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
76159 * stats.c
76160 */
76161 #ifdef CONFIG_FSCACHE_STATS
76162-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76163-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76164+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76165+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76166
76167-extern atomic_t fscache_n_op_pend;
76168-extern atomic_t fscache_n_op_run;
76169-extern atomic_t fscache_n_op_enqueue;
76170-extern atomic_t fscache_n_op_deferred_release;
76171-extern atomic_t fscache_n_op_release;
76172-extern atomic_t fscache_n_op_gc;
76173-extern atomic_t fscache_n_op_cancelled;
76174-extern atomic_t fscache_n_op_rejected;
76175+extern atomic_unchecked_t fscache_n_op_pend;
76176+extern atomic_unchecked_t fscache_n_op_run;
76177+extern atomic_unchecked_t fscache_n_op_enqueue;
76178+extern atomic_unchecked_t fscache_n_op_deferred_release;
76179+extern atomic_unchecked_t fscache_n_op_release;
76180+extern atomic_unchecked_t fscache_n_op_gc;
76181+extern atomic_unchecked_t fscache_n_op_cancelled;
76182+extern atomic_unchecked_t fscache_n_op_rejected;
76183
76184-extern atomic_t fscache_n_attr_changed;
76185-extern atomic_t fscache_n_attr_changed_ok;
76186-extern atomic_t fscache_n_attr_changed_nobufs;
76187-extern atomic_t fscache_n_attr_changed_nomem;
76188-extern atomic_t fscache_n_attr_changed_calls;
76189+extern atomic_unchecked_t fscache_n_attr_changed;
76190+extern atomic_unchecked_t fscache_n_attr_changed_ok;
76191+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
76192+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
76193+extern atomic_unchecked_t fscache_n_attr_changed_calls;
76194
76195-extern atomic_t fscache_n_allocs;
76196-extern atomic_t fscache_n_allocs_ok;
76197-extern atomic_t fscache_n_allocs_wait;
76198-extern atomic_t fscache_n_allocs_nobufs;
76199-extern atomic_t fscache_n_allocs_intr;
76200-extern atomic_t fscache_n_allocs_object_dead;
76201-extern atomic_t fscache_n_alloc_ops;
76202-extern atomic_t fscache_n_alloc_op_waits;
76203+extern atomic_unchecked_t fscache_n_allocs;
76204+extern atomic_unchecked_t fscache_n_allocs_ok;
76205+extern atomic_unchecked_t fscache_n_allocs_wait;
76206+extern atomic_unchecked_t fscache_n_allocs_nobufs;
76207+extern atomic_unchecked_t fscache_n_allocs_intr;
76208+extern atomic_unchecked_t fscache_n_allocs_object_dead;
76209+extern atomic_unchecked_t fscache_n_alloc_ops;
76210+extern atomic_unchecked_t fscache_n_alloc_op_waits;
76211
76212-extern atomic_t fscache_n_retrievals;
76213-extern atomic_t fscache_n_retrievals_ok;
76214-extern atomic_t fscache_n_retrievals_wait;
76215-extern atomic_t fscache_n_retrievals_nodata;
76216-extern atomic_t fscache_n_retrievals_nobufs;
76217-extern atomic_t fscache_n_retrievals_intr;
76218-extern atomic_t fscache_n_retrievals_nomem;
76219-extern atomic_t fscache_n_retrievals_object_dead;
76220-extern atomic_t fscache_n_retrieval_ops;
76221-extern atomic_t fscache_n_retrieval_op_waits;
76222+extern atomic_unchecked_t fscache_n_retrievals;
76223+extern atomic_unchecked_t fscache_n_retrievals_ok;
76224+extern atomic_unchecked_t fscache_n_retrievals_wait;
76225+extern atomic_unchecked_t fscache_n_retrievals_nodata;
76226+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
76227+extern atomic_unchecked_t fscache_n_retrievals_intr;
76228+extern atomic_unchecked_t fscache_n_retrievals_nomem;
76229+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
76230+extern atomic_unchecked_t fscache_n_retrieval_ops;
76231+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
76232
76233-extern atomic_t fscache_n_stores;
76234-extern atomic_t fscache_n_stores_ok;
76235-extern atomic_t fscache_n_stores_again;
76236-extern atomic_t fscache_n_stores_nobufs;
76237-extern atomic_t fscache_n_stores_oom;
76238-extern atomic_t fscache_n_store_ops;
76239-extern atomic_t fscache_n_store_calls;
76240-extern atomic_t fscache_n_store_pages;
76241-extern atomic_t fscache_n_store_radix_deletes;
76242-extern atomic_t fscache_n_store_pages_over_limit;
76243+extern atomic_unchecked_t fscache_n_stores;
76244+extern atomic_unchecked_t fscache_n_stores_ok;
76245+extern atomic_unchecked_t fscache_n_stores_again;
76246+extern atomic_unchecked_t fscache_n_stores_nobufs;
76247+extern atomic_unchecked_t fscache_n_stores_oom;
76248+extern atomic_unchecked_t fscache_n_store_ops;
76249+extern atomic_unchecked_t fscache_n_store_calls;
76250+extern atomic_unchecked_t fscache_n_store_pages;
76251+extern atomic_unchecked_t fscache_n_store_radix_deletes;
76252+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
76253
76254-extern atomic_t fscache_n_store_vmscan_not_storing;
76255-extern atomic_t fscache_n_store_vmscan_gone;
76256-extern atomic_t fscache_n_store_vmscan_busy;
76257-extern atomic_t fscache_n_store_vmscan_cancelled;
76258-extern atomic_t fscache_n_store_vmscan_wait;
76259+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
76260+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
76261+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
76262+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
76263+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
76264
76265-extern atomic_t fscache_n_marks;
76266-extern atomic_t fscache_n_uncaches;
76267+extern atomic_unchecked_t fscache_n_marks;
76268+extern atomic_unchecked_t fscache_n_uncaches;
76269
76270-extern atomic_t fscache_n_acquires;
76271-extern atomic_t fscache_n_acquires_null;
76272-extern atomic_t fscache_n_acquires_no_cache;
76273-extern atomic_t fscache_n_acquires_ok;
76274-extern atomic_t fscache_n_acquires_nobufs;
76275-extern atomic_t fscache_n_acquires_oom;
76276+extern atomic_unchecked_t fscache_n_acquires;
76277+extern atomic_unchecked_t fscache_n_acquires_null;
76278+extern atomic_unchecked_t fscache_n_acquires_no_cache;
76279+extern atomic_unchecked_t fscache_n_acquires_ok;
76280+extern atomic_unchecked_t fscache_n_acquires_nobufs;
76281+extern atomic_unchecked_t fscache_n_acquires_oom;
76282
76283-extern atomic_t fscache_n_invalidates;
76284-extern atomic_t fscache_n_invalidates_run;
76285+extern atomic_unchecked_t fscache_n_invalidates;
76286+extern atomic_unchecked_t fscache_n_invalidates_run;
76287
76288-extern atomic_t fscache_n_updates;
76289-extern atomic_t fscache_n_updates_null;
76290-extern atomic_t fscache_n_updates_run;
76291+extern atomic_unchecked_t fscache_n_updates;
76292+extern atomic_unchecked_t fscache_n_updates_null;
76293+extern atomic_unchecked_t fscache_n_updates_run;
76294
76295-extern atomic_t fscache_n_relinquishes;
76296-extern atomic_t fscache_n_relinquishes_null;
76297-extern atomic_t fscache_n_relinquishes_waitcrt;
76298-extern atomic_t fscache_n_relinquishes_retire;
76299+extern atomic_unchecked_t fscache_n_relinquishes;
76300+extern atomic_unchecked_t fscache_n_relinquishes_null;
76301+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
76302+extern atomic_unchecked_t fscache_n_relinquishes_retire;
76303
76304-extern atomic_t fscache_n_cookie_index;
76305-extern atomic_t fscache_n_cookie_data;
76306-extern atomic_t fscache_n_cookie_special;
76307+extern atomic_unchecked_t fscache_n_cookie_index;
76308+extern atomic_unchecked_t fscache_n_cookie_data;
76309+extern atomic_unchecked_t fscache_n_cookie_special;
76310
76311-extern atomic_t fscache_n_object_alloc;
76312-extern atomic_t fscache_n_object_no_alloc;
76313-extern atomic_t fscache_n_object_lookups;
76314-extern atomic_t fscache_n_object_lookups_negative;
76315-extern atomic_t fscache_n_object_lookups_positive;
76316-extern atomic_t fscache_n_object_lookups_timed_out;
76317-extern atomic_t fscache_n_object_created;
76318-extern atomic_t fscache_n_object_avail;
76319-extern atomic_t fscache_n_object_dead;
76320+extern atomic_unchecked_t fscache_n_object_alloc;
76321+extern atomic_unchecked_t fscache_n_object_no_alloc;
76322+extern atomic_unchecked_t fscache_n_object_lookups;
76323+extern atomic_unchecked_t fscache_n_object_lookups_negative;
76324+extern atomic_unchecked_t fscache_n_object_lookups_positive;
76325+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
76326+extern atomic_unchecked_t fscache_n_object_created;
76327+extern atomic_unchecked_t fscache_n_object_avail;
76328+extern atomic_unchecked_t fscache_n_object_dead;
76329
76330-extern atomic_t fscache_n_checkaux_none;
76331-extern atomic_t fscache_n_checkaux_okay;
76332-extern atomic_t fscache_n_checkaux_update;
76333-extern atomic_t fscache_n_checkaux_obsolete;
76334+extern atomic_unchecked_t fscache_n_checkaux_none;
76335+extern atomic_unchecked_t fscache_n_checkaux_okay;
76336+extern atomic_unchecked_t fscache_n_checkaux_update;
76337+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
76338
76339 extern atomic_t fscache_n_cop_alloc_object;
76340 extern atomic_t fscache_n_cop_lookup_object;
76341@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
76342 atomic_inc(stat);
76343 }
76344
76345+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
76346+{
76347+ atomic_inc_unchecked(stat);
76348+}
76349+
76350 static inline void fscache_stat_d(atomic_t *stat)
76351 {
76352 atomic_dec(stat);
76353@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
76354
76355 #define __fscache_stat(stat) (NULL)
76356 #define fscache_stat(stat) do {} while (0)
76357+#define fscache_stat_unchecked(stat) do {} while (0)
76358 #define fscache_stat_d(stat) do {} while (0)
76359 #endif
76360
76361diff --git a/fs/fscache/object.c b/fs/fscache/object.c
76362index da032da..0076ce7 100644
76363--- a/fs/fscache/object.c
76364+++ b/fs/fscache/object.c
76365@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76366 _debug("LOOKUP \"%s\" in \"%s\"",
76367 cookie->def->name, object->cache->tag->name);
76368
76369- fscache_stat(&fscache_n_object_lookups);
76370+ fscache_stat_unchecked(&fscache_n_object_lookups);
76371 fscache_stat(&fscache_n_cop_lookup_object);
76372 ret = object->cache->ops->lookup_object(object);
76373 fscache_stat_d(&fscache_n_cop_lookup_object);
76374@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76375 if (ret == -ETIMEDOUT) {
76376 /* probably stuck behind another object, so move this one to
76377 * the back of the queue */
76378- fscache_stat(&fscache_n_object_lookups_timed_out);
76379+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
76380 _leave(" [timeout]");
76381 return NO_TRANSIT;
76382 }
76383@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
76384 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
76385
76386 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76387- fscache_stat(&fscache_n_object_lookups_negative);
76388+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
76389
76390 /* Allow write requests to begin stacking up and read requests to begin
76391 * returning ENODATA.
76392@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
76393 /* if we were still looking up, then we must have a positive lookup
76394 * result, in which case there may be data available */
76395 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76396- fscache_stat(&fscache_n_object_lookups_positive);
76397+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
76398
76399 /* We do (presumably) have data */
76400 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
76401@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
76402 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
76403 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
76404 } else {
76405- fscache_stat(&fscache_n_object_created);
76406+ fscache_stat_unchecked(&fscache_n_object_created);
76407 }
76408
76409 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
76410@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
76411 fscache_stat_d(&fscache_n_cop_lookup_complete);
76412
76413 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
76414- fscache_stat(&fscache_n_object_avail);
76415+ fscache_stat_unchecked(&fscache_n_object_avail);
76416
76417 _leave("");
76418 return transit_to(JUMPSTART_DEPS);
76419@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
76420
76421 /* this just shifts the object release to the work processor */
76422 fscache_put_object(object);
76423- fscache_stat(&fscache_n_object_dead);
76424+ fscache_stat_unchecked(&fscache_n_object_dead);
76425
76426 _leave("");
76427 return transit_to(OBJECT_DEAD);
76428@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76429 enum fscache_checkaux result;
76430
76431 if (!object->cookie->def->check_aux) {
76432- fscache_stat(&fscache_n_checkaux_none);
76433+ fscache_stat_unchecked(&fscache_n_checkaux_none);
76434 return FSCACHE_CHECKAUX_OKAY;
76435 }
76436
76437@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76438 switch (result) {
76439 /* entry okay as is */
76440 case FSCACHE_CHECKAUX_OKAY:
76441- fscache_stat(&fscache_n_checkaux_okay);
76442+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
76443 break;
76444
76445 /* entry requires update */
76446 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
76447- fscache_stat(&fscache_n_checkaux_update);
76448+ fscache_stat_unchecked(&fscache_n_checkaux_update);
76449 break;
76450
76451 /* entry requires deletion */
76452 case FSCACHE_CHECKAUX_OBSOLETE:
76453- fscache_stat(&fscache_n_checkaux_obsolete);
76454+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
76455 break;
76456
76457 default:
76458@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
76459 {
76460 const struct fscache_state *s;
76461
76462- fscache_stat(&fscache_n_invalidates_run);
76463+ fscache_stat_unchecked(&fscache_n_invalidates_run);
76464 fscache_stat(&fscache_n_cop_invalidate_object);
76465 s = _fscache_invalidate_object(object, event);
76466 fscache_stat_d(&fscache_n_cop_invalidate_object);
76467@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
76468 {
76469 _enter("{OBJ%x},%d", object->debug_id, event);
76470
76471- fscache_stat(&fscache_n_updates_run);
76472+ fscache_stat_unchecked(&fscache_n_updates_run);
76473 fscache_stat(&fscache_n_cop_update_object);
76474 object->cache->ops->update_object(object);
76475 fscache_stat_d(&fscache_n_cop_update_object);
76476diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
76477index e7b87a0..a85d47a 100644
76478--- a/fs/fscache/operation.c
76479+++ b/fs/fscache/operation.c
76480@@ -17,7 +17,7 @@
76481 #include <linux/slab.h>
76482 #include "internal.h"
76483
76484-atomic_t fscache_op_debug_id;
76485+atomic_unchecked_t fscache_op_debug_id;
76486 EXPORT_SYMBOL(fscache_op_debug_id);
76487
76488 /**
76489@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
76490 ASSERTCMP(atomic_read(&op->usage), >, 0);
76491 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
76492
76493- fscache_stat(&fscache_n_op_enqueue);
76494+ fscache_stat_unchecked(&fscache_n_op_enqueue);
76495 switch (op->flags & FSCACHE_OP_TYPE) {
76496 case FSCACHE_OP_ASYNC:
76497 _debug("queue async");
76498@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
76499 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
76500 if (op->processor)
76501 fscache_enqueue_operation(op);
76502- fscache_stat(&fscache_n_op_run);
76503+ fscache_stat_unchecked(&fscache_n_op_run);
76504 }
76505
76506 /*
76507@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76508 if (object->n_in_progress > 0) {
76509 atomic_inc(&op->usage);
76510 list_add_tail(&op->pend_link, &object->pending_ops);
76511- fscache_stat(&fscache_n_op_pend);
76512+ fscache_stat_unchecked(&fscache_n_op_pend);
76513 } else if (!list_empty(&object->pending_ops)) {
76514 atomic_inc(&op->usage);
76515 list_add_tail(&op->pend_link, &object->pending_ops);
76516- fscache_stat(&fscache_n_op_pend);
76517+ fscache_stat_unchecked(&fscache_n_op_pend);
76518 fscache_start_operations(object);
76519 } else {
76520 ASSERTCMP(object->n_in_progress, ==, 0);
76521@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76522 object->n_exclusive++; /* reads and writes must wait */
76523 atomic_inc(&op->usage);
76524 list_add_tail(&op->pend_link, &object->pending_ops);
76525- fscache_stat(&fscache_n_op_pend);
76526+ fscache_stat_unchecked(&fscache_n_op_pend);
76527 ret = 0;
76528 } else {
76529 /* If we're in any other state, there must have been an I/O
76530@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
76531 if (object->n_exclusive > 0) {
76532 atomic_inc(&op->usage);
76533 list_add_tail(&op->pend_link, &object->pending_ops);
76534- fscache_stat(&fscache_n_op_pend);
76535+ fscache_stat_unchecked(&fscache_n_op_pend);
76536 } else if (!list_empty(&object->pending_ops)) {
76537 atomic_inc(&op->usage);
76538 list_add_tail(&op->pend_link, &object->pending_ops);
76539- fscache_stat(&fscache_n_op_pend);
76540+ fscache_stat_unchecked(&fscache_n_op_pend);
76541 fscache_start_operations(object);
76542 } else {
76543 ASSERTCMP(object->n_exclusive, ==, 0);
76544@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
76545 object->n_ops++;
76546 atomic_inc(&op->usage);
76547 list_add_tail(&op->pend_link, &object->pending_ops);
76548- fscache_stat(&fscache_n_op_pend);
76549+ fscache_stat_unchecked(&fscache_n_op_pend);
76550 ret = 0;
76551 } else if (fscache_object_is_dying(object)) {
76552- fscache_stat(&fscache_n_op_rejected);
76553+ fscache_stat_unchecked(&fscache_n_op_rejected);
76554 op->state = FSCACHE_OP_ST_CANCELLED;
76555 ret = -ENOBUFS;
76556 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
76557@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
76558 ret = -EBUSY;
76559 if (op->state == FSCACHE_OP_ST_PENDING) {
76560 ASSERT(!list_empty(&op->pend_link));
76561- fscache_stat(&fscache_n_op_cancelled);
76562+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76563 list_del_init(&op->pend_link);
76564 if (do_cancel)
76565 do_cancel(op);
76566@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
76567 while (!list_empty(&object->pending_ops)) {
76568 op = list_entry(object->pending_ops.next,
76569 struct fscache_operation, pend_link);
76570- fscache_stat(&fscache_n_op_cancelled);
76571+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76572 list_del_init(&op->pend_link);
76573
76574 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
76575@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
76576 op->state, ==, FSCACHE_OP_ST_CANCELLED);
76577 op->state = FSCACHE_OP_ST_DEAD;
76578
76579- fscache_stat(&fscache_n_op_release);
76580+ fscache_stat_unchecked(&fscache_n_op_release);
76581
76582 if (op->release) {
76583 op->release(op);
76584@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
76585 * lock, and defer it otherwise */
76586 if (!spin_trylock(&object->lock)) {
76587 _debug("defer put");
76588- fscache_stat(&fscache_n_op_deferred_release);
76589+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
76590
76591 cache = object->cache;
76592 spin_lock(&cache->op_gc_list_lock);
76593@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
76594
76595 _debug("GC DEFERRED REL OBJ%x OP%x",
76596 object->debug_id, op->debug_id);
76597- fscache_stat(&fscache_n_op_gc);
76598+ fscache_stat_unchecked(&fscache_n_op_gc);
76599
76600 ASSERTCMP(atomic_read(&op->usage), ==, 0);
76601 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
76602diff --git a/fs/fscache/page.c b/fs/fscache/page.c
76603index de33b3f..8be4d29 100644
76604--- a/fs/fscache/page.c
76605+++ b/fs/fscache/page.c
76606@@ -74,7 +74,7 @@ try_again:
76607 val = radix_tree_lookup(&cookie->stores, page->index);
76608 if (!val) {
76609 rcu_read_unlock();
76610- fscache_stat(&fscache_n_store_vmscan_not_storing);
76611+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
76612 __fscache_uncache_page(cookie, page);
76613 return true;
76614 }
76615@@ -104,11 +104,11 @@ try_again:
76616 spin_unlock(&cookie->stores_lock);
76617
76618 if (xpage) {
76619- fscache_stat(&fscache_n_store_vmscan_cancelled);
76620- fscache_stat(&fscache_n_store_radix_deletes);
76621+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
76622+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76623 ASSERTCMP(xpage, ==, page);
76624 } else {
76625- fscache_stat(&fscache_n_store_vmscan_gone);
76626+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
76627 }
76628
76629 wake_up_bit(&cookie->flags, 0);
76630@@ -123,11 +123,11 @@ page_busy:
76631 * sleeping on memory allocation, so we may need to impose a timeout
76632 * too. */
76633 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
76634- fscache_stat(&fscache_n_store_vmscan_busy);
76635+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
76636 return false;
76637 }
76638
76639- fscache_stat(&fscache_n_store_vmscan_wait);
76640+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
76641 if (!release_page_wait_timeout(cookie, page))
76642 _debug("fscache writeout timeout page: %p{%lx}",
76643 page, page->index);
76644@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
76645 FSCACHE_COOKIE_STORING_TAG);
76646 if (!radix_tree_tag_get(&cookie->stores, page->index,
76647 FSCACHE_COOKIE_PENDING_TAG)) {
76648- fscache_stat(&fscache_n_store_radix_deletes);
76649+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76650 xpage = radix_tree_delete(&cookie->stores, page->index);
76651 }
76652 spin_unlock(&cookie->stores_lock);
76653@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
76654
76655 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
76656
76657- fscache_stat(&fscache_n_attr_changed_calls);
76658+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
76659
76660 if (fscache_object_is_active(object)) {
76661 fscache_stat(&fscache_n_cop_attr_changed);
76662@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76663
76664 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
76665
76666- fscache_stat(&fscache_n_attr_changed);
76667+ fscache_stat_unchecked(&fscache_n_attr_changed);
76668
76669 op = kzalloc(sizeof(*op), GFP_KERNEL);
76670 if (!op) {
76671- fscache_stat(&fscache_n_attr_changed_nomem);
76672+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
76673 _leave(" = -ENOMEM");
76674 return -ENOMEM;
76675 }
76676@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76677 if (fscache_submit_exclusive_op(object, op) < 0)
76678 goto nobufs_dec;
76679 spin_unlock(&cookie->lock);
76680- fscache_stat(&fscache_n_attr_changed_ok);
76681+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
76682 fscache_put_operation(op);
76683 _leave(" = 0");
76684 return 0;
76685@@ -242,7 +242,7 @@ nobufs:
76686 kfree(op);
76687 if (wake_cookie)
76688 __fscache_wake_unused_cookie(cookie);
76689- fscache_stat(&fscache_n_attr_changed_nobufs);
76690+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
76691 _leave(" = %d", -ENOBUFS);
76692 return -ENOBUFS;
76693 }
76694@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
76695 /* allocate a retrieval operation and attempt to submit it */
76696 op = kzalloc(sizeof(*op), GFP_NOIO);
76697 if (!op) {
76698- fscache_stat(&fscache_n_retrievals_nomem);
76699+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76700 return NULL;
76701 }
76702
76703@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
76704 return 0;
76705 }
76706
76707- fscache_stat(&fscache_n_retrievals_wait);
76708+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
76709
76710 jif = jiffies;
76711 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
76712 TASK_INTERRUPTIBLE) != 0) {
76713- fscache_stat(&fscache_n_retrievals_intr);
76714+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76715 _leave(" = -ERESTARTSYS");
76716 return -ERESTARTSYS;
76717 }
76718@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
76719 */
76720 int fscache_wait_for_operation_activation(struct fscache_object *object,
76721 struct fscache_operation *op,
76722- atomic_t *stat_op_waits,
76723- atomic_t *stat_object_dead,
76724+ atomic_unchecked_t *stat_op_waits,
76725+ atomic_unchecked_t *stat_object_dead,
76726 void (*do_cancel)(struct fscache_operation *))
76727 {
76728 int ret;
76729@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
76730
76731 _debug(">>> WT");
76732 if (stat_op_waits)
76733- fscache_stat(stat_op_waits);
76734+ fscache_stat_unchecked(stat_op_waits);
76735 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
76736 TASK_INTERRUPTIBLE) != 0) {
76737 ret = fscache_cancel_op(op, do_cancel);
76738@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
76739 check_if_dead:
76740 if (op->state == FSCACHE_OP_ST_CANCELLED) {
76741 if (stat_object_dead)
76742- fscache_stat(stat_object_dead);
76743+ fscache_stat_unchecked(stat_object_dead);
76744 _leave(" = -ENOBUFS [cancelled]");
76745 return -ENOBUFS;
76746 }
76747@@ -381,7 +381,7 @@ check_if_dead:
76748 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
76749 fscache_cancel_op(op, do_cancel);
76750 if (stat_object_dead)
76751- fscache_stat(stat_object_dead);
76752+ fscache_stat_unchecked(stat_object_dead);
76753 return -ENOBUFS;
76754 }
76755 return 0;
76756@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76757
76758 _enter("%p,%p,,,", cookie, page);
76759
76760- fscache_stat(&fscache_n_retrievals);
76761+ fscache_stat_unchecked(&fscache_n_retrievals);
76762
76763 if (hlist_empty(&cookie->backing_objects))
76764 goto nobufs;
76765@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76766 goto nobufs_unlock_dec;
76767 spin_unlock(&cookie->lock);
76768
76769- fscache_stat(&fscache_n_retrieval_ops);
76770+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
76771
76772 /* pin the netfs read context in case we need to do the actual netfs
76773 * read because we've encountered a cache read failure */
76774@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76775
76776 error:
76777 if (ret == -ENOMEM)
76778- fscache_stat(&fscache_n_retrievals_nomem);
76779+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76780 else if (ret == -ERESTARTSYS)
76781- fscache_stat(&fscache_n_retrievals_intr);
76782+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76783 else if (ret == -ENODATA)
76784- fscache_stat(&fscache_n_retrievals_nodata);
76785+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
76786 else if (ret < 0)
76787- fscache_stat(&fscache_n_retrievals_nobufs);
76788+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76789 else
76790- fscache_stat(&fscache_n_retrievals_ok);
76791+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
76792
76793 fscache_put_retrieval(op);
76794 _leave(" = %d", ret);
76795@@ -505,7 +505,7 @@ nobufs_unlock:
76796 __fscache_wake_unused_cookie(cookie);
76797 kfree(op);
76798 nobufs:
76799- fscache_stat(&fscache_n_retrievals_nobufs);
76800+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76801 _leave(" = -ENOBUFS");
76802 return -ENOBUFS;
76803 }
76804@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76805
76806 _enter("%p,,%d,,,", cookie, *nr_pages);
76807
76808- fscache_stat(&fscache_n_retrievals);
76809+ fscache_stat_unchecked(&fscache_n_retrievals);
76810
76811 if (hlist_empty(&cookie->backing_objects))
76812 goto nobufs;
76813@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76814 goto nobufs_unlock_dec;
76815 spin_unlock(&cookie->lock);
76816
76817- fscache_stat(&fscache_n_retrieval_ops);
76818+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
76819
76820 /* pin the netfs read context in case we need to do the actual netfs
76821 * read because we've encountered a cache read failure */
76822@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76823
76824 error:
76825 if (ret == -ENOMEM)
76826- fscache_stat(&fscache_n_retrievals_nomem);
76827+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76828 else if (ret == -ERESTARTSYS)
76829- fscache_stat(&fscache_n_retrievals_intr);
76830+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76831 else if (ret == -ENODATA)
76832- fscache_stat(&fscache_n_retrievals_nodata);
76833+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
76834 else if (ret < 0)
76835- fscache_stat(&fscache_n_retrievals_nobufs);
76836+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76837 else
76838- fscache_stat(&fscache_n_retrievals_ok);
76839+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
76840
76841 fscache_put_retrieval(op);
76842 _leave(" = %d", ret);
76843@@ -636,7 +636,7 @@ nobufs_unlock:
76844 if (wake_cookie)
76845 __fscache_wake_unused_cookie(cookie);
76846 nobufs:
76847- fscache_stat(&fscache_n_retrievals_nobufs);
76848+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76849 _leave(" = -ENOBUFS");
76850 return -ENOBUFS;
76851 }
76852@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76853
76854 _enter("%p,%p,,,", cookie, page);
76855
76856- fscache_stat(&fscache_n_allocs);
76857+ fscache_stat_unchecked(&fscache_n_allocs);
76858
76859 if (hlist_empty(&cookie->backing_objects))
76860 goto nobufs;
76861@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76862 goto nobufs_unlock_dec;
76863 spin_unlock(&cookie->lock);
76864
76865- fscache_stat(&fscache_n_alloc_ops);
76866+ fscache_stat_unchecked(&fscache_n_alloc_ops);
76867
76868 ret = fscache_wait_for_operation_activation(
76869 object, &op->op,
76870@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76871
76872 error:
76873 if (ret == -ERESTARTSYS)
76874- fscache_stat(&fscache_n_allocs_intr);
76875+ fscache_stat_unchecked(&fscache_n_allocs_intr);
76876 else if (ret < 0)
76877- fscache_stat(&fscache_n_allocs_nobufs);
76878+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
76879 else
76880- fscache_stat(&fscache_n_allocs_ok);
76881+ fscache_stat_unchecked(&fscache_n_allocs_ok);
76882
76883 fscache_put_retrieval(op);
76884 _leave(" = %d", ret);
76885@@ -730,7 +730,7 @@ nobufs_unlock:
76886 if (wake_cookie)
76887 __fscache_wake_unused_cookie(cookie);
76888 nobufs:
76889- fscache_stat(&fscache_n_allocs_nobufs);
76890+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
76891 _leave(" = -ENOBUFS");
76892 return -ENOBUFS;
76893 }
76894@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
76895
76896 spin_lock(&cookie->stores_lock);
76897
76898- fscache_stat(&fscache_n_store_calls);
76899+ fscache_stat_unchecked(&fscache_n_store_calls);
76900
76901 /* find a page to store */
76902 page = NULL;
76903@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
76904 page = results[0];
76905 _debug("gang %d [%lx]", n, page->index);
76906 if (page->index > op->store_limit) {
76907- fscache_stat(&fscache_n_store_pages_over_limit);
76908+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
76909 goto superseded;
76910 }
76911
76912@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
76913 spin_unlock(&cookie->stores_lock);
76914 spin_unlock(&object->lock);
76915
76916- fscache_stat(&fscache_n_store_pages);
76917+ fscache_stat_unchecked(&fscache_n_store_pages);
76918 fscache_stat(&fscache_n_cop_write_page);
76919 ret = object->cache->ops->write_page(op, page);
76920 fscache_stat_d(&fscache_n_cop_write_page);
76921@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76922 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
76923 ASSERT(PageFsCache(page));
76924
76925- fscache_stat(&fscache_n_stores);
76926+ fscache_stat_unchecked(&fscache_n_stores);
76927
76928 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
76929 _leave(" = -ENOBUFS [invalidating]");
76930@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76931 spin_unlock(&cookie->stores_lock);
76932 spin_unlock(&object->lock);
76933
76934- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
76935+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
76936 op->store_limit = object->store_limit;
76937
76938 __fscache_use_cookie(cookie);
76939@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76940
76941 spin_unlock(&cookie->lock);
76942 radix_tree_preload_end();
76943- fscache_stat(&fscache_n_store_ops);
76944- fscache_stat(&fscache_n_stores_ok);
76945+ fscache_stat_unchecked(&fscache_n_store_ops);
76946+ fscache_stat_unchecked(&fscache_n_stores_ok);
76947
76948 /* the work queue now carries its own ref on the object */
76949 fscache_put_operation(&op->op);
76950@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76951 return 0;
76952
76953 already_queued:
76954- fscache_stat(&fscache_n_stores_again);
76955+ fscache_stat_unchecked(&fscache_n_stores_again);
76956 already_pending:
76957 spin_unlock(&cookie->stores_lock);
76958 spin_unlock(&object->lock);
76959 spin_unlock(&cookie->lock);
76960 radix_tree_preload_end();
76961 kfree(op);
76962- fscache_stat(&fscache_n_stores_ok);
76963+ fscache_stat_unchecked(&fscache_n_stores_ok);
76964 _leave(" = 0");
76965 return 0;
76966
76967@@ -1039,14 +1039,14 @@ nobufs:
76968 kfree(op);
76969 if (wake_cookie)
76970 __fscache_wake_unused_cookie(cookie);
76971- fscache_stat(&fscache_n_stores_nobufs);
76972+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
76973 _leave(" = -ENOBUFS");
76974 return -ENOBUFS;
76975
76976 nomem_free:
76977 kfree(op);
76978 nomem:
76979- fscache_stat(&fscache_n_stores_oom);
76980+ fscache_stat_unchecked(&fscache_n_stores_oom);
76981 _leave(" = -ENOMEM");
76982 return -ENOMEM;
76983 }
76984@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
76985 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
76986 ASSERTCMP(page, !=, NULL);
76987
76988- fscache_stat(&fscache_n_uncaches);
76989+ fscache_stat_unchecked(&fscache_n_uncaches);
76990
76991 /* cache withdrawal may beat us to it */
76992 if (!PageFsCache(page))
76993@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
76994 struct fscache_cookie *cookie = op->op.object->cookie;
76995
76996 #ifdef CONFIG_FSCACHE_STATS
76997- atomic_inc(&fscache_n_marks);
76998+ atomic_inc_unchecked(&fscache_n_marks);
76999 #endif
77000
77001 _debug("- mark %p{%lx}", page, page->index);
77002diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
77003index 40d13c7..ddf52b9 100644
77004--- a/fs/fscache/stats.c
77005+++ b/fs/fscache/stats.c
77006@@ -18,99 +18,99 @@
77007 /*
77008 * operation counters
77009 */
77010-atomic_t fscache_n_op_pend;
77011-atomic_t fscache_n_op_run;
77012-atomic_t fscache_n_op_enqueue;
77013-atomic_t fscache_n_op_requeue;
77014-atomic_t fscache_n_op_deferred_release;
77015-atomic_t fscache_n_op_release;
77016-atomic_t fscache_n_op_gc;
77017-atomic_t fscache_n_op_cancelled;
77018-atomic_t fscache_n_op_rejected;
77019+atomic_unchecked_t fscache_n_op_pend;
77020+atomic_unchecked_t fscache_n_op_run;
77021+atomic_unchecked_t fscache_n_op_enqueue;
77022+atomic_unchecked_t fscache_n_op_requeue;
77023+atomic_unchecked_t fscache_n_op_deferred_release;
77024+atomic_unchecked_t fscache_n_op_release;
77025+atomic_unchecked_t fscache_n_op_gc;
77026+atomic_unchecked_t fscache_n_op_cancelled;
77027+atomic_unchecked_t fscache_n_op_rejected;
77028
77029-atomic_t fscache_n_attr_changed;
77030-atomic_t fscache_n_attr_changed_ok;
77031-atomic_t fscache_n_attr_changed_nobufs;
77032-atomic_t fscache_n_attr_changed_nomem;
77033-atomic_t fscache_n_attr_changed_calls;
77034+atomic_unchecked_t fscache_n_attr_changed;
77035+atomic_unchecked_t fscache_n_attr_changed_ok;
77036+atomic_unchecked_t fscache_n_attr_changed_nobufs;
77037+atomic_unchecked_t fscache_n_attr_changed_nomem;
77038+atomic_unchecked_t fscache_n_attr_changed_calls;
77039
77040-atomic_t fscache_n_allocs;
77041-atomic_t fscache_n_allocs_ok;
77042-atomic_t fscache_n_allocs_wait;
77043-atomic_t fscache_n_allocs_nobufs;
77044-atomic_t fscache_n_allocs_intr;
77045-atomic_t fscache_n_allocs_object_dead;
77046-atomic_t fscache_n_alloc_ops;
77047-atomic_t fscache_n_alloc_op_waits;
77048+atomic_unchecked_t fscache_n_allocs;
77049+atomic_unchecked_t fscache_n_allocs_ok;
77050+atomic_unchecked_t fscache_n_allocs_wait;
77051+atomic_unchecked_t fscache_n_allocs_nobufs;
77052+atomic_unchecked_t fscache_n_allocs_intr;
77053+atomic_unchecked_t fscache_n_allocs_object_dead;
77054+atomic_unchecked_t fscache_n_alloc_ops;
77055+atomic_unchecked_t fscache_n_alloc_op_waits;
77056
77057-atomic_t fscache_n_retrievals;
77058-atomic_t fscache_n_retrievals_ok;
77059-atomic_t fscache_n_retrievals_wait;
77060-atomic_t fscache_n_retrievals_nodata;
77061-atomic_t fscache_n_retrievals_nobufs;
77062-atomic_t fscache_n_retrievals_intr;
77063-atomic_t fscache_n_retrievals_nomem;
77064-atomic_t fscache_n_retrievals_object_dead;
77065-atomic_t fscache_n_retrieval_ops;
77066-atomic_t fscache_n_retrieval_op_waits;
77067+atomic_unchecked_t fscache_n_retrievals;
77068+atomic_unchecked_t fscache_n_retrievals_ok;
77069+atomic_unchecked_t fscache_n_retrievals_wait;
77070+atomic_unchecked_t fscache_n_retrievals_nodata;
77071+atomic_unchecked_t fscache_n_retrievals_nobufs;
77072+atomic_unchecked_t fscache_n_retrievals_intr;
77073+atomic_unchecked_t fscache_n_retrievals_nomem;
77074+atomic_unchecked_t fscache_n_retrievals_object_dead;
77075+atomic_unchecked_t fscache_n_retrieval_ops;
77076+atomic_unchecked_t fscache_n_retrieval_op_waits;
77077
77078-atomic_t fscache_n_stores;
77079-atomic_t fscache_n_stores_ok;
77080-atomic_t fscache_n_stores_again;
77081-atomic_t fscache_n_stores_nobufs;
77082-atomic_t fscache_n_stores_oom;
77083-atomic_t fscache_n_store_ops;
77084-atomic_t fscache_n_store_calls;
77085-atomic_t fscache_n_store_pages;
77086-atomic_t fscache_n_store_radix_deletes;
77087-atomic_t fscache_n_store_pages_over_limit;
77088+atomic_unchecked_t fscache_n_stores;
77089+atomic_unchecked_t fscache_n_stores_ok;
77090+atomic_unchecked_t fscache_n_stores_again;
77091+atomic_unchecked_t fscache_n_stores_nobufs;
77092+atomic_unchecked_t fscache_n_stores_oom;
77093+atomic_unchecked_t fscache_n_store_ops;
77094+atomic_unchecked_t fscache_n_store_calls;
77095+atomic_unchecked_t fscache_n_store_pages;
77096+atomic_unchecked_t fscache_n_store_radix_deletes;
77097+atomic_unchecked_t fscache_n_store_pages_over_limit;
77098
77099-atomic_t fscache_n_store_vmscan_not_storing;
77100-atomic_t fscache_n_store_vmscan_gone;
77101-atomic_t fscache_n_store_vmscan_busy;
77102-atomic_t fscache_n_store_vmscan_cancelled;
77103-atomic_t fscache_n_store_vmscan_wait;
77104+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
77105+atomic_unchecked_t fscache_n_store_vmscan_gone;
77106+atomic_unchecked_t fscache_n_store_vmscan_busy;
77107+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
77108+atomic_unchecked_t fscache_n_store_vmscan_wait;
77109
77110-atomic_t fscache_n_marks;
77111-atomic_t fscache_n_uncaches;
77112+atomic_unchecked_t fscache_n_marks;
77113+atomic_unchecked_t fscache_n_uncaches;
77114
77115-atomic_t fscache_n_acquires;
77116-atomic_t fscache_n_acquires_null;
77117-atomic_t fscache_n_acquires_no_cache;
77118-atomic_t fscache_n_acquires_ok;
77119-atomic_t fscache_n_acquires_nobufs;
77120-atomic_t fscache_n_acquires_oom;
77121+atomic_unchecked_t fscache_n_acquires;
77122+atomic_unchecked_t fscache_n_acquires_null;
77123+atomic_unchecked_t fscache_n_acquires_no_cache;
77124+atomic_unchecked_t fscache_n_acquires_ok;
77125+atomic_unchecked_t fscache_n_acquires_nobufs;
77126+atomic_unchecked_t fscache_n_acquires_oom;
77127
77128-atomic_t fscache_n_invalidates;
77129-atomic_t fscache_n_invalidates_run;
77130+atomic_unchecked_t fscache_n_invalidates;
77131+atomic_unchecked_t fscache_n_invalidates_run;
77132
77133-atomic_t fscache_n_updates;
77134-atomic_t fscache_n_updates_null;
77135-atomic_t fscache_n_updates_run;
77136+atomic_unchecked_t fscache_n_updates;
77137+atomic_unchecked_t fscache_n_updates_null;
77138+atomic_unchecked_t fscache_n_updates_run;
77139
77140-atomic_t fscache_n_relinquishes;
77141-atomic_t fscache_n_relinquishes_null;
77142-atomic_t fscache_n_relinquishes_waitcrt;
77143-atomic_t fscache_n_relinquishes_retire;
77144+atomic_unchecked_t fscache_n_relinquishes;
77145+atomic_unchecked_t fscache_n_relinquishes_null;
77146+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
77147+atomic_unchecked_t fscache_n_relinquishes_retire;
77148
77149-atomic_t fscache_n_cookie_index;
77150-atomic_t fscache_n_cookie_data;
77151-atomic_t fscache_n_cookie_special;
77152+atomic_unchecked_t fscache_n_cookie_index;
77153+atomic_unchecked_t fscache_n_cookie_data;
77154+atomic_unchecked_t fscache_n_cookie_special;
77155
77156-atomic_t fscache_n_object_alloc;
77157-atomic_t fscache_n_object_no_alloc;
77158-atomic_t fscache_n_object_lookups;
77159-atomic_t fscache_n_object_lookups_negative;
77160-atomic_t fscache_n_object_lookups_positive;
77161-atomic_t fscache_n_object_lookups_timed_out;
77162-atomic_t fscache_n_object_created;
77163-atomic_t fscache_n_object_avail;
77164-atomic_t fscache_n_object_dead;
77165+atomic_unchecked_t fscache_n_object_alloc;
77166+atomic_unchecked_t fscache_n_object_no_alloc;
77167+atomic_unchecked_t fscache_n_object_lookups;
77168+atomic_unchecked_t fscache_n_object_lookups_negative;
77169+atomic_unchecked_t fscache_n_object_lookups_positive;
77170+atomic_unchecked_t fscache_n_object_lookups_timed_out;
77171+atomic_unchecked_t fscache_n_object_created;
77172+atomic_unchecked_t fscache_n_object_avail;
77173+atomic_unchecked_t fscache_n_object_dead;
77174
77175-atomic_t fscache_n_checkaux_none;
77176-atomic_t fscache_n_checkaux_okay;
77177-atomic_t fscache_n_checkaux_update;
77178-atomic_t fscache_n_checkaux_obsolete;
77179+atomic_unchecked_t fscache_n_checkaux_none;
77180+atomic_unchecked_t fscache_n_checkaux_okay;
77181+atomic_unchecked_t fscache_n_checkaux_update;
77182+atomic_unchecked_t fscache_n_checkaux_obsolete;
77183
77184 atomic_t fscache_n_cop_alloc_object;
77185 atomic_t fscache_n_cop_lookup_object;
77186@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
77187 seq_puts(m, "FS-Cache statistics\n");
77188
77189 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
77190- atomic_read(&fscache_n_cookie_index),
77191- atomic_read(&fscache_n_cookie_data),
77192- atomic_read(&fscache_n_cookie_special));
77193+ atomic_read_unchecked(&fscache_n_cookie_index),
77194+ atomic_read_unchecked(&fscache_n_cookie_data),
77195+ atomic_read_unchecked(&fscache_n_cookie_special));
77196
77197 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
77198- atomic_read(&fscache_n_object_alloc),
77199- atomic_read(&fscache_n_object_no_alloc),
77200- atomic_read(&fscache_n_object_avail),
77201- atomic_read(&fscache_n_object_dead));
77202+ atomic_read_unchecked(&fscache_n_object_alloc),
77203+ atomic_read_unchecked(&fscache_n_object_no_alloc),
77204+ atomic_read_unchecked(&fscache_n_object_avail),
77205+ atomic_read_unchecked(&fscache_n_object_dead));
77206 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
77207- atomic_read(&fscache_n_checkaux_none),
77208- atomic_read(&fscache_n_checkaux_okay),
77209- atomic_read(&fscache_n_checkaux_update),
77210- atomic_read(&fscache_n_checkaux_obsolete));
77211+ atomic_read_unchecked(&fscache_n_checkaux_none),
77212+ atomic_read_unchecked(&fscache_n_checkaux_okay),
77213+ atomic_read_unchecked(&fscache_n_checkaux_update),
77214+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
77215
77216 seq_printf(m, "Pages : mrk=%u unc=%u\n",
77217- atomic_read(&fscache_n_marks),
77218- atomic_read(&fscache_n_uncaches));
77219+ atomic_read_unchecked(&fscache_n_marks),
77220+ atomic_read_unchecked(&fscache_n_uncaches));
77221
77222 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
77223 " oom=%u\n",
77224- atomic_read(&fscache_n_acquires),
77225- atomic_read(&fscache_n_acquires_null),
77226- atomic_read(&fscache_n_acquires_no_cache),
77227- atomic_read(&fscache_n_acquires_ok),
77228- atomic_read(&fscache_n_acquires_nobufs),
77229- atomic_read(&fscache_n_acquires_oom));
77230+ atomic_read_unchecked(&fscache_n_acquires),
77231+ atomic_read_unchecked(&fscache_n_acquires_null),
77232+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
77233+ atomic_read_unchecked(&fscache_n_acquires_ok),
77234+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
77235+ atomic_read_unchecked(&fscache_n_acquires_oom));
77236
77237 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
77238- atomic_read(&fscache_n_object_lookups),
77239- atomic_read(&fscache_n_object_lookups_negative),
77240- atomic_read(&fscache_n_object_lookups_positive),
77241- atomic_read(&fscache_n_object_created),
77242- atomic_read(&fscache_n_object_lookups_timed_out));
77243+ atomic_read_unchecked(&fscache_n_object_lookups),
77244+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
77245+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
77246+ atomic_read_unchecked(&fscache_n_object_created),
77247+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
77248
77249 seq_printf(m, "Invals : n=%u run=%u\n",
77250- atomic_read(&fscache_n_invalidates),
77251- atomic_read(&fscache_n_invalidates_run));
77252+ atomic_read_unchecked(&fscache_n_invalidates),
77253+ atomic_read_unchecked(&fscache_n_invalidates_run));
77254
77255 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
77256- atomic_read(&fscache_n_updates),
77257- atomic_read(&fscache_n_updates_null),
77258- atomic_read(&fscache_n_updates_run));
77259+ atomic_read_unchecked(&fscache_n_updates),
77260+ atomic_read_unchecked(&fscache_n_updates_null),
77261+ atomic_read_unchecked(&fscache_n_updates_run));
77262
77263 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
77264- atomic_read(&fscache_n_relinquishes),
77265- atomic_read(&fscache_n_relinquishes_null),
77266- atomic_read(&fscache_n_relinquishes_waitcrt),
77267- atomic_read(&fscache_n_relinquishes_retire));
77268+ atomic_read_unchecked(&fscache_n_relinquishes),
77269+ atomic_read_unchecked(&fscache_n_relinquishes_null),
77270+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
77271+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
77272
77273 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
77274- atomic_read(&fscache_n_attr_changed),
77275- atomic_read(&fscache_n_attr_changed_ok),
77276- atomic_read(&fscache_n_attr_changed_nobufs),
77277- atomic_read(&fscache_n_attr_changed_nomem),
77278- atomic_read(&fscache_n_attr_changed_calls));
77279+ atomic_read_unchecked(&fscache_n_attr_changed),
77280+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
77281+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
77282+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
77283+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
77284
77285 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
77286- atomic_read(&fscache_n_allocs),
77287- atomic_read(&fscache_n_allocs_ok),
77288- atomic_read(&fscache_n_allocs_wait),
77289- atomic_read(&fscache_n_allocs_nobufs),
77290- atomic_read(&fscache_n_allocs_intr));
77291+ atomic_read_unchecked(&fscache_n_allocs),
77292+ atomic_read_unchecked(&fscache_n_allocs_ok),
77293+ atomic_read_unchecked(&fscache_n_allocs_wait),
77294+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
77295+ atomic_read_unchecked(&fscache_n_allocs_intr));
77296 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
77297- atomic_read(&fscache_n_alloc_ops),
77298- atomic_read(&fscache_n_alloc_op_waits),
77299- atomic_read(&fscache_n_allocs_object_dead));
77300+ atomic_read_unchecked(&fscache_n_alloc_ops),
77301+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
77302+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
77303
77304 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
77305 " int=%u oom=%u\n",
77306- atomic_read(&fscache_n_retrievals),
77307- atomic_read(&fscache_n_retrievals_ok),
77308- atomic_read(&fscache_n_retrievals_wait),
77309- atomic_read(&fscache_n_retrievals_nodata),
77310- atomic_read(&fscache_n_retrievals_nobufs),
77311- atomic_read(&fscache_n_retrievals_intr),
77312- atomic_read(&fscache_n_retrievals_nomem));
77313+ atomic_read_unchecked(&fscache_n_retrievals),
77314+ atomic_read_unchecked(&fscache_n_retrievals_ok),
77315+ atomic_read_unchecked(&fscache_n_retrievals_wait),
77316+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
77317+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
77318+ atomic_read_unchecked(&fscache_n_retrievals_intr),
77319+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
77320 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
77321- atomic_read(&fscache_n_retrieval_ops),
77322- atomic_read(&fscache_n_retrieval_op_waits),
77323- atomic_read(&fscache_n_retrievals_object_dead));
77324+ atomic_read_unchecked(&fscache_n_retrieval_ops),
77325+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
77326+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
77327
77328 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
77329- atomic_read(&fscache_n_stores),
77330- atomic_read(&fscache_n_stores_ok),
77331- atomic_read(&fscache_n_stores_again),
77332- atomic_read(&fscache_n_stores_nobufs),
77333- atomic_read(&fscache_n_stores_oom));
77334+ atomic_read_unchecked(&fscache_n_stores),
77335+ atomic_read_unchecked(&fscache_n_stores_ok),
77336+ atomic_read_unchecked(&fscache_n_stores_again),
77337+ atomic_read_unchecked(&fscache_n_stores_nobufs),
77338+ atomic_read_unchecked(&fscache_n_stores_oom));
77339 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
77340- atomic_read(&fscache_n_store_ops),
77341- atomic_read(&fscache_n_store_calls),
77342- atomic_read(&fscache_n_store_pages),
77343- atomic_read(&fscache_n_store_radix_deletes),
77344- atomic_read(&fscache_n_store_pages_over_limit));
77345+ atomic_read_unchecked(&fscache_n_store_ops),
77346+ atomic_read_unchecked(&fscache_n_store_calls),
77347+ atomic_read_unchecked(&fscache_n_store_pages),
77348+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
77349+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
77350
77351 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
77352- atomic_read(&fscache_n_store_vmscan_not_storing),
77353- atomic_read(&fscache_n_store_vmscan_gone),
77354- atomic_read(&fscache_n_store_vmscan_busy),
77355- atomic_read(&fscache_n_store_vmscan_cancelled),
77356- atomic_read(&fscache_n_store_vmscan_wait));
77357+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
77358+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
77359+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
77360+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
77361+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
77362
77363 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
77364- atomic_read(&fscache_n_op_pend),
77365- atomic_read(&fscache_n_op_run),
77366- atomic_read(&fscache_n_op_enqueue),
77367- atomic_read(&fscache_n_op_cancelled),
77368- atomic_read(&fscache_n_op_rejected));
77369+ atomic_read_unchecked(&fscache_n_op_pend),
77370+ atomic_read_unchecked(&fscache_n_op_run),
77371+ atomic_read_unchecked(&fscache_n_op_enqueue),
77372+ atomic_read_unchecked(&fscache_n_op_cancelled),
77373+ atomic_read_unchecked(&fscache_n_op_rejected));
77374 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
77375- atomic_read(&fscache_n_op_deferred_release),
77376- atomic_read(&fscache_n_op_release),
77377- atomic_read(&fscache_n_op_gc));
77378+ atomic_read_unchecked(&fscache_n_op_deferred_release),
77379+ atomic_read_unchecked(&fscache_n_op_release),
77380+ atomic_read_unchecked(&fscache_n_op_gc));
77381
77382 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
77383 atomic_read(&fscache_n_cop_alloc_object),
77384diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
77385index e5bbf74..9bfdaf3 100644
77386--- a/fs/fuse/cuse.c
77387+++ b/fs/fuse/cuse.c
77388@@ -602,10 +602,12 @@ static int __init cuse_init(void)
77389 INIT_LIST_HEAD(&cuse_conntbl[i]);
77390
77391 /* inherit and extend fuse_dev_operations */
77392- cuse_channel_fops = fuse_dev_operations;
77393- cuse_channel_fops.owner = THIS_MODULE;
77394- cuse_channel_fops.open = cuse_channel_open;
77395- cuse_channel_fops.release = cuse_channel_release;
77396+ pax_open_kernel();
77397+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
77398+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
77399+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
77400+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
77401+ pax_close_kernel();
77402
77403 cuse_class = class_create(THIS_MODULE, "cuse");
77404 if (IS_ERR(cuse_class))
77405diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
77406index c8b68ab..97190db 100644
77407--- a/fs/fuse/dev.c
77408+++ b/fs/fuse/dev.c
77409@@ -1398,7 +1398,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77410 ret = 0;
77411 pipe_lock(pipe);
77412
77413- if (!pipe->readers) {
77414+ if (!atomic_read(&pipe->readers)) {
77415 send_sig(SIGPIPE, current, 0);
77416 if (!ret)
77417 ret = -EPIPE;
77418@@ -1427,7 +1427,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77419 page_nr++;
77420 ret += buf->len;
77421
77422- if (pipe->files)
77423+ if (atomic_read(&pipe->files))
77424 do_wakeup = 1;
77425 }
77426
77427diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
77428index 0572bca..cb9c3fa 100644
77429--- a/fs/fuse/dir.c
77430+++ b/fs/fuse/dir.c
77431@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
77432 return link;
77433 }
77434
77435-static void free_link(char *link)
77436+static void free_link(const char *link)
77437 {
77438 if (!IS_ERR(link))
77439 free_page((unsigned long) link);
77440diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
77441index 0fa8062..755b198 100644
77442--- a/fs/gfs2/glock.c
77443+++ b/fs/gfs2/glock.c
77444@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
77445 if (held1 != held2) {
77446 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
77447 if (held2)
77448- gl->gl_lockref.count++;
77449+ __lockref_inc(&gl->gl_lockref);
77450 else
77451- gl->gl_lockref.count--;
77452+ __lockref_dec(&gl->gl_lockref);
77453 }
77454 if (held1 && held2 && list_empty(&gl->gl_holders))
77455 clear_bit(GLF_QUEUED, &gl->gl_flags);
77456@@ -614,9 +614,9 @@ out:
77457 out_sched:
77458 clear_bit(GLF_LOCK, &gl->gl_flags);
77459 smp_mb__after_atomic();
77460- gl->gl_lockref.count++;
77461+ __lockref_inc(&gl->gl_lockref);
77462 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77463- gl->gl_lockref.count--;
77464+ __lockref_dec(&gl->gl_lockref);
77465 return;
77466
77467 out_unlock:
77468@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
77469 gl->gl_sbd = sdp;
77470 gl->gl_flags = 0;
77471 gl->gl_name = name;
77472- gl->gl_lockref.count = 1;
77473+ __lockref_set(&gl->gl_lockref, 1);
77474 gl->gl_state = LM_ST_UNLOCKED;
77475 gl->gl_target = LM_ST_UNLOCKED;
77476 gl->gl_demote_state = LM_ST_EXCLUSIVE;
77477@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
77478 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
77479 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
77480 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77481- gl->gl_lockref.count++;
77482+ __lockref_inc(&gl->gl_lockref);
77483 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77484- gl->gl_lockref.count--;
77485+ __lockref_dec(&gl->gl_lockref);
77486 }
77487 run_queue(gl, 1);
77488 spin_unlock(&gl->gl_spin);
77489@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
77490 }
77491 }
77492
77493- gl->gl_lockref.count++;
77494+ __lockref_inc(&gl->gl_lockref);
77495 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77496 spin_unlock(&gl->gl_spin);
77497
77498@@ -1384,12 +1384,12 @@ add_back_to_lru:
77499 goto add_back_to_lru;
77500 }
77501 clear_bit(GLF_LRU, &gl->gl_flags);
77502- gl->gl_lockref.count++;
77503+ __lockref_inc(&gl->gl_lockref);
77504 if (demote_ok(gl))
77505 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
77506 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
77507 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77508- gl->gl_lockref.count--;
77509+ __lockref_dec(&gl->gl_lockref);
77510 spin_unlock(&gl->gl_spin);
77511 cond_resched_lock(&lru_lock);
77512 }
77513@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
77514 state2str(gl->gl_demote_state), dtime,
77515 atomic_read(&gl->gl_ail_count),
77516 atomic_read(&gl->gl_revokes),
77517- (int)gl->gl_lockref.count, gl->gl_hold_time);
77518+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
77519
77520 list_for_each_entry(gh, &gl->gl_holders, gh_list)
77521 dump_holder(seq, gh);
77522diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
77523index fe91951..ce38a6e 100644
77524--- a/fs/gfs2/glops.c
77525+++ b/fs/gfs2/glops.c
77526@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
77527
77528 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
77529 gl->gl_state == LM_ST_SHARED && ip) {
77530- gl->gl_lockref.count++;
77531+ __lockref_inc(&gl->gl_lockref);
77532 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
77533- gl->gl_lockref.count--;
77534+ __lockref_dec(&gl->gl_lockref);
77535 }
77536 }
77537
77538diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
77539index e3065cb..45e7117 100644
77540--- a/fs/gfs2/quota.c
77541+++ b/fs/gfs2/quota.c
77542@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
77543 if (!spin_trylock(&qd->qd_lockref.lock))
77544 return LRU_SKIP;
77545
77546- if (qd->qd_lockref.count == 0) {
77547+ if (__lockref_read(&qd->qd_lockref) == 0) {
77548 lockref_mark_dead(&qd->qd_lockref);
77549 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
77550 }
77551@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
77552 return NULL;
77553
77554 qd->qd_sbd = sdp;
77555- qd->qd_lockref.count = 1;
77556+ __lockref_set(&qd->qd_lockref, 1);
77557 spin_lock_init(&qd->qd_lockref.lock);
77558 qd->qd_id = qid;
77559 qd->qd_slot = -1;
77560@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
77561 if (lockref_put_or_lock(&qd->qd_lockref))
77562 return;
77563
77564- qd->qd_lockref.count = 0;
77565+ __lockref_set(&qd->qd_lockref, 0);
77566 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
77567 spin_unlock(&qd->qd_lockref.lock);
77568
77569diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
77570index 07d8d8f..2c2a4e7 100644
77571--- a/fs/hostfs/hostfs_kern.c
77572+++ b/fs/hostfs/hostfs_kern.c
77573@@ -918,7 +918,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
77574
77575 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
77576 {
77577- char *s = nd_get_link(nd);
77578+ const char *s = nd_get_link(nd);
77579 if (!IS_ERR(s))
77580 __putname(s);
77581 }
77582diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
77583index 87724c1..5a5e53f 100644
77584--- a/fs/hugetlbfs/inode.c
77585+++ b/fs/hugetlbfs/inode.c
77586@@ -151,6 +151,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77587 struct mm_struct *mm = current->mm;
77588 struct vm_area_struct *vma;
77589 struct hstate *h = hstate_file(file);
77590+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
77591 struct vm_unmapped_area_info info;
77592
77593 if (len & ~huge_page_mask(h))
77594@@ -164,17 +165,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77595 return addr;
77596 }
77597
77598+#ifdef CONFIG_PAX_RANDMMAP
77599+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
77600+#endif
77601+
77602 if (addr) {
77603 addr = ALIGN(addr, huge_page_size(h));
77604 vma = find_vma(mm, addr);
77605- if (TASK_SIZE - len >= addr &&
77606- (!vma || addr + len <= vma->vm_start))
77607+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
77608 return addr;
77609 }
77610
77611 info.flags = 0;
77612 info.length = len;
77613 info.low_limit = TASK_UNMAPPED_BASE;
77614+
77615+#ifdef CONFIG_PAX_RANDMMAP
77616+ if (mm->pax_flags & MF_PAX_RANDMMAP)
77617+ info.low_limit += mm->delta_mmap;
77618+#endif
77619+
77620 info.high_limit = TASK_SIZE;
77621 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
77622 info.align_offset = 0;
77623@@ -939,7 +949,7 @@ static struct file_system_type hugetlbfs_fs_type = {
77624 };
77625 MODULE_ALIAS_FS("hugetlbfs");
77626
77627-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77628+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77629
77630 static int can_do_hugetlb_shm(void)
77631 {
77632diff --git a/fs/inode.c b/fs/inode.c
77633index 6e342ca..0538cb7 100644
77634--- a/fs/inode.c
77635+++ b/fs/inode.c
77636@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
77637 unsigned int *p = &get_cpu_var(last_ino);
77638 unsigned int res = *p;
77639
77640+start:
77641+
77642 #ifdef CONFIG_SMP
77643 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
77644- static atomic_t shared_last_ino;
77645- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
77646+ static atomic_unchecked_t shared_last_ino;
77647+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
77648
77649 res = next - LAST_INO_BATCH;
77650 }
77651 #endif
77652
77653- *p = ++res;
77654+ if (unlikely(!++res))
77655+ goto start; /* never zero */
77656+ *p = res;
77657 put_cpu_var(last_ino);
77658 return res;
77659 }
77660diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
77661index 4a6cf28..d3a29d3 100644
77662--- a/fs/jffs2/erase.c
77663+++ b/fs/jffs2/erase.c
77664@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
77665 struct jffs2_unknown_node marker = {
77666 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
77667 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77668- .totlen = cpu_to_je32(c->cleanmarker_size)
77669+ .totlen = cpu_to_je32(c->cleanmarker_size),
77670+ .hdr_crc = cpu_to_je32(0)
77671 };
77672
77673 jffs2_prealloc_raw_node_refs(c, jeb, 1);
77674diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
77675index 09ed551..45684f8 100644
77676--- a/fs/jffs2/wbuf.c
77677+++ b/fs/jffs2/wbuf.c
77678@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
77679 {
77680 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
77681 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77682- .totlen = constant_cpu_to_je32(8)
77683+ .totlen = constant_cpu_to_je32(8),
77684+ .hdr_crc = constant_cpu_to_je32(0)
77685 };
77686
77687 /*
77688diff --git a/fs/jfs/super.c b/fs/jfs/super.c
77689index 4cd9798..8dfe86a 100644
77690--- a/fs/jfs/super.c
77691+++ b/fs/jfs/super.c
77692@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
77693
77694 jfs_inode_cachep =
77695 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
77696- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
77697+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
77698 init_once);
77699 if (jfs_inode_cachep == NULL)
77700 return -ENOMEM;
77701diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
77702index 2d48d28..82eddad 100644
77703--- a/fs/kernfs/dir.c
77704+++ b/fs/kernfs/dir.c
77705@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
77706 *
77707 * Returns 31 bit hash of ns + name (so it fits in an off_t )
77708 */
77709-static unsigned int kernfs_name_hash(const char *name, const void *ns)
77710+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
77711 {
77712 unsigned long hash = init_name_hash();
77713 unsigned int len = strlen(name);
77714@@ -873,6 +873,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
77715 ret = scops->mkdir(parent, dentry->d_name.name, mode);
77716
77717 kernfs_put_active(parent);
77718+
77719+ if (!ret) {
77720+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
77721+ ret = PTR_ERR_OR_ZERO(dentry_ret);
77722+ }
77723+
77724 return ret;
77725 }
77726
77727diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
77728index 2bacb99..f745182 100644
77729--- a/fs/kernfs/file.c
77730+++ b/fs/kernfs/file.c
77731@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
77732
77733 struct kernfs_open_node {
77734 atomic_t refcnt;
77735- atomic_t event;
77736+ atomic_unchecked_t event;
77737 wait_queue_head_t poll;
77738 struct list_head files; /* goes through kernfs_open_file.list */
77739 };
77740@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
77741 {
77742 struct kernfs_open_file *of = sf->private;
77743
77744- of->event = atomic_read(&of->kn->attr.open->event);
77745+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
77746
77747 return of->kn->attr.ops->seq_show(sf, v);
77748 }
77749@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
77750 goto out_free;
77751 }
77752
77753- of->event = atomic_read(&of->kn->attr.open->event);
77754+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
77755 ops = kernfs_ops(of->kn);
77756 if (ops->read)
77757 len = ops->read(of, buf, len, *ppos);
77758@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
77759 {
77760 struct kernfs_open_file *of = kernfs_of(file);
77761 const struct kernfs_ops *ops;
77762- size_t len;
77763+ ssize_t len;
77764 char *buf;
77765
77766 if (of->atomic_write_len) {
77767@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
77768 return ret;
77769 }
77770
77771-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
77772- void *buf, int len, int write)
77773+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
77774+ void *buf, size_t len, int write)
77775 {
77776 struct file *file = vma->vm_file;
77777 struct kernfs_open_file *of = kernfs_of(file);
77778- int ret;
77779+ ssize_t ret;
77780
77781 if (!of->vm_ops)
77782 return -EINVAL;
77783@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
77784 return -ENOMEM;
77785
77786 atomic_set(&new_on->refcnt, 0);
77787- atomic_set(&new_on->event, 1);
77788+ atomic_set_unchecked(&new_on->event, 1);
77789 init_waitqueue_head(&new_on->poll);
77790 INIT_LIST_HEAD(&new_on->files);
77791 goto retry;
77792@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
77793
77794 kernfs_put_active(kn);
77795
77796- if (of->event != atomic_read(&on->event))
77797+ if (of->event != atomic_read_unchecked(&on->event))
77798 goto trigger;
77799
77800 return DEFAULT_POLLMASK;
77801@@ -824,7 +824,7 @@ repeat:
77802
77803 on = kn->attr.open;
77804 if (on) {
77805- atomic_inc(&on->event);
77806+ atomic_inc_unchecked(&on->event);
77807 wake_up_interruptible(&on->poll);
77808 }
77809
77810diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
77811index 8a19889..4c3069a 100644
77812--- a/fs/kernfs/symlink.c
77813+++ b/fs/kernfs/symlink.c
77814@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
77815 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
77816 void *cookie)
77817 {
77818- char *page = nd_get_link(nd);
77819+ const char *page = nd_get_link(nd);
77820 if (!IS_ERR(page))
77821 free_page((unsigned long)page);
77822 }
77823diff --git a/fs/libfs.c b/fs/libfs.c
77824index 0281359..24971ac 100644
77825--- a/fs/libfs.c
77826+++ b/fs/libfs.c
77827@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
77828
77829 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
77830 struct dentry *next = list_entry(p, struct dentry, d_child);
77831+ char d_name[sizeof(next->d_iname)];
77832+ const unsigned char *name;
77833+
77834 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
77835 if (!simple_positive(next)) {
77836 spin_unlock(&next->d_lock);
77837@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
77838
77839 spin_unlock(&next->d_lock);
77840 spin_unlock(&dentry->d_lock);
77841- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
77842+ name = next->d_name.name;
77843+ if (name == next->d_iname) {
77844+ memcpy(d_name, name, next->d_name.len);
77845+ name = d_name;
77846+ }
77847+ if (!dir_emit(ctx, name, next->d_name.len,
77848 d_inode(next)->i_ino, dt_type(d_inode(next))))
77849 return 0;
77850 spin_lock(&dentry->d_lock);
77851@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
77852 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
77853 void *cookie)
77854 {
77855- char *s = nd_get_link(nd);
77856+ const char *s = nd_get_link(nd);
77857 if (!IS_ERR(s))
77858 kfree(s);
77859 }
77860diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
77861index acd3947..1f896e2 100644
77862--- a/fs/lockd/clntproc.c
77863+++ b/fs/lockd/clntproc.c
77864@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
77865 /*
77866 * Cookie counter for NLM requests
77867 */
77868-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
77869+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
77870
77871 void nlmclnt_next_cookie(struct nlm_cookie *c)
77872 {
77873- u32 cookie = atomic_inc_return(&nlm_cookie);
77874+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
77875
77876 memcpy(c->data, &cookie, 4);
77877 c->len=4;
77878diff --git a/fs/mount.h b/fs/mount.h
77879index 6a61c2b..bd79179 100644
77880--- a/fs/mount.h
77881+++ b/fs/mount.h
77882@@ -13,7 +13,7 @@ struct mnt_namespace {
77883 u64 seq; /* Sequence number to prevent loops */
77884 wait_queue_head_t poll;
77885 u64 event;
77886-};
77887+} __randomize_layout;
77888
77889 struct mnt_pcp {
77890 int mnt_count;
77891@@ -65,7 +65,7 @@ struct mount {
77892 struct hlist_head mnt_pins;
77893 struct fs_pin mnt_umount;
77894 struct dentry *mnt_ex_mountpoint;
77895-};
77896+} __randomize_layout;
77897
77898 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
77899
77900diff --git a/fs/namei.c b/fs/namei.c
77901index fe30d3b..57656a7 100644
77902--- a/fs/namei.c
77903+++ b/fs/namei.c
77904@@ -336,17 +336,32 @@ int generic_permission(struct inode *inode, int mask)
77905 if (ret != -EACCES)
77906 return ret;
77907
77908+#ifdef CONFIG_GRKERNSEC
77909+ /* we'll block if we have to log due to a denied capability use */
77910+ if (mask & MAY_NOT_BLOCK)
77911+ return -ECHILD;
77912+#endif
77913+
77914 if (S_ISDIR(inode->i_mode)) {
77915 /* DACs are overridable for directories */
77916- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
77917- return 0;
77918 if (!(mask & MAY_WRITE))
77919- if (capable_wrt_inode_uidgid(inode,
77920- CAP_DAC_READ_SEARCH))
77921+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
77922+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
77923 return 0;
77924+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
77925+ return 0;
77926 return -EACCES;
77927 }
77928 /*
77929+ * Searching includes executable on directories, else just read.
77930+ */
77931+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
77932+ if (mask == MAY_READ)
77933+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
77934+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
77935+ return 0;
77936+
77937+ /*
77938 * Read/write DACs are always overridable.
77939 * Executable DACs are overridable when there is
77940 * at least one exec bit set.
77941@@ -355,14 +370,6 @@ int generic_permission(struct inode *inode, int mask)
77942 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
77943 return 0;
77944
77945- /*
77946- * Searching includes executable on directories, else just read.
77947- */
77948- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
77949- if (mask == MAY_READ)
77950- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
77951- return 0;
77952-
77953 return -EACCES;
77954 }
77955 EXPORT_SYMBOL(generic_permission);
77956@@ -502,7 +509,7 @@ struct nameidata {
77957 int last_type;
77958 unsigned depth;
77959 struct file *base;
77960- char *saved_names[MAX_NESTED_LINKS + 1];
77961+ const char *saved_names[MAX_NESTED_LINKS + 1];
77962 };
77963
77964 /*
77965@@ -713,13 +720,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
77966 nd->flags |= LOOKUP_JUMPED;
77967 }
77968
77969-void nd_set_link(struct nameidata *nd, char *path)
77970+void nd_set_link(struct nameidata *nd, const char *path)
77971 {
77972 nd->saved_names[nd->depth] = path;
77973 }
77974 EXPORT_SYMBOL(nd_set_link);
77975
77976-char *nd_get_link(struct nameidata *nd)
77977+const char *nd_get_link(const struct nameidata *nd)
77978 {
77979 return nd->saved_names[nd->depth];
77980 }
77981@@ -766,7 +773,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd)
77982 return 0;
77983
77984 /* Allowed if parent directory not sticky and world-writable. */
77985- parent = nd->path.dentry->d_inode;
77986+ parent = nd->inode;
77987 if ((parent->i_mode & (S_ISVTX|S_IWOTH)) != (S_ISVTX|S_IWOTH))
77988 return 0;
77989
77990@@ -854,7 +861,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
77991 {
77992 struct dentry *dentry = link->dentry;
77993 int error;
77994- char *s;
77995+ const char *s;
77996
77997 BUG_ON(nd->flags & LOOKUP_RCU);
77998
77999@@ -875,6 +882,11 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78000 if (error)
78001 goto out_put_nd_path;
78002
78003+ if (gr_handle_follow_link(dentry, nd->path.mnt)) {
78004+ error = -EACCES;
78005+ goto out_put_nd_path;
78006+ }
78007+
78008 nd->last_type = LAST_BIND;
78009 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
78010 error = PTR_ERR(*p);
78011@@ -1647,6 +1659,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
78012 if (res)
78013 break;
78014 res = walk_component(nd, path, LOOKUP_FOLLOW);
78015+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
78016+ res = -EACCES;
78017 put_link(nd, &link, cookie);
78018 } while (res > 0);
78019
78020@@ -1719,7 +1733,7 @@ EXPORT_SYMBOL(full_name_hash);
78021 static inline u64 hash_name(const char *name)
78022 {
78023 unsigned long a, b, adata, bdata, mask, hash, len;
78024- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78025+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78026
78027 hash = a = 0;
78028 len = -sizeof(unsigned long);
78029@@ -2015,6 +2029,8 @@ static int path_lookupat(int dfd, const struct filename *name,
78030 if (err)
78031 break;
78032 err = lookup_last(nd, &path);
78033+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
78034+ err = -EACCES;
78035 put_link(nd, &link, cookie);
78036 }
78037 }
78038@@ -2022,6 +2038,13 @@ static int path_lookupat(int dfd, const struct filename *name,
78039 if (!err)
78040 err = complete_walk(nd);
78041
78042+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
78043+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78044+ path_put(&nd->path);
78045+ err = -ENOENT;
78046+ }
78047+ }
78048+
78049 if (!err && nd->flags & LOOKUP_DIRECTORY) {
78050 if (!d_can_lookup(nd->path.dentry)) {
78051 path_put(&nd->path);
78052@@ -2042,8 +2065,15 @@ static int filename_lookup(int dfd, struct filename *name,
78053 if (unlikely(retval == -ESTALE))
78054 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
78055
78056- if (likely(!retval))
78057+ if (likely(!retval)) {
78058 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
78059+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
78060+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
78061+ path_put(&nd->path);
78062+ return -ENOENT;
78063+ }
78064+ }
78065+ }
78066 return retval;
78067 }
78068
78069@@ -2621,6 +2651,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
78070 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
78071 return -EPERM;
78072
78073+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
78074+ return -EPERM;
78075+ if (gr_handle_rawio(inode))
78076+ return -EPERM;
78077+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
78078+ return -EACCES;
78079+
78080 return 0;
78081 }
78082
78083@@ -2852,7 +2889,7 @@ looked_up:
78084 * cleared otherwise prior to returning.
78085 */
78086 static int lookup_open(struct nameidata *nd, struct path *path,
78087- struct file *file,
78088+ struct path *link, struct file *file,
78089 const struct open_flags *op,
78090 bool got_write, int *opened)
78091 {
78092@@ -2887,6 +2924,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78093 /* Negative dentry, just create the file */
78094 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
78095 umode_t mode = op->mode;
78096+
78097+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
78098+ error = -EACCES;
78099+ goto out_dput;
78100+ }
78101+
78102+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
78103+ error = -EACCES;
78104+ goto out_dput;
78105+ }
78106+
78107 if (!IS_POSIXACL(dir->d_inode))
78108 mode &= ~current_umask();
78109 /*
78110@@ -2908,6 +2956,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78111 nd->flags & LOOKUP_EXCL);
78112 if (error)
78113 goto out_dput;
78114+ else
78115+ gr_handle_create(dentry, nd->path.mnt);
78116 }
78117 out_no_open:
78118 path->dentry = dentry;
78119@@ -2922,7 +2972,7 @@ out_dput:
78120 /*
78121 * Handle the last step of open()
78122 */
78123-static int do_last(struct nameidata *nd, struct path *path,
78124+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
78125 struct file *file, const struct open_flags *op,
78126 int *opened, struct filename *name)
78127 {
78128@@ -2972,6 +3022,15 @@ static int do_last(struct nameidata *nd, struct path *path,
78129 if (error)
78130 return error;
78131
78132+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
78133+ error = -ENOENT;
78134+ goto out;
78135+ }
78136+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78137+ error = -EACCES;
78138+ goto out;
78139+ }
78140+
78141 audit_inode(name, dir, LOOKUP_PARENT);
78142 error = -EISDIR;
78143 /* trailing slashes? */
78144@@ -2991,7 +3050,7 @@ retry_lookup:
78145 */
78146 }
78147 mutex_lock(&dir->d_inode->i_mutex);
78148- error = lookup_open(nd, path, file, op, got_write, opened);
78149+ error = lookup_open(nd, path, link, file, op, got_write, opened);
78150 mutex_unlock(&dir->d_inode->i_mutex);
78151
78152 if (error <= 0) {
78153@@ -3015,11 +3074,28 @@ retry_lookup:
78154 goto finish_open_created;
78155 }
78156
78157+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
78158+ error = -ENOENT;
78159+ goto exit_dput;
78160+ }
78161+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
78162+ error = -EACCES;
78163+ goto exit_dput;
78164+ }
78165+
78166 /*
78167 * create/update audit record if it already exists.
78168 */
78169- if (d_is_positive(path->dentry))
78170+ if (d_is_positive(path->dentry)) {
78171+ /* only check if O_CREAT is specified, all other checks need to go
78172+ into may_open */
78173+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
78174+ error = -EACCES;
78175+ goto exit_dput;
78176+ }
78177+
78178 audit_inode(name, path->dentry, 0);
78179+ }
78180
78181 /*
78182 * If atomic_open() acquired write access it is dropped now due to
78183@@ -3060,6 +3136,11 @@ finish_lookup:
78184 }
78185 }
78186 BUG_ON(inode != path->dentry->d_inode);
78187+ /* if we're resolving a symlink to another symlink */
78188+ if (link && gr_handle_symlink_owner(link, inode)) {
78189+ error = -EACCES;
78190+ goto out;
78191+ }
78192 return 1;
78193 }
78194
78195@@ -3079,7 +3160,18 @@ finish_open:
78196 path_put(&save_parent);
78197 return error;
78198 }
78199+
78200+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78201+ error = -ENOENT;
78202+ goto out;
78203+ }
78204+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78205+ error = -EACCES;
78206+ goto out;
78207+ }
78208+
78209 audit_inode(name, nd->path.dentry, 0);
78210+
78211 error = -EISDIR;
78212 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
78213 goto out;
78214@@ -3240,7 +3332,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78215 if (unlikely(error))
78216 goto out;
78217
78218- error = do_last(nd, &path, file, op, &opened, pathname);
78219+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
78220 while (unlikely(error > 0)) { /* trailing symlink */
78221 struct path link = path;
78222 void *cookie;
78223@@ -3258,7 +3350,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78224 error = follow_link(&link, nd, &cookie);
78225 if (unlikely(error))
78226 break;
78227- error = do_last(nd, &path, file, op, &opened, pathname);
78228+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
78229 put_link(nd, &link, cookie);
78230 }
78231 out:
78232@@ -3361,9 +3453,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
78233 goto unlock;
78234
78235 error = -EEXIST;
78236- if (d_is_positive(dentry))
78237+ if (d_is_positive(dentry)) {
78238+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
78239+ error = -ENOENT;
78240 goto fail;
78241-
78242+ }
78243 /*
78244 * Special case - lookup gave negative, but... we had foo/bar/
78245 * From the vfs_mknod() POV we just have a negative dentry -
78246@@ -3428,6 +3522,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
78247 }
78248 EXPORT_SYMBOL(user_path_create);
78249
78250+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
78251+{
78252+ struct filename *tmp = getname(pathname);
78253+ struct dentry *res;
78254+ if (IS_ERR(tmp))
78255+ return ERR_CAST(tmp);
78256+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
78257+ if (IS_ERR(res))
78258+ putname(tmp);
78259+ else
78260+ *to = tmp;
78261+ return res;
78262+}
78263+
78264 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
78265 {
78266 int error = may_create(dir, dentry);
78267@@ -3491,6 +3599,17 @@ retry:
78268
78269 if (!IS_POSIXACL(path.dentry->d_inode))
78270 mode &= ~current_umask();
78271+
78272+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
78273+ error = -EPERM;
78274+ goto out;
78275+ }
78276+
78277+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
78278+ error = -EACCES;
78279+ goto out;
78280+ }
78281+
78282 error = security_path_mknod(&path, dentry, mode, dev);
78283 if (error)
78284 goto out;
78285@@ -3506,6 +3625,8 @@ retry:
78286 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
78287 break;
78288 }
78289+ if (!error)
78290+ gr_handle_create(dentry, path.mnt);
78291 out:
78292 done_path_create(&path, dentry);
78293 if (retry_estale(error, lookup_flags)) {
78294@@ -3560,9 +3681,16 @@ retry:
78295
78296 if (!IS_POSIXACL(path.dentry->d_inode))
78297 mode &= ~current_umask();
78298+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
78299+ error = -EACCES;
78300+ goto out;
78301+ }
78302 error = security_path_mkdir(&path, dentry, mode);
78303 if (!error)
78304 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
78305+ if (!error)
78306+ gr_handle_create(dentry, path.mnt);
78307+out:
78308 done_path_create(&path, dentry);
78309 if (retry_estale(error, lookup_flags)) {
78310 lookup_flags |= LOOKUP_REVAL;
78311@@ -3595,7 +3723,7 @@ void dentry_unhash(struct dentry *dentry)
78312 {
78313 shrink_dcache_parent(dentry);
78314 spin_lock(&dentry->d_lock);
78315- if (dentry->d_lockref.count == 1)
78316+ if (__lockref_read(&dentry->d_lockref) == 1)
78317 __d_drop(dentry);
78318 spin_unlock(&dentry->d_lock);
78319 }
78320@@ -3646,6 +3774,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
78321 struct filename *name;
78322 struct dentry *dentry;
78323 struct nameidata nd;
78324+ u64 saved_ino = 0;
78325+ dev_t saved_dev = 0;
78326 unsigned int lookup_flags = 0;
78327 retry:
78328 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78329@@ -3678,10 +3808,21 @@ retry:
78330 error = -ENOENT;
78331 goto exit3;
78332 }
78333+
78334+ saved_ino = gr_get_ino_from_dentry(dentry);
78335+ saved_dev = gr_get_dev_from_dentry(dentry);
78336+
78337+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
78338+ error = -EACCES;
78339+ goto exit3;
78340+ }
78341+
78342 error = security_path_rmdir(&nd.path, dentry);
78343 if (error)
78344 goto exit3;
78345 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
78346+ if (!error && (saved_dev || saved_ino))
78347+ gr_handle_delete(saved_ino, saved_dev);
78348 exit3:
78349 dput(dentry);
78350 exit2:
78351@@ -3774,6 +3915,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
78352 struct nameidata nd;
78353 struct inode *inode = NULL;
78354 struct inode *delegated_inode = NULL;
78355+ u64 saved_ino = 0;
78356+ dev_t saved_dev = 0;
78357 unsigned int lookup_flags = 0;
78358 retry:
78359 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78360@@ -3800,10 +3943,22 @@ retry_deleg:
78361 if (d_is_negative(dentry))
78362 goto slashes;
78363 ihold(inode);
78364+
78365+ if (inode->i_nlink <= 1) {
78366+ saved_ino = gr_get_ino_from_dentry(dentry);
78367+ saved_dev = gr_get_dev_from_dentry(dentry);
78368+ }
78369+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
78370+ error = -EACCES;
78371+ goto exit2;
78372+ }
78373+
78374 error = security_path_unlink(&nd.path, dentry);
78375 if (error)
78376 goto exit2;
78377 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
78378+ if (!error && (saved_ino || saved_dev))
78379+ gr_handle_delete(saved_ino, saved_dev);
78380 exit2:
78381 dput(dentry);
78382 }
78383@@ -3892,9 +4047,17 @@ retry:
78384 if (IS_ERR(dentry))
78385 goto out_putname;
78386
78387+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
78388+ error = -EACCES;
78389+ goto out;
78390+ }
78391+
78392 error = security_path_symlink(&path, dentry, from->name);
78393 if (!error)
78394 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
78395+ if (!error)
78396+ gr_handle_create(dentry, path.mnt);
78397+out:
78398 done_path_create(&path, dentry);
78399 if (retry_estale(error, lookup_flags)) {
78400 lookup_flags |= LOOKUP_REVAL;
78401@@ -3998,6 +4161,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
78402 struct dentry *new_dentry;
78403 struct path old_path, new_path;
78404 struct inode *delegated_inode = NULL;
78405+ struct filename *to = NULL;
78406 int how = 0;
78407 int error;
78408
78409@@ -4021,7 +4185,7 @@ retry:
78410 if (error)
78411 return error;
78412
78413- new_dentry = user_path_create(newdfd, newname, &new_path,
78414+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
78415 (how & LOOKUP_REVAL));
78416 error = PTR_ERR(new_dentry);
78417 if (IS_ERR(new_dentry))
78418@@ -4033,11 +4197,26 @@ retry:
78419 error = may_linkat(&old_path);
78420 if (unlikely(error))
78421 goto out_dput;
78422+
78423+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt, to)) {
78424+ error = -EACCES;
78425+ goto out_dput;
78426+ }
78427+
78428+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
78429+ old_path.dentry, old_path.mnt, to)) {
78430+ error = -EACCES;
78431+ goto out_dput;
78432+ }
78433+
78434 error = security_path_link(old_path.dentry, &new_path, new_dentry);
78435 if (error)
78436 goto out_dput;
78437 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
78438+ if (!error)
78439+ gr_handle_create(new_dentry, new_path.mnt);
78440 out_dput:
78441+ putname(to);
78442 done_path_create(&new_path, new_dentry);
78443 if (delegated_inode) {
78444 error = break_deleg_wait(&delegated_inode);
78445@@ -4353,6 +4532,20 @@ retry_deleg:
78446 if (new_dentry == trap)
78447 goto exit5;
78448
78449+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
78450+ /* use EXDEV error to cause 'mv' to switch to an alternative
78451+ * method for usability
78452+ */
78453+ error = -EXDEV;
78454+ goto exit5;
78455+ }
78456+
78457+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
78458+ old_dentry, d_backing_inode(old_dir), oldnd.path.mnt,
78459+ to, flags);
78460+ if (error)
78461+ goto exit5;
78462+
78463 error = security_path_rename(&oldnd.path, old_dentry,
78464 &newnd.path, new_dentry, flags);
78465 if (error)
78466@@ -4360,6 +4553,9 @@ retry_deleg:
78467 error = vfs_rename(old_dir->d_inode, old_dentry,
78468 new_dir->d_inode, new_dentry,
78469 &delegated_inode, flags);
78470+ if (!error)
78471+ gr_handle_rename(d_backing_inode(old_dir), d_backing_inode(new_dir), old_dentry,
78472+ new_dentry, oldnd.path.mnt, d_is_positive(new_dentry) ? 1 : 0, flags);
78473 exit5:
78474 dput(new_dentry);
78475 exit4:
78476@@ -4416,14 +4612,24 @@ EXPORT_SYMBOL(vfs_whiteout);
78477
78478 int readlink_copy(char __user *buffer, int buflen, const char *link)
78479 {
78480+ char tmpbuf[64];
78481+ const char *newlink;
78482 int len = PTR_ERR(link);
78483+
78484 if (IS_ERR(link))
78485 goto out;
78486
78487 len = strlen(link);
78488 if (len > (unsigned) buflen)
78489 len = buflen;
78490- if (copy_to_user(buffer, link, len))
78491+
78492+ if (len < sizeof(tmpbuf)) {
78493+ memcpy(tmpbuf, link, len);
78494+ newlink = tmpbuf;
78495+ } else
78496+ newlink = link;
78497+
78498+ if (copy_to_user(buffer, newlink, len))
78499 len = -EFAULT;
78500 out:
78501 return len;
78502diff --git a/fs/namespace.c b/fs/namespace.c
78503index fce3cc1..ac3626c 100644
78504--- a/fs/namespace.c
78505+++ b/fs/namespace.c
78506@@ -1505,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
78507 if (!(sb->s_flags & MS_RDONLY))
78508 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
78509 up_write(&sb->s_umount);
78510+
78511+ gr_log_remount(mnt->mnt_devname, retval);
78512+
78513 return retval;
78514 }
78515
78516@@ -1527,6 +1530,9 @@ static int do_umount(struct mount *mnt, int flags)
78517 }
78518 unlock_mount_hash();
78519 namespace_unlock();
78520+
78521+ gr_log_unmount(mnt->mnt_devname, retval);
78522+
78523 return retval;
78524 }
78525
78526@@ -1581,7 +1587,7 @@ static inline bool may_mount(void)
78527 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
78528 */
78529
78530-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
78531+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
78532 {
78533 struct path path;
78534 struct mount *mnt;
78535@@ -1626,7 +1632,7 @@ out:
78536 /*
78537 * The 2.0 compatible umount. No flags.
78538 */
78539-SYSCALL_DEFINE1(oldumount, char __user *, name)
78540+SYSCALL_DEFINE1(oldumount, const char __user *, name)
78541 {
78542 return sys_umount(name, 0);
78543 }
78544@@ -2701,6 +2707,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78545 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
78546 MS_STRICTATIME);
78547
78548+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
78549+ retval = -EPERM;
78550+ goto dput_out;
78551+ }
78552+
78553+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
78554+ retval = -EPERM;
78555+ goto dput_out;
78556+ }
78557+
78558 if (flags & MS_REMOUNT)
78559 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
78560 data_page);
78561@@ -2714,7 +2730,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78562 retval = do_new_mount(&path, type_page, flags, mnt_flags,
78563 dev_name, data_page);
78564 dput_out:
78565+ gr_log_mount(dev_name, &path, retval);
78566+
78567 path_put(&path);
78568+
78569 return retval;
78570 }
78571
78572@@ -2732,7 +2751,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
78573 * number incrementing at 10Ghz will take 12,427 years to wrap which
78574 * is effectively never, so we can ignore the possibility.
78575 */
78576-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
78577+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
78578
78579 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78580 {
78581@@ -2748,7 +2767,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78582 return ERR_PTR(ret);
78583 }
78584 new_ns->ns.ops = &mntns_operations;
78585- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
78586+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
78587 atomic_set(&new_ns->count, 1);
78588 new_ns->root = NULL;
78589 INIT_LIST_HEAD(&new_ns->list);
78590@@ -2758,7 +2777,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78591 return new_ns;
78592 }
78593
78594-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78595+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78596 struct user_namespace *user_ns, struct fs_struct *new_fs)
78597 {
78598 struct mnt_namespace *new_ns;
78599@@ -2879,8 +2898,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
78600 }
78601 EXPORT_SYMBOL(mount_subtree);
78602
78603-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
78604- char __user *, type, unsigned long, flags, void __user *, data)
78605+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
78606+ const char __user *, type, unsigned long, flags, void __user *, data)
78607 {
78608 int ret;
78609 char *kernel_type;
78610@@ -2986,6 +3005,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
78611 if (error)
78612 goto out2;
78613
78614+ if (gr_handle_chroot_pivot()) {
78615+ error = -EPERM;
78616+ goto out2;
78617+ }
78618+
78619 get_fs_root(current->fs, &root);
78620 old_mp = lock_mount(&old);
78621 error = PTR_ERR(old_mp);
78622@@ -3287,7 +3311,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
78623 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
78624 return -EPERM;
78625
78626- if (fs->users != 1)
78627+ if (atomic_read(&fs->users) != 1)
78628 return -EINVAL;
78629
78630 get_mnt_ns(mnt_ns);
78631diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
78632index 19ca95c..b28702c 100644
78633--- a/fs/nfs/callback_xdr.c
78634+++ b/fs/nfs/callback_xdr.c
78635@@ -51,7 +51,7 @@ struct callback_op {
78636 callback_decode_arg_t decode_args;
78637 callback_encode_res_t encode_res;
78638 long res_maxsize;
78639-};
78640+} __do_const;
78641
78642 static struct callback_op callback_ops[];
78643
78644diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
78645index 5d25b9d..765fc0f 100644
78646--- a/fs/nfs/inode.c
78647+++ b/fs/nfs/inode.c
78648@@ -1277,16 +1277,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
78649 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
78650 }
78651
78652-static atomic_long_t nfs_attr_generation_counter;
78653+static atomic_long_unchecked_t nfs_attr_generation_counter;
78654
78655 static unsigned long nfs_read_attr_generation_counter(void)
78656 {
78657- return atomic_long_read(&nfs_attr_generation_counter);
78658+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
78659 }
78660
78661 unsigned long nfs_inc_attr_generation_counter(void)
78662 {
78663- return atomic_long_inc_return(&nfs_attr_generation_counter);
78664+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
78665 }
78666 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
78667
78668diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
78669index 9e6475b..7970138 100644
78670--- a/fs/nfs/internal.h
78671+++ b/fs/nfs/internal.h
78672@@ -296,6 +296,22 @@ extern struct rpc_procinfo nfs4_procedures[];
78673
78674 #ifdef CONFIG_NFS_V4_SECURITY_LABEL
78675 extern struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags);
78676+static inline struct nfs4_label *
78677+nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)
78678+{
78679+ if (!dst || !src)
78680+ return NULL;
78681+
78682+ if (src->len > NFS4_MAXLABELLEN)
78683+ return NULL;
78684+
78685+ dst->lfs = src->lfs;
78686+ dst->pi = src->pi;
78687+ dst->len = src->len;
78688+ memcpy(dst->label, src->label, src->len);
78689+
78690+ return dst;
78691+}
78692 static inline void nfs4_label_free(struct nfs4_label *label)
78693 {
78694 if (label) {
78695@@ -316,6 +332,11 @@ static inline void nfs4_label_free(void *label) {}
78696 static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)
78697 {
78698 }
78699+static inline struct nfs4_label *
78700+nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)
78701+{
78702+ return NULL;
78703+}
78704 #endif /* CONFIG_NFS_V4_SECURITY_LABEL */
78705
78706 /* proc.c */
78707diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
78708index d3f2051..dd338dc 100644
78709--- a/fs/nfs/nfs4proc.c
78710+++ b/fs/nfs/nfs4proc.c
78711@@ -916,6 +916,7 @@ struct nfs4_opendata {
78712 struct nfs_open_confirmres c_res;
78713 struct nfs4_string owner_name;
78714 struct nfs4_string group_name;
78715+ struct nfs4_label *a_label;
78716 struct nfs_fattr f_attr;
78717 struct nfs4_label *f_label;
78718 struct dentry *dir;
78719@@ -1019,6 +1020,10 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78720 if (IS_ERR(p->f_label))
78721 goto err_free_p;
78722
78723+ p->a_label = nfs4_label_alloc(server, gfp_mask);
78724+ if (IS_ERR(p->a_label))
78725+ goto err_free_f;
78726+
78727 alloc_seqid = server->nfs_client->cl_mvops->alloc_seqid;
78728 p->o_arg.seqid = alloc_seqid(&sp->so_seqid, gfp_mask);
78729 if (IS_ERR(p->o_arg.seqid))
78730@@ -1047,7 +1052,7 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78731 p->o_arg.server = server;
78732 p->o_arg.bitmask = nfs4_bitmask(server, label);
78733 p->o_arg.open_bitmap = &nfs4_fattr_bitmap[0];
78734- p->o_arg.label = label;
78735+ p->o_arg.label = nfs4_label_copy(p->a_label, label);
78736 p->o_arg.claim = nfs4_map_atomic_open_claim(server, claim);
78737 switch (p->o_arg.claim) {
78738 case NFS4_OPEN_CLAIM_NULL:
78739@@ -1080,6 +1085,8 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78740 return p;
78741
78742 err_free_label:
78743+ nfs4_label_free(p->a_label);
78744+err_free_f:
78745 nfs4_label_free(p->f_label);
78746 err_free_p:
78747 kfree(p);
78748@@ -1099,6 +1106,7 @@ static void nfs4_opendata_free(struct kref *kref)
78749 nfs4_put_open_state(p->state);
78750 nfs4_put_state_owner(p->owner);
78751
78752+ nfs4_label_free(p->a_label);
78753 nfs4_label_free(p->f_label);
78754
78755 dput(p->dir);
78756diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
78757index 864e200..357c255 100644
78758--- a/fs/nfsd/nfs4proc.c
78759+++ b/fs/nfsd/nfs4proc.c
78760@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
78761 nfsd4op_rsize op_rsize_bop;
78762 stateid_getter op_get_currentstateid;
78763 stateid_setter op_set_currentstateid;
78764-};
78765+} __do_const;
78766
78767 static struct nfsd4_operation nfsd4_ops[];
78768
78769diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
78770index d4d8445..36ae1a1 100644
78771--- a/fs/nfsd/nfs4xdr.c
78772+++ b/fs/nfsd/nfs4xdr.c
78773@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
78774
78775 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
78776
78777-static nfsd4_dec nfsd4_dec_ops[] = {
78778+static const nfsd4_dec nfsd4_dec_ops[] = {
78779 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
78780 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
78781 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
78782diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
78783index 46ec934..f384e41 100644
78784--- a/fs/nfsd/nfscache.c
78785+++ b/fs/nfsd/nfscache.c
78786@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78787 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
78788 u32 hash;
78789 struct nfsd_drc_bucket *b;
78790- int len;
78791+ long len;
78792 size_t bufsize = 0;
78793
78794 if (!rp)
78795@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78796 hash = nfsd_cache_hash(rp->c_xid);
78797 b = &drc_hashtbl[hash];
78798
78799- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
78800- len >>= 2;
78801+ if (statp) {
78802+ len = (char*)statp - (char*)resv->iov_base;
78803+ len = resv->iov_len - len;
78804+ len >>= 2;
78805+ }
78806
78807 /* Don't cache excessive amounts of data and XDR failures */
78808- if (!statp || len > (256 >> 2)) {
78809+ if (!statp || len > (256 >> 2) || len < 0) {
78810 nfsd_reply_cache_free(b, rp);
78811 return;
78812 }
78813@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78814 switch (cachetype) {
78815 case RC_REPLSTAT:
78816 if (len != 1)
78817- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
78818+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
78819 rp->c_replstat = *statp;
78820 break;
78821 case RC_REPLBUFF:
78822diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
78823index 84d770b..929bc5e 100644
78824--- a/fs/nfsd/vfs.c
78825+++ b/fs/nfsd/vfs.c
78826@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
78827
78828 oldfs = get_fs();
78829 set_fs(KERNEL_DS);
78830- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
78831+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
78832 set_fs(oldfs);
78833 return nfsd_finish_read(file, count, host_err);
78834 }
78835@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
78836
78837 /* Write the data. */
78838 oldfs = get_fs(); set_fs(KERNEL_DS);
78839- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
78840+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
78841 set_fs(oldfs);
78842 if (host_err < 0)
78843 goto out_nfserr;
78844@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
78845 */
78846
78847 oldfs = get_fs(); set_fs(KERNEL_DS);
78848- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
78849+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
78850 set_fs(oldfs);
78851
78852 if (host_err < 0)
78853diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
78854index 52ccd34..7a6b202 100644
78855--- a/fs/nls/nls_base.c
78856+++ b/fs/nls/nls_base.c
78857@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
78858
78859 int __register_nls(struct nls_table *nls, struct module *owner)
78860 {
78861- struct nls_table ** tmp = &tables;
78862+ struct nls_table *tmp = tables;
78863
78864 if (nls->next)
78865 return -EBUSY;
78866
78867- nls->owner = owner;
78868+ pax_open_kernel();
78869+ *(void **)&nls->owner = owner;
78870+ pax_close_kernel();
78871 spin_lock(&nls_lock);
78872- while (*tmp) {
78873- if (nls == *tmp) {
78874+ while (tmp) {
78875+ if (nls == tmp) {
78876 spin_unlock(&nls_lock);
78877 return -EBUSY;
78878 }
78879- tmp = &(*tmp)->next;
78880+ tmp = tmp->next;
78881 }
78882- nls->next = tables;
78883+ pax_open_kernel();
78884+ *(struct nls_table **)&nls->next = tables;
78885+ pax_close_kernel();
78886 tables = nls;
78887 spin_unlock(&nls_lock);
78888 return 0;
78889@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
78890
78891 int unregister_nls(struct nls_table * nls)
78892 {
78893- struct nls_table ** tmp = &tables;
78894+ struct nls_table * const * tmp = &tables;
78895
78896 spin_lock(&nls_lock);
78897 while (*tmp) {
78898 if (nls == *tmp) {
78899- *tmp = nls->next;
78900+ pax_open_kernel();
78901+ *(struct nls_table **)tmp = nls->next;
78902+ pax_close_kernel();
78903 spin_unlock(&nls_lock);
78904 return 0;
78905 }
78906@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
78907 return -EINVAL;
78908 }
78909
78910-static struct nls_table *find_nls(char *charset)
78911+static struct nls_table *find_nls(const char *charset)
78912 {
78913 struct nls_table *nls;
78914 spin_lock(&nls_lock);
78915@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
78916 return nls;
78917 }
78918
78919-struct nls_table *load_nls(char *charset)
78920+struct nls_table *load_nls(const char *charset)
78921 {
78922 return try_then_request_module(find_nls(charset), "nls_%s", charset);
78923 }
78924diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
78925index 162b3f1..6076a7c 100644
78926--- a/fs/nls/nls_euc-jp.c
78927+++ b/fs/nls/nls_euc-jp.c
78928@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
78929 p_nls = load_nls("cp932");
78930
78931 if (p_nls) {
78932- table.charset2upper = p_nls->charset2upper;
78933- table.charset2lower = p_nls->charset2lower;
78934+ pax_open_kernel();
78935+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
78936+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
78937+ pax_close_kernel();
78938 return register_nls(&table);
78939 }
78940
78941diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
78942index a80a741..7b96e1b 100644
78943--- a/fs/nls/nls_koi8-ru.c
78944+++ b/fs/nls/nls_koi8-ru.c
78945@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
78946 p_nls = load_nls("koi8-u");
78947
78948 if (p_nls) {
78949- table.charset2upper = p_nls->charset2upper;
78950- table.charset2lower = p_nls->charset2lower;
78951+ pax_open_kernel();
78952+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
78953+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
78954+ pax_close_kernel();
78955 return register_nls(&table);
78956 }
78957
78958diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
78959index cf27550..6c70f29d 100644
78960--- a/fs/notify/fanotify/fanotify_user.c
78961+++ b/fs/notify/fanotify/fanotify_user.c
78962@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
78963
78964 fd = fanotify_event_metadata.fd;
78965 ret = -EFAULT;
78966- if (copy_to_user(buf, &fanotify_event_metadata,
78967- fanotify_event_metadata.event_len))
78968+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
78969+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
78970 goto out_close_fd;
78971
78972 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
78973diff --git a/fs/notify/notification.c b/fs/notify/notification.c
78974index a95d8e0..a91a5fd 100644
78975--- a/fs/notify/notification.c
78976+++ b/fs/notify/notification.c
78977@@ -48,7 +48,7 @@
78978 #include <linux/fsnotify_backend.h>
78979 #include "fsnotify.h"
78980
78981-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
78982+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
78983
78984 /**
78985 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
78986@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
78987 */
78988 u32 fsnotify_get_cookie(void)
78989 {
78990- return atomic_inc_return(&fsnotify_sync_cookie);
78991+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
78992 }
78993 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
78994
78995diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
78996index 9e38daf..5727cae 100644
78997--- a/fs/ntfs/dir.c
78998+++ b/fs/ntfs/dir.c
78999@@ -1310,7 +1310,7 @@ find_next_index_buffer:
79000 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
79001 ~(s64)(ndir->itype.index.block_size - 1)));
79002 /* Bounds checks. */
79003- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79004+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79005 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
79006 "inode 0x%lx or driver bug.", vdir->i_ino);
79007 goto err_out;
79008diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
79009index 9e1e112..241a52a 100644
79010--- a/fs/ntfs/super.c
79011+++ b/fs/ntfs/super.c
79012@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79013 if (!silent)
79014 ntfs_error(sb, "Primary boot sector is invalid.");
79015 } else if (!silent)
79016- ntfs_error(sb, read_err_str, "primary");
79017+ ntfs_error(sb, read_err_str, "%s", "primary");
79018 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
79019 if (bh_primary)
79020 brelse(bh_primary);
79021@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79022 goto hotfix_primary_boot_sector;
79023 brelse(bh_backup);
79024 } else if (!silent)
79025- ntfs_error(sb, read_err_str, "backup");
79026+ ntfs_error(sb, read_err_str, "%s", "backup");
79027 /* Try to read NT3.51- backup boot sector. */
79028 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
79029 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
79030@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79031 "sector.");
79032 brelse(bh_backup);
79033 } else if (!silent)
79034- ntfs_error(sb, read_err_str, "backup");
79035+ ntfs_error(sb, read_err_str, "%s", "backup");
79036 /* We failed. Cleanup and return. */
79037 if (bh_primary)
79038 brelse(bh_primary);
79039diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
79040index 857bbbc..3c47d15 100644
79041--- a/fs/ocfs2/localalloc.c
79042+++ b/fs/ocfs2/localalloc.c
79043@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
79044 goto bail;
79045 }
79046
79047- atomic_inc(&osb->alloc_stats.moves);
79048+ atomic_inc_unchecked(&osb->alloc_stats.moves);
79049
79050 bail:
79051 if (handle)
79052diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
79053index 460c6c3..b4ef513 100644
79054--- a/fs/ocfs2/ocfs2.h
79055+++ b/fs/ocfs2/ocfs2.h
79056@@ -247,11 +247,11 @@ enum ocfs2_vol_state
79057
79058 struct ocfs2_alloc_stats
79059 {
79060- atomic_t moves;
79061- atomic_t local_data;
79062- atomic_t bitmap_data;
79063- atomic_t bg_allocs;
79064- atomic_t bg_extends;
79065+ atomic_unchecked_t moves;
79066+ atomic_unchecked_t local_data;
79067+ atomic_unchecked_t bitmap_data;
79068+ atomic_unchecked_t bg_allocs;
79069+ atomic_unchecked_t bg_extends;
79070 };
79071
79072 enum ocfs2_local_alloc_state
79073diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
79074index 4479029..5de740b 100644
79075--- a/fs/ocfs2/suballoc.c
79076+++ b/fs/ocfs2/suballoc.c
79077@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
79078 mlog_errno(status);
79079 goto bail;
79080 }
79081- atomic_inc(&osb->alloc_stats.bg_extends);
79082+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
79083
79084 /* You should never ask for this much metadata */
79085 BUG_ON(bits_wanted >
79086@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
79087 mlog_errno(status);
79088 goto bail;
79089 }
79090- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79091+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79092
79093 *suballoc_loc = res.sr_bg_blkno;
79094 *suballoc_bit_start = res.sr_bit_offset;
79095@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
79096 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
79097 res->sr_bits);
79098
79099- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79100+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79101
79102 BUG_ON(res->sr_bits != 1);
79103
79104@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
79105 mlog_errno(status);
79106 goto bail;
79107 }
79108- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79109+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79110
79111 BUG_ON(res.sr_bits != 1);
79112
79113@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79114 cluster_start,
79115 num_clusters);
79116 if (!status)
79117- atomic_inc(&osb->alloc_stats.local_data);
79118+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
79119 } else {
79120 if (min_clusters > (osb->bitmap_cpg - 1)) {
79121 /* The only paths asking for contiguousness
79122@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79123 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
79124 res.sr_bg_blkno,
79125 res.sr_bit_offset);
79126- atomic_inc(&osb->alloc_stats.bitmap_data);
79127+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
79128 *num_clusters = res.sr_bits;
79129 }
79130 }
79131diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
79132index 403c566..6525b35 100644
79133--- a/fs/ocfs2/super.c
79134+++ b/fs/ocfs2/super.c
79135@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
79136 "%10s => GlobalAllocs: %d LocalAllocs: %d "
79137 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
79138 "Stats",
79139- atomic_read(&osb->alloc_stats.bitmap_data),
79140- atomic_read(&osb->alloc_stats.local_data),
79141- atomic_read(&osb->alloc_stats.bg_allocs),
79142- atomic_read(&osb->alloc_stats.moves),
79143- atomic_read(&osb->alloc_stats.bg_extends));
79144+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
79145+ atomic_read_unchecked(&osb->alloc_stats.local_data),
79146+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
79147+ atomic_read_unchecked(&osb->alloc_stats.moves),
79148+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
79149
79150 out += snprintf(buf + out, len - out,
79151 "%10s => State: %u Descriptor: %llu Size: %u bits "
79152@@ -2095,11 +2095,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
79153
79154 mutex_init(&osb->system_file_mutex);
79155
79156- atomic_set(&osb->alloc_stats.moves, 0);
79157- atomic_set(&osb->alloc_stats.local_data, 0);
79158- atomic_set(&osb->alloc_stats.bitmap_data, 0);
79159- atomic_set(&osb->alloc_stats.bg_allocs, 0);
79160- atomic_set(&osb->alloc_stats.bg_extends, 0);
79161+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
79162+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
79163+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
79164+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
79165+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
79166
79167 /* Copy the blockcheck stats from the superblock probe */
79168 osb->osb_ecc_stats = *stats;
79169diff --git a/fs/open.c b/fs/open.c
79170index 98e5a52..8e77e14 100644
79171--- a/fs/open.c
79172+++ b/fs/open.c
79173@@ -32,6 +32,8 @@
79174 #include <linux/dnotify.h>
79175 #include <linux/compat.h>
79176
79177+#define CREATE_TRACE_POINTS
79178+#include <trace/events/fs.h>
79179 #include "internal.h"
79180
79181 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
79182@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
79183 error = locks_verify_truncate(inode, NULL, length);
79184 if (!error)
79185 error = security_path_truncate(path);
79186+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
79187+ error = -EACCES;
79188 if (!error)
79189 error = do_truncate(path->dentry, length, 0, NULL);
79190
79191@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
79192 error = locks_verify_truncate(inode, f.file, length);
79193 if (!error)
79194 error = security_path_truncate(&f.file->f_path);
79195+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
79196+ error = -EACCES;
79197 if (!error)
79198 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
79199 sb_end_write(inode->i_sb);
79200@@ -396,6 +402,9 @@ retry:
79201 if (__mnt_is_readonly(path.mnt))
79202 res = -EROFS;
79203
79204+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
79205+ res = -EACCES;
79206+
79207 out_path_release:
79208 path_put(&path);
79209 if (retry_estale(res, lookup_flags)) {
79210@@ -427,6 +436,8 @@ retry:
79211 if (error)
79212 goto dput_and_out;
79213
79214+ gr_log_chdir(path.dentry, path.mnt);
79215+
79216 set_fs_pwd(current->fs, &path);
79217
79218 dput_and_out:
79219@@ -456,6 +467,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
79220 goto out_putf;
79221
79222 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
79223+
79224+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
79225+ error = -EPERM;
79226+
79227+ if (!error)
79228+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
79229+
79230 if (!error)
79231 set_fs_pwd(current->fs, &f.file->f_path);
79232 out_putf:
79233@@ -485,7 +503,13 @@ retry:
79234 if (error)
79235 goto dput_and_out;
79236
79237+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
79238+ goto dput_and_out;
79239+
79240 set_fs_root(current->fs, &path);
79241+
79242+ gr_handle_chroot_chdir(&path);
79243+
79244 error = 0;
79245 dput_and_out:
79246 path_put(&path);
79247@@ -509,6 +533,16 @@ static int chmod_common(struct path *path, umode_t mode)
79248 return error;
79249 retry_deleg:
79250 mutex_lock(&inode->i_mutex);
79251+
79252+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
79253+ error = -EACCES;
79254+ goto out_unlock;
79255+ }
79256+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
79257+ error = -EACCES;
79258+ goto out_unlock;
79259+ }
79260+
79261 error = security_path_chmod(path, mode);
79262 if (error)
79263 goto out_unlock;
79264@@ -574,6 +608,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
79265 uid = make_kuid(current_user_ns(), user);
79266 gid = make_kgid(current_user_ns(), group);
79267
79268+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
79269+ return -EACCES;
79270+
79271 retry_deleg:
79272 newattrs.ia_valid = ATTR_CTIME;
79273 if (user != (uid_t) -1) {
79274@@ -1018,6 +1055,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
79275 } else {
79276 fsnotify_open(f);
79277 fd_install(fd, f);
79278+ trace_do_sys_open(tmp->name, flags, mode);
79279 }
79280 }
79281 putname(tmp);
79282diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
79283index 04f1248..60b3be1 100644
79284--- a/fs/overlayfs/inode.c
79285+++ b/fs/overlayfs/inode.c
79286@@ -344,6 +344,9 @@ static int ovl_dentry_open(struct dentry *dentry, struct file *file,
79287 enum ovl_path_type type;
79288 bool want_write = false;
79289
79290+ if (d_is_dir(dentry))
79291+ return d_backing_inode(dentry);
79292+
79293 type = ovl_path_real(dentry, &realpath);
79294 if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
79295 want_write = true;
79296diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
79297index bf8537c..c16ef7d 100644
79298--- a/fs/overlayfs/super.c
79299+++ b/fs/overlayfs/super.c
79300@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
79301 {
79302 struct ovl_entry *oe = dentry->d_fsdata;
79303
79304- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
79305+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
79306 }
79307
79308 int ovl_want_write(struct dentry *dentry)
79309@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
79310
79311 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
79312 {
79313- struct path upperpath = { NULL, NULL };
79314- struct path workpath = { NULL, NULL };
79315+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
79316+ struct path workpath = { .dentry = NULL, .mnt = NULL };
79317 struct dentry *root_dentry;
79318 struct ovl_entry *oe;
79319 struct ovl_fs *ufs;
79320diff --git a/fs/pipe.c b/fs/pipe.c
79321index 8865f79..bd2c79b 100644
79322--- a/fs/pipe.c
79323+++ b/fs/pipe.c
79324@@ -36,7 +36,7 @@ unsigned int pipe_max_size = 1048576;
79325 /*
79326 * Minimum pipe size, as required by POSIX
79327 */
79328-unsigned int pipe_min_size = PAGE_SIZE;
79329+unsigned int pipe_min_size __read_only = PAGE_SIZE;
79330
79331 /*
79332 * We use a start+len construction, which provides full use of the
79333@@ -55,7 +55,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
79334
79335 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
79336 {
79337- if (pipe->files)
79338+ if (atomic_read(&pipe->files))
79339 mutex_lock_nested(&pipe->mutex, subclass);
79340 }
79341
79342@@ -70,7 +70,7 @@ EXPORT_SYMBOL(pipe_lock);
79343
79344 void pipe_unlock(struct pipe_inode_info *pipe)
79345 {
79346- if (pipe->files)
79347+ if (atomic_read(&pipe->files))
79348 mutex_unlock(&pipe->mutex);
79349 }
79350 EXPORT_SYMBOL(pipe_unlock);
79351@@ -291,9 +291,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
79352 }
79353 if (bufs) /* More to do? */
79354 continue;
79355- if (!pipe->writers)
79356+ if (!atomic_read(&pipe->writers))
79357 break;
79358- if (!pipe->waiting_writers) {
79359+ if (!atomic_read(&pipe->waiting_writers)) {
79360 /* syscall merging: Usually we must not sleep
79361 * if O_NONBLOCK is set, or if we got some data.
79362 * But if a writer sleeps in kernel space, then
79363@@ -350,7 +350,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79364
79365 __pipe_lock(pipe);
79366
79367- if (!pipe->readers) {
79368+ if (!atomic_read(&pipe->readers)) {
79369 send_sig(SIGPIPE, current, 0);
79370 ret = -EPIPE;
79371 goto out;
79372@@ -386,7 +386,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79373 for (;;) {
79374 int bufs;
79375
79376- if (!pipe->readers) {
79377+ if (!atomic_read(&pipe->readers)) {
79378 send_sig(SIGPIPE, current, 0);
79379 if (!ret)
79380 ret = -EPIPE;
79381@@ -454,9 +454,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79382 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79383 do_wakeup = 0;
79384 }
79385- pipe->waiting_writers++;
79386+ atomic_inc(&pipe->waiting_writers);
79387 pipe_wait(pipe);
79388- pipe->waiting_writers--;
79389+ atomic_dec(&pipe->waiting_writers);
79390 }
79391 out:
79392 __pipe_unlock(pipe);
79393@@ -511,7 +511,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79394 mask = 0;
79395 if (filp->f_mode & FMODE_READ) {
79396 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
79397- if (!pipe->writers && filp->f_version != pipe->w_counter)
79398+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
79399 mask |= POLLHUP;
79400 }
79401
79402@@ -521,7 +521,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79403 * Most Unices do not set POLLERR for FIFOs but on Linux they
79404 * behave exactly like pipes for poll().
79405 */
79406- if (!pipe->readers)
79407+ if (!atomic_read(&pipe->readers))
79408 mask |= POLLERR;
79409 }
79410
79411@@ -533,7 +533,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
79412 int kill = 0;
79413
79414 spin_lock(&inode->i_lock);
79415- if (!--pipe->files) {
79416+ if (atomic_dec_and_test(&pipe->files)) {
79417 inode->i_pipe = NULL;
79418 kill = 1;
79419 }
79420@@ -550,11 +550,11 @@ pipe_release(struct inode *inode, struct file *file)
79421
79422 __pipe_lock(pipe);
79423 if (file->f_mode & FMODE_READ)
79424- pipe->readers--;
79425+ atomic_dec(&pipe->readers);
79426 if (file->f_mode & FMODE_WRITE)
79427- pipe->writers--;
79428+ atomic_dec(&pipe->writers);
79429
79430- if (pipe->readers || pipe->writers) {
79431+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
79432 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
79433 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79434 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
79435@@ -619,7 +619,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
79436 kfree(pipe);
79437 }
79438
79439-static struct vfsmount *pipe_mnt __read_mostly;
79440+struct vfsmount *pipe_mnt __read_mostly;
79441
79442 /*
79443 * pipefs_dname() is called from d_path().
79444@@ -649,8 +649,9 @@ static struct inode * get_pipe_inode(void)
79445 goto fail_iput;
79446
79447 inode->i_pipe = pipe;
79448- pipe->files = 2;
79449- pipe->readers = pipe->writers = 1;
79450+ atomic_set(&pipe->files, 2);
79451+ atomic_set(&pipe->readers, 1);
79452+ atomic_set(&pipe->writers, 1);
79453 inode->i_fop = &pipefifo_fops;
79454
79455 /*
79456@@ -829,17 +830,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
79457 spin_lock(&inode->i_lock);
79458 if (inode->i_pipe) {
79459 pipe = inode->i_pipe;
79460- pipe->files++;
79461+ atomic_inc(&pipe->files);
79462 spin_unlock(&inode->i_lock);
79463 } else {
79464 spin_unlock(&inode->i_lock);
79465 pipe = alloc_pipe_info();
79466 if (!pipe)
79467 return -ENOMEM;
79468- pipe->files = 1;
79469+ atomic_set(&pipe->files, 1);
79470 spin_lock(&inode->i_lock);
79471 if (unlikely(inode->i_pipe)) {
79472- inode->i_pipe->files++;
79473+ atomic_inc(&inode->i_pipe->files);
79474 spin_unlock(&inode->i_lock);
79475 free_pipe_info(pipe);
79476 pipe = inode->i_pipe;
79477@@ -864,10 +865,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
79478 * opened, even when there is no process writing the FIFO.
79479 */
79480 pipe->r_counter++;
79481- if (pipe->readers++ == 0)
79482+ if (atomic_inc_return(&pipe->readers) == 1)
79483 wake_up_partner(pipe);
79484
79485- if (!is_pipe && !pipe->writers) {
79486+ if (!is_pipe && !atomic_read(&pipe->writers)) {
79487 if ((filp->f_flags & O_NONBLOCK)) {
79488 /* suppress POLLHUP until we have
79489 * seen a writer */
79490@@ -886,14 +887,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
79491 * errno=ENXIO when there is no process reading the FIFO.
79492 */
79493 ret = -ENXIO;
79494- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
79495+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
79496 goto err;
79497
79498 pipe->w_counter++;
79499- if (!pipe->writers++)
79500+ if (atomic_inc_return(&pipe->writers) == 1)
79501 wake_up_partner(pipe);
79502
79503- if (!is_pipe && !pipe->readers) {
79504+ if (!is_pipe && !atomic_read(&pipe->readers)) {
79505 if (wait_for_partner(pipe, &pipe->r_counter))
79506 goto err_wr;
79507 }
79508@@ -907,11 +908,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
79509 * the process can at least talk to itself.
79510 */
79511
79512- pipe->readers++;
79513- pipe->writers++;
79514+ atomic_inc(&pipe->readers);
79515+ atomic_inc(&pipe->writers);
79516 pipe->r_counter++;
79517 pipe->w_counter++;
79518- if (pipe->readers == 1 || pipe->writers == 1)
79519+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
79520 wake_up_partner(pipe);
79521 break;
79522
79523@@ -925,13 +926,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
79524 return 0;
79525
79526 err_rd:
79527- if (!--pipe->readers)
79528+ if (atomic_dec_and_test(&pipe->readers))
79529 wake_up_interruptible(&pipe->wait);
79530 ret = -ERESTARTSYS;
79531 goto err;
79532
79533 err_wr:
79534- if (!--pipe->writers)
79535+ if (atomic_dec_and_test(&pipe->writers))
79536 wake_up_interruptible(&pipe->wait);
79537 ret = -ERESTARTSYS;
79538 goto err;
79539@@ -1007,7 +1008,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
79540 * Currently we rely on the pipe array holding a power-of-2 number
79541 * of pages.
79542 */
79543-static inline unsigned int round_pipe_size(unsigned int size)
79544+static inline unsigned long round_pipe_size(unsigned long size)
79545 {
79546 unsigned long nr_pages;
79547
79548@@ -1055,13 +1056,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
79549
79550 switch (cmd) {
79551 case F_SETPIPE_SZ: {
79552- unsigned int size, nr_pages;
79553+ unsigned long size, nr_pages;
79554+
79555+ ret = -EINVAL;
79556+ if (arg < pipe_min_size)
79557+ goto out;
79558
79559 size = round_pipe_size(arg);
79560 nr_pages = size >> PAGE_SHIFT;
79561
79562- ret = -EINVAL;
79563- if (!nr_pages)
79564+ if (size < pipe_min_size)
79565 goto out;
79566
79567 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
79568diff --git a/fs/posix_acl.c b/fs/posix_acl.c
79569index 84bb65b8..4270e47 100644
79570--- a/fs/posix_acl.c
79571+++ b/fs/posix_acl.c
79572@@ -20,6 +20,7 @@
79573 #include <linux/xattr.h>
79574 #include <linux/export.h>
79575 #include <linux/user_namespace.h>
79576+#include <linux/grsecurity.h>
79577
79578 struct posix_acl **acl_by_type(struct inode *inode, int type)
79579 {
79580@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
79581 }
79582 }
79583 if (mode_p)
79584- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79585+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79586 return not_equiv;
79587 }
79588 EXPORT_SYMBOL(posix_acl_equiv_mode);
79589@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
79590 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
79591 }
79592
79593- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79594+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79595 return not_equiv;
79596 }
79597
79598@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
79599 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
79600 int err = -ENOMEM;
79601 if (clone) {
79602+ *mode_p &= ~gr_acl_umask();
79603+
79604 err = posix_acl_create_masq(clone, mode_p);
79605 if (err < 0) {
79606 posix_acl_release(clone);
79607@@ -663,11 +666,12 @@ struct posix_acl *
79608 posix_acl_from_xattr(struct user_namespace *user_ns,
79609 const void *value, size_t size)
79610 {
79611- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
79612- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
79613+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
79614+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
79615 int count;
79616 struct posix_acl *acl;
79617 struct posix_acl_entry *acl_e;
79618+ umode_t umask = gr_acl_umask();
79619
79620 if (!value)
79621 return NULL;
79622@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79623
79624 switch(acl_e->e_tag) {
79625 case ACL_USER_OBJ:
79626+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79627+ break;
79628 case ACL_GROUP_OBJ:
79629 case ACL_MASK:
79630+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79631+ break;
79632 case ACL_OTHER:
79633+ acl_e->e_perm &= ~(umask & S_IRWXO);
79634 break;
79635
79636 case ACL_USER:
79637+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79638 acl_e->e_uid =
79639 make_kuid(user_ns,
79640 le32_to_cpu(entry->e_id));
79641@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79642 goto fail;
79643 break;
79644 case ACL_GROUP:
79645+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79646 acl_e->e_gid =
79647 make_kgid(user_ns,
79648 le32_to_cpu(entry->e_id));
79649diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
79650index 2183fcf..3c32a98 100644
79651--- a/fs/proc/Kconfig
79652+++ b/fs/proc/Kconfig
79653@@ -30,7 +30,7 @@ config PROC_FS
79654
79655 config PROC_KCORE
79656 bool "/proc/kcore support" if !ARM
79657- depends on PROC_FS && MMU
79658+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
79659 help
79660 Provides a virtual ELF core file of the live kernel. This can
79661 be read with gdb and other ELF tools. No modifications can be
79662@@ -38,8 +38,8 @@ config PROC_KCORE
79663
79664 config PROC_VMCORE
79665 bool "/proc/vmcore support"
79666- depends on PROC_FS && CRASH_DUMP
79667- default y
79668+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
79669+ default n
79670 help
79671 Exports the dump image of crashed kernel in ELF format.
79672
79673@@ -63,8 +63,8 @@ config PROC_SYSCTL
79674 limited in memory.
79675
79676 config PROC_PAGE_MONITOR
79677- default y
79678- depends on PROC_FS && MMU
79679+ default n
79680+ depends on PROC_FS && MMU && !GRKERNSEC
79681 bool "Enable /proc page monitoring" if EXPERT
79682 help
79683 Various /proc files exist to monitor process memory utilization:
79684diff --git a/fs/proc/array.c b/fs/proc/array.c
79685index fd02a9e..7bc9dff 100644
79686--- a/fs/proc/array.c
79687+++ b/fs/proc/array.c
79688@@ -60,6 +60,7 @@
79689 #include <linux/tty.h>
79690 #include <linux/string.h>
79691 #include <linux/mman.h>
79692+#include <linux/grsecurity.h>
79693 #include <linux/proc_fs.h>
79694 #include <linux/ioport.h>
79695 #include <linux/uaccess.h>
79696@@ -340,6 +341,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
79697 cpumask_pr_args(&task->cpus_allowed));
79698 }
79699
79700+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79701+static inline void task_pax(struct seq_file *m, struct task_struct *p)
79702+{
79703+ if (p->mm)
79704+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
79705+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
79706+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
79707+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
79708+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
79709+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
79710+ else
79711+ seq_printf(m, "PaX:\t-----\n");
79712+}
79713+#endif
79714+
79715 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79716 struct pid *pid, struct task_struct *task)
79717 {
79718@@ -358,9 +374,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79719 task_cpus_allowed(m, task);
79720 cpuset_task_status_allowed(m, task);
79721 task_context_switch_counts(m, task);
79722+
79723+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79724+ task_pax(m, task);
79725+#endif
79726+
79727+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
79728+ task_grsec_rbac(m, task);
79729+#endif
79730+
79731 return 0;
79732 }
79733
79734+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79735+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
79736+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
79737+ _mm->pax_flags & MF_PAX_SEGMEXEC))
79738+#endif
79739+
79740 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79741 struct pid *pid, struct task_struct *task, int whole)
79742 {
79743@@ -382,6 +413,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79744 char tcomm[sizeof(task->comm)];
79745 unsigned long flags;
79746
79747+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79748+ if (current->exec_id != m->exec_id) {
79749+ gr_log_badprocpid("stat");
79750+ return 0;
79751+ }
79752+#endif
79753+
79754 state = *get_task_state(task);
79755 vsize = eip = esp = 0;
79756 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
79757@@ -452,6 +490,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79758 gtime = task_gtime(task);
79759 }
79760
79761+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79762+ if (PAX_RAND_FLAGS(mm)) {
79763+ eip = 0;
79764+ esp = 0;
79765+ wchan = 0;
79766+ }
79767+#endif
79768+#ifdef CONFIG_GRKERNSEC_HIDESYM
79769+ wchan = 0;
79770+ eip =0;
79771+ esp =0;
79772+#endif
79773+
79774 /* scale priority and nice values from timeslices to -20..20 */
79775 /* to make it look like a "normal" Unix priority/nice value */
79776 priority = task_prio(task);
79777@@ -483,9 +534,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79778 seq_put_decimal_ull(m, ' ', vsize);
79779 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
79780 seq_put_decimal_ull(m, ' ', rsslim);
79781+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79782+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
79783+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
79784+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
79785+#else
79786 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
79787 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
79788 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
79789+#endif
79790 seq_put_decimal_ull(m, ' ', esp);
79791 seq_put_decimal_ull(m, ' ', eip);
79792 /* The signal information here is obsolete.
79793@@ -507,7 +564,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79794 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
79795 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
79796
79797- if (mm && permitted) {
79798+ if (mm && permitted
79799+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79800+ && !PAX_RAND_FLAGS(mm)
79801+#endif
79802+ ) {
79803 seq_put_decimal_ull(m, ' ', mm->start_data);
79804 seq_put_decimal_ull(m, ' ', mm->end_data);
79805 seq_put_decimal_ull(m, ' ', mm->start_brk);
79806@@ -545,8 +606,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
79807 struct pid *pid, struct task_struct *task)
79808 {
79809 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
79810- struct mm_struct *mm = get_task_mm(task);
79811+ struct mm_struct *mm;
79812
79813+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79814+ if (current->exec_id != m->exec_id) {
79815+ gr_log_badprocpid("statm");
79816+ return 0;
79817+ }
79818+#endif
79819+ mm = get_task_mm(task);
79820 if (mm) {
79821 size = task_statm(mm, &shared, &text, &data, &resident);
79822 mmput(mm);
79823@@ -569,6 +637,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
79824 return 0;
79825 }
79826
79827+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
79828+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
79829+{
79830+ unsigned long flags;
79831+ u32 curr_ip = 0;
79832+
79833+ if (lock_task_sighand(task, &flags)) {
79834+ curr_ip = task->signal->curr_ip;
79835+ unlock_task_sighand(task, &flags);
79836+ }
79837+ return seq_printf(m, "%pI4\n", &curr_ip);
79838+}
79839+#endif
79840+
79841 #ifdef CONFIG_CHECKPOINT_RESTORE
79842 static struct pid *
79843 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
79844diff --git a/fs/proc/base.c b/fs/proc/base.c
79845index 093ca14..322f097 100644
79846--- a/fs/proc/base.c
79847+++ b/fs/proc/base.c
79848@@ -113,6 +113,14 @@ struct pid_entry {
79849 union proc_op op;
79850 };
79851
79852+struct getdents_callback {
79853+ struct linux_dirent __user * current_dir;
79854+ struct linux_dirent __user * previous;
79855+ struct file * file;
79856+ int count;
79857+ int error;
79858+};
79859+
79860 #define NOD(NAME, MODE, IOP, FOP, OP) { \
79861 .name = (NAME), \
79862 .len = sizeof(NAME) - 1, \
79863@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
79864 return 0;
79865 }
79866
79867+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79868+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
79869+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
79870+ _mm->pax_flags & MF_PAX_SEGMEXEC))
79871+#endif
79872+
79873 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
79874 struct pid *pid, struct task_struct *task)
79875 {
79876 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
79877 if (mm && !IS_ERR(mm)) {
79878 unsigned int nwords = 0;
79879+
79880+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79881+ /* allow if we're currently ptracing this task */
79882+ if (PAX_RAND_FLAGS(mm) &&
79883+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
79884+ mmput(mm);
79885+ return 0;
79886+ }
79887+#endif
79888+
79889 do {
79890 nwords += 2;
79891 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
79892@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
79893 }
79894
79895
79896-#ifdef CONFIG_KALLSYMS
79897+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
79898 /*
79899 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
79900 * Returns the resolved symbol. If that fails, simply return the address.
79901@@ -267,7 +291,7 @@ static void unlock_trace(struct task_struct *task)
79902 mutex_unlock(&task->signal->cred_guard_mutex);
79903 }
79904
79905-#ifdef CONFIG_STACKTRACE
79906+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
79907
79908 #define MAX_STACK_TRACE_DEPTH 64
79909
79910@@ -462,7 +486,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
79911 return 0;
79912 }
79913
79914-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
79915+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
79916 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
79917 struct pid *pid, struct task_struct *task)
79918 {
79919@@ -495,7 +519,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
79920 /************************************************************************/
79921
79922 /* permission checks */
79923-static int proc_fd_access_allowed(struct inode *inode)
79924+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
79925 {
79926 struct task_struct *task;
79927 int allowed = 0;
79928@@ -505,7 +529,10 @@ static int proc_fd_access_allowed(struct inode *inode)
79929 */
79930 task = get_proc_task(inode);
79931 if (task) {
79932- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
79933+ if (log)
79934+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
79935+ else
79936+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
79937 put_task_struct(task);
79938 }
79939 return allowed;
79940@@ -536,10 +563,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
79941 struct task_struct *task,
79942 int hide_pid_min)
79943 {
79944+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
79945+ return false;
79946+
79947+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79948+ rcu_read_lock();
79949+ {
79950+ const struct cred *tmpcred = current_cred();
79951+ const struct cred *cred = __task_cred(task);
79952+
79953+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
79954+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
79955+ || in_group_p(grsec_proc_gid)
79956+#endif
79957+ ) {
79958+ rcu_read_unlock();
79959+ return true;
79960+ }
79961+ }
79962+ rcu_read_unlock();
79963+
79964+ if (!pid->hide_pid)
79965+ return false;
79966+#endif
79967+
79968 if (pid->hide_pid < hide_pid_min)
79969 return true;
79970 if (in_group_p(pid->pid_gid))
79971 return true;
79972+
79973 return ptrace_may_access(task, PTRACE_MODE_READ);
79974 }
79975
79976@@ -557,7 +609,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
79977 put_task_struct(task);
79978
79979 if (!has_perms) {
79980+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79981+ {
79982+#else
79983 if (pid->hide_pid == 2) {
79984+#endif
79985 /*
79986 * Let's make getdents(), stat(), and open()
79987 * consistent with each other. If a process
79988@@ -618,6 +674,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
79989
79990 if (task) {
79991 mm = mm_access(task, mode);
79992+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
79993+ mmput(mm);
79994+ mm = ERR_PTR(-EPERM);
79995+ }
79996 put_task_struct(task);
79997
79998 if (!IS_ERR_OR_NULL(mm)) {
79999@@ -639,6 +699,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
80000 return PTR_ERR(mm);
80001
80002 file->private_data = mm;
80003+
80004+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80005+ file->f_version = current->exec_id;
80006+#endif
80007+
80008 return 0;
80009 }
80010
80011@@ -660,6 +725,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80012 ssize_t copied;
80013 char *page;
80014
80015+#ifdef CONFIG_GRKERNSEC
80016+ if (write)
80017+ return -EPERM;
80018+#endif
80019+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80020+ if (file->f_version != current->exec_id) {
80021+ gr_log_badprocpid("mem");
80022+ return 0;
80023+ }
80024+#endif
80025+
80026 if (!mm)
80027 return 0;
80028
80029@@ -672,7 +748,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80030 goto free;
80031
80032 while (count > 0) {
80033- int this_len = min_t(int, count, PAGE_SIZE);
80034+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
80035
80036 if (write && copy_from_user(page, buf, this_len)) {
80037 copied = -EFAULT;
80038@@ -764,6 +840,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80039 if (!mm)
80040 return 0;
80041
80042+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80043+ if (file->f_version != current->exec_id) {
80044+ gr_log_badprocpid("environ");
80045+ return 0;
80046+ }
80047+#endif
80048+
80049 page = (char *)__get_free_page(GFP_TEMPORARY);
80050 if (!page)
80051 return -ENOMEM;
80052@@ -773,7 +856,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80053 goto free;
80054 while (count > 0) {
80055 size_t this_len, max_len;
80056- int retval;
80057+ ssize_t retval;
80058
80059 if (src >= (mm->env_end - mm->env_start))
80060 break;
80061@@ -1387,7 +1470,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
80062 int error = -EACCES;
80063
80064 /* Are we allowed to snoop on the tasks file descriptors? */
80065- if (!proc_fd_access_allowed(inode))
80066+ if (!proc_fd_access_allowed(inode, 0))
80067 goto out;
80068
80069 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80070@@ -1431,8 +1514,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
80071 struct path path;
80072
80073 /* Are we allowed to snoop on the tasks file descriptors? */
80074- if (!proc_fd_access_allowed(inode))
80075- goto out;
80076+ /* logging this is needed for learning on chromium to work properly,
80077+ but we don't want to flood the logs from 'ps' which does a readlink
80078+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
80079+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
80080+ */
80081+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
80082+ if (!proc_fd_access_allowed(inode,0))
80083+ goto out;
80084+ } else {
80085+ if (!proc_fd_access_allowed(inode,1))
80086+ goto out;
80087+ }
80088
80089 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80090 if (error)
80091@@ -1482,7 +1575,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
80092 rcu_read_lock();
80093 cred = __task_cred(task);
80094 inode->i_uid = cred->euid;
80095+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80096+ inode->i_gid = grsec_proc_gid;
80097+#else
80098 inode->i_gid = cred->egid;
80099+#endif
80100 rcu_read_unlock();
80101 }
80102 security_task_to_inode(task, inode);
80103@@ -1518,10 +1615,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
80104 return -ENOENT;
80105 }
80106 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80107+#ifdef CONFIG_GRKERNSEC_PROC_USER
80108+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80109+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80110+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80111+#endif
80112 task_dumpable(task)) {
80113 cred = __task_cred(task);
80114 stat->uid = cred->euid;
80115+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80116+ stat->gid = grsec_proc_gid;
80117+#else
80118 stat->gid = cred->egid;
80119+#endif
80120 }
80121 }
80122 rcu_read_unlock();
80123@@ -1559,11 +1665,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
80124
80125 if (task) {
80126 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80127+#ifdef CONFIG_GRKERNSEC_PROC_USER
80128+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80129+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80130+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80131+#endif
80132 task_dumpable(task)) {
80133 rcu_read_lock();
80134 cred = __task_cred(task);
80135 inode->i_uid = cred->euid;
80136+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80137+ inode->i_gid = grsec_proc_gid;
80138+#else
80139 inode->i_gid = cred->egid;
80140+#endif
80141 rcu_read_unlock();
80142 } else {
80143 inode->i_uid = GLOBAL_ROOT_UID;
80144@@ -2095,6 +2210,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
80145 if (!task)
80146 goto out_no_task;
80147
80148+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80149+ goto out;
80150+
80151 /*
80152 * Yes, it does not scale. And it should not. Don't add
80153 * new entries into /proc/<tgid>/ without very good reasons.
80154@@ -2125,6 +2243,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
80155 if (!task)
80156 return -ENOENT;
80157
80158+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80159+ goto out;
80160+
80161 if (!dir_emit_dots(file, ctx))
80162 goto out;
80163
80164@@ -2569,7 +2690,7 @@ static const struct pid_entry tgid_base_stuff[] = {
80165 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
80166 #endif
80167 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80168-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80169+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80170 ONE("syscall", S_IRUSR, proc_pid_syscall),
80171 #endif
80172 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80173@@ -2594,10 +2715,10 @@ static const struct pid_entry tgid_base_stuff[] = {
80174 #ifdef CONFIG_SECURITY
80175 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80176 #endif
80177-#ifdef CONFIG_KALLSYMS
80178+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80179 ONE("wchan", S_IRUGO, proc_pid_wchan),
80180 #endif
80181-#ifdef CONFIG_STACKTRACE
80182+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80183 ONE("stack", S_IRUSR, proc_pid_stack),
80184 #endif
80185 #ifdef CONFIG_SCHEDSTATS
80186@@ -2631,6 +2752,9 @@ static const struct pid_entry tgid_base_stuff[] = {
80187 #ifdef CONFIG_HARDWALL
80188 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
80189 #endif
80190+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80191+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
80192+#endif
80193 #ifdef CONFIG_USER_NS
80194 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
80195 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
80196@@ -2763,7 +2887,14 @@ static int proc_pid_instantiate(struct inode *dir,
80197 if (!inode)
80198 goto out;
80199
80200+#ifdef CONFIG_GRKERNSEC_PROC_USER
80201+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
80202+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80203+ inode->i_gid = grsec_proc_gid;
80204+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
80205+#else
80206 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
80207+#endif
80208 inode->i_op = &proc_tgid_base_inode_operations;
80209 inode->i_fop = &proc_tgid_base_operations;
80210 inode->i_flags|=S_IMMUTABLE;
80211@@ -2801,7 +2932,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
80212 if (!task)
80213 goto out;
80214
80215+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80216+ goto out_put_task;
80217+
80218 result = proc_pid_instantiate(dir, dentry, task, NULL);
80219+out_put_task:
80220 put_task_struct(task);
80221 out:
80222 return ERR_PTR(result);
80223@@ -2915,7 +3050,7 @@ static const struct pid_entry tid_base_stuff[] = {
80224 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
80225 #endif
80226 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80227-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80228+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80229 ONE("syscall", S_IRUSR, proc_pid_syscall),
80230 #endif
80231 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80232@@ -2942,10 +3077,10 @@ static const struct pid_entry tid_base_stuff[] = {
80233 #ifdef CONFIG_SECURITY
80234 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80235 #endif
80236-#ifdef CONFIG_KALLSYMS
80237+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80238 ONE("wchan", S_IRUGO, proc_pid_wchan),
80239 #endif
80240-#ifdef CONFIG_STACKTRACE
80241+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80242 ONE("stack", S_IRUSR, proc_pid_stack),
80243 #endif
80244 #ifdef CONFIG_SCHEDSTATS
80245diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
80246index cbd82df..c0407d2 100644
80247--- a/fs/proc/cmdline.c
80248+++ b/fs/proc/cmdline.c
80249@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
80250
80251 static int __init proc_cmdline_init(void)
80252 {
80253+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80254+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
80255+#else
80256 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
80257+#endif
80258 return 0;
80259 }
80260 fs_initcall(proc_cmdline_init);
80261diff --git a/fs/proc/devices.c b/fs/proc/devices.c
80262index 50493ed..248166b 100644
80263--- a/fs/proc/devices.c
80264+++ b/fs/proc/devices.c
80265@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
80266
80267 static int __init proc_devices_init(void)
80268 {
80269+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80270+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
80271+#else
80272 proc_create("devices", 0, NULL, &proc_devinfo_operations);
80273+#endif
80274 return 0;
80275 }
80276 fs_initcall(proc_devices_init);
80277diff --git a/fs/proc/fd.c b/fs/proc/fd.c
80278index 6e5fcd0..06ea074 100644
80279--- a/fs/proc/fd.c
80280+++ b/fs/proc/fd.c
80281@@ -27,7 +27,8 @@ static int seq_show(struct seq_file *m, void *v)
80282 if (!task)
80283 return -ENOENT;
80284
80285- files = get_files_struct(task);
80286+ if (!gr_acl_handle_procpidmem(task))
80287+ files = get_files_struct(task);
80288 put_task_struct(task);
80289
80290 if (files) {
80291@@ -291,11 +292,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
80292 */
80293 int proc_fd_permission(struct inode *inode, int mask)
80294 {
80295+ struct task_struct *task;
80296 int rv = generic_permission(inode, mask);
80297- if (rv == 0)
80298- return 0;
80299+
80300 if (task_tgid(current) == proc_pid(inode))
80301 rv = 0;
80302+
80303+ task = get_proc_task(inode);
80304+ if (task == NULL)
80305+ return rv;
80306+
80307+ if (gr_acl_handle_procpidmem(task))
80308+ rv = -EACCES;
80309+
80310+ put_task_struct(task);
80311+
80312 return rv;
80313 }
80314
80315diff --git a/fs/proc/generic.c b/fs/proc/generic.c
80316index e5dee5c..dafe21b 100644
80317--- a/fs/proc/generic.c
80318+++ b/fs/proc/generic.c
80319@@ -22,6 +22,7 @@
80320 #include <linux/bitops.h>
80321 #include <linux/spinlock.h>
80322 #include <linux/completion.h>
80323+#include <linux/grsecurity.h>
80324 #include <asm/uaccess.h>
80325
80326 #include "internal.h"
80327@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
80328 return proc_lookup_de(PDE(dir), dir, dentry);
80329 }
80330
80331+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
80332+ unsigned int flags)
80333+{
80334+ if (gr_proc_is_restricted())
80335+ return ERR_PTR(-EACCES);
80336+
80337+ return proc_lookup_de(PDE(dir), dir, dentry);
80338+}
80339+
80340 /*
80341 * This returns non-zero if at EOF, so that the /proc
80342 * root directory can use this and check if it should
80343@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
80344 return proc_readdir_de(PDE(inode), file, ctx);
80345 }
80346
80347+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
80348+{
80349+ struct inode *inode = file_inode(file);
80350+
80351+ if (gr_proc_is_restricted())
80352+ return -EACCES;
80353+
80354+ return proc_readdir_de(PDE(inode), file, ctx);
80355+}
80356+
80357 /*
80358 * These are the generic /proc directory operations. They
80359 * use the in-memory "struct proc_dir_entry" tree to parse
80360@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
80361 .iterate = proc_readdir,
80362 };
80363
80364+static const struct file_operations proc_dir_restricted_operations = {
80365+ .llseek = generic_file_llseek,
80366+ .read = generic_read_dir,
80367+ .iterate = proc_readdir_restrict,
80368+};
80369+
80370 /*
80371 * proc directories can do almost nothing..
80372 */
80373@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
80374 .setattr = proc_notify_change,
80375 };
80376
80377+static const struct inode_operations proc_dir_restricted_inode_operations = {
80378+ .lookup = proc_lookup_restrict,
80379+ .getattr = proc_getattr,
80380+ .setattr = proc_notify_change,
80381+};
80382+
80383 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
80384 {
80385 int ret;
80386@@ -445,6 +477,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
80387 }
80388 EXPORT_SYMBOL_GPL(proc_mkdir_data);
80389
80390+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
80391+ struct proc_dir_entry *parent, void *data)
80392+{
80393+ struct proc_dir_entry *ent;
80394+
80395+ if (mode == 0)
80396+ mode = S_IRUGO | S_IXUGO;
80397+
80398+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
80399+ if (ent) {
80400+ ent->data = data;
80401+ ent->restricted = 1;
80402+ ent->proc_fops = &proc_dir_restricted_operations;
80403+ ent->proc_iops = &proc_dir_restricted_inode_operations;
80404+ parent->nlink++;
80405+ if (proc_register(parent, ent) < 0) {
80406+ kfree(ent);
80407+ parent->nlink--;
80408+ ent = NULL;
80409+ }
80410+ }
80411+ return ent;
80412+}
80413+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
80414+
80415 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
80416 struct proc_dir_entry *parent)
80417 {
80418@@ -459,6 +516,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
80419 }
80420 EXPORT_SYMBOL(proc_mkdir);
80421
80422+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
80423+ struct proc_dir_entry *parent)
80424+{
80425+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
80426+}
80427+EXPORT_SYMBOL(proc_mkdir_restrict);
80428+
80429 struct proc_dir_entry *proc_create_mount_point(const char *name)
80430 {
80431 umode_t mode = S_IFDIR | S_IRUGO | S_IXUGO;
80432diff --git a/fs/proc/inode.c b/fs/proc/inode.c
80433index e3eb552..bcb0f25 100644
80434--- a/fs/proc/inode.c
80435+++ b/fs/proc/inode.c
80436@@ -24,11 +24,17 @@
80437 #include <linux/mount.h>
80438 #include <linux/magic.h>
80439 #include <linux/namei.h>
80440+#include <linux/grsecurity.h>
80441
80442 #include <asm/uaccess.h>
80443
80444 #include "internal.h"
80445
80446+#ifdef CONFIG_PROC_SYSCTL
80447+extern const struct inode_operations proc_sys_inode_operations;
80448+extern const struct inode_operations proc_sys_dir_operations;
80449+#endif
80450+
80451 static void proc_evict_inode(struct inode *inode)
80452 {
80453 struct proc_dir_entry *de;
80454@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
80455 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
80456 sysctl_head_put(head);
80457 }
80458+
80459+#ifdef CONFIG_PROC_SYSCTL
80460+ if (inode->i_op == &proc_sys_inode_operations ||
80461+ inode->i_op == &proc_sys_dir_operations)
80462+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
80463+#endif
80464+
80465 }
80466
80467 static struct kmem_cache * proc_inode_cachep;
80468@@ -430,7 +443,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
80469 if (de->mode) {
80470 inode->i_mode = de->mode;
80471 inode->i_uid = de->uid;
80472+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80473+ inode->i_gid = grsec_proc_gid;
80474+#else
80475 inode->i_gid = de->gid;
80476+#endif
80477 }
80478 if (de->size)
80479 inode->i_size = de->size;
80480diff --git a/fs/proc/internal.h b/fs/proc/internal.h
80481index aa27810..9f2d3b2 100644
80482--- a/fs/proc/internal.h
80483+++ b/fs/proc/internal.h
80484@@ -47,9 +47,10 @@ struct proc_dir_entry {
80485 struct completion *pde_unload_completion;
80486 struct list_head pde_openers; /* who did ->open, but not ->release */
80487 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
80488+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
80489 u8 namelen;
80490 char name[];
80491-};
80492+} __randomize_layout;
80493
80494 union proc_op {
80495 int (*proc_get_link)(struct dentry *, struct path *);
80496@@ -67,7 +68,7 @@ struct proc_inode {
80497 struct ctl_table *sysctl_entry;
80498 const struct proc_ns_operations *ns_ops;
80499 struct inode vfs_inode;
80500-};
80501+} __randomize_layout;
80502
80503 /*
80504 * General functions
80505@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
80506 struct pid *, struct task_struct *);
80507 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
80508 struct pid *, struct task_struct *);
80509+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80510+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
80511+ struct pid *, struct task_struct *);
80512+#endif
80513
80514 /*
80515 * base.c
80516@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
80517 * generic.c
80518 */
80519 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
80520+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
80521 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
80522 struct dentry *);
80523 extern int proc_readdir(struct file *, struct dir_context *);
80524+extern int proc_readdir_restrict(struct file *, struct dir_context *);
80525 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
80526
80527 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
80528diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
80529index a352d57..cb94a5c 100644
80530--- a/fs/proc/interrupts.c
80531+++ b/fs/proc/interrupts.c
80532@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
80533
80534 static int __init proc_interrupts_init(void)
80535 {
80536+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80537+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
80538+#else
80539 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
80540+#endif
80541 return 0;
80542 }
80543 fs_initcall(proc_interrupts_init);
80544diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
80545index 91a4e64..14bf8fa 100644
80546--- a/fs/proc/kcore.c
80547+++ b/fs/proc/kcore.c
80548@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80549 * the addresses in the elf_phdr on our list.
80550 */
80551 start = kc_offset_to_vaddr(*fpos - elf_buflen);
80552- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
80553+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
80554+ if (tsz > buflen)
80555 tsz = buflen;
80556-
80557+
80558 while (buflen) {
80559 struct kcore_list *m;
80560
80561@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80562 } else {
80563 if (kern_addr_valid(start)) {
80564 unsigned long n;
80565+ char *elf_buf;
80566+ mm_segment_t oldfs;
80567
80568- n = copy_to_user(buffer, (char *)start, tsz);
80569- /*
80570- * We cannot distinguish between fault on source
80571- * and fault on destination. When this happens
80572- * we clear too and hope it will trigger the
80573- * EFAULT again.
80574- */
80575- if (n) {
80576- if (clear_user(buffer + tsz - n,
80577- n))
80578- return -EFAULT;
80579- }
80580+ elf_buf = kzalloc(tsz, GFP_KERNEL);
80581+ if (!elf_buf)
80582+ return -ENOMEM;
80583+ oldfs = get_fs();
80584+ set_fs(KERNEL_DS);
80585+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
80586+ set_fs(oldfs);
80587+ n = copy_to_user(buffer, elf_buf, tsz);
80588+ kfree(elf_buf);
80589+ if (n)
80590+ return -EFAULT;
80591 } else {
80592 if (clear_user(buffer, tsz))
80593 return -EFAULT;
80594@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80595
80596 static int open_kcore(struct inode *inode, struct file *filp)
80597 {
80598+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
80599+ return -EPERM;
80600+#endif
80601 if (!capable(CAP_SYS_RAWIO))
80602 return -EPERM;
80603 if (kcore_need_update)
80604@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
80605 return NOTIFY_OK;
80606 }
80607
80608-static struct notifier_block kcore_callback_nb __meminitdata = {
80609+static struct notifier_block kcore_callback_nb __meminitconst = {
80610 .notifier_call = kcore_callback,
80611 .priority = 0,
80612 };
80613diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
80614index d3ebf2e..6ad42d1 100644
80615--- a/fs/proc/meminfo.c
80616+++ b/fs/proc/meminfo.c
80617@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
80618 vmi.used >> 10,
80619 vmi.largest_chunk >> 10
80620 #ifdef CONFIG_MEMORY_FAILURE
80621- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80622+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80623 #endif
80624 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
80625 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
80626diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
80627index d4a3574..b421ce9 100644
80628--- a/fs/proc/nommu.c
80629+++ b/fs/proc/nommu.c
80630@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
80631
80632 if (file) {
80633 seq_pad(m, ' ');
80634- seq_path(m, &file->f_path, "");
80635+ seq_path(m, &file->f_path, "\n\\");
80636 }
80637
80638 seq_putc(m, '\n');
80639diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
80640index 350984a..0fb02a9 100644
80641--- a/fs/proc/proc_net.c
80642+++ b/fs/proc/proc_net.c
80643@@ -23,9 +23,27 @@
80644 #include <linux/nsproxy.h>
80645 #include <net/net_namespace.h>
80646 #include <linux/seq_file.h>
80647+#include <linux/grsecurity.h>
80648
80649 #include "internal.h"
80650
80651+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80652+static struct seq_operations *ipv6_seq_ops_addr;
80653+
80654+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
80655+{
80656+ ipv6_seq_ops_addr = addr;
80657+}
80658+
80659+void unregister_ipv6_seq_ops_addr(void)
80660+{
80661+ ipv6_seq_ops_addr = NULL;
80662+}
80663+
80664+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
80665+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
80666+#endif
80667+
80668 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
80669 {
80670 return pde->parent->data;
80671@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
80672 return maybe_get_net(PDE_NET(PDE(inode)));
80673 }
80674
80675+extern const struct seq_operations dev_seq_ops;
80676+
80677 int seq_open_net(struct inode *ino, struct file *f,
80678 const struct seq_operations *ops, int size)
80679 {
80680@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
80681
80682 BUG_ON(size < sizeof(*p));
80683
80684+ /* only permit access to /proc/net/dev */
80685+ if (
80686+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80687+ ops != ipv6_seq_ops_addr &&
80688+#endif
80689+ ops != &dev_seq_ops && gr_proc_is_restricted())
80690+ return -EACCES;
80691+
80692 net = get_proc_net(ino);
80693 if (net == NULL)
80694 return -ENXIO;
80695@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
80696 int err;
80697 struct net *net;
80698
80699+ if (gr_proc_is_restricted())
80700+ return -EACCES;
80701+
80702 err = -ENXIO;
80703 net = get_proc_net(inode);
80704 if (net == NULL)
80705diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
80706index fdda62e..cd7c75f 100644
80707--- a/fs/proc/proc_sysctl.c
80708+++ b/fs/proc/proc_sysctl.c
80709@@ -11,13 +11,21 @@
80710 #include <linux/namei.h>
80711 #include <linux/mm.h>
80712 #include <linux/module.h>
80713+#include <linux/nsproxy.h>
80714+#ifdef CONFIG_GRKERNSEC
80715+#include <net/net_namespace.h>
80716+#endif
80717 #include "internal.h"
80718
80719+extern int gr_handle_chroot_sysctl(const int op);
80720+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
80721+ const int op);
80722+
80723 static const struct dentry_operations proc_sys_dentry_operations;
80724 static const struct file_operations proc_sys_file_operations;
80725-static const struct inode_operations proc_sys_inode_operations;
80726+const struct inode_operations proc_sys_inode_operations;
80727 static const struct file_operations proc_sys_dir_file_operations;
80728-static const struct inode_operations proc_sys_dir_operations;
80729+const struct inode_operations proc_sys_dir_operations;
80730
80731 /* Support for permanently empty directories */
80732
80733@@ -32,13 +40,17 @@ static bool is_empty_dir(struct ctl_table_header *head)
80734
80735 static void set_empty_dir(struct ctl_dir *dir)
80736 {
80737- dir->header.ctl_table[0].child = sysctl_mount_point;
80738+ pax_open_kernel();
80739+ *(const void **)&dir->header.ctl_table[0].child = sysctl_mount_point;
80740+ pax_close_kernel();
80741 }
80742
80743 static void clear_empty_dir(struct ctl_dir *dir)
80744
80745 {
80746- dir->header.ctl_table[0].child = NULL;
80747+ pax_open_kernel();
80748+ *(void **)&dir->header.ctl_table[0].child = NULL;
80749+ pax_close_kernel();
80750 }
80751
80752 void proc_sys_poll_notify(struct ctl_table_poll *poll)
80753@@ -504,6 +516,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
80754
80755 err = NULL;
80756 d_set_d_op(dentry, &proc_sys_dentry_operations);
80757+
80758+ gr_handle_proc_create(dentry, inode);
80759+
80760 d_add(dentry, inode);
80761
80762 out:
80763@@ -519,6 +534,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80764 struct inode *inode = file_inode(filp);
80765 struct ctl_table_header *head = grab_header(inode);
80766 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
80767+ int op = write ? MAY_WRITE : MAY_READ;
80768 ssize_t error;
80769 size_t res;
80770
80771@@ -530,7 +546,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80772 * and won't be until we finish.
80773 */
80774 error = -EPERM;
80775- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
80776+ if (sysctl_perm(head, table, op))
80777 goto out;
80778
80779 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
80780@@ -538,6 +554,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80781 if (!table->proc_handler)
80782 goto out;
80783
80784+#ifdef CONFIG_GRKERNSEC
80785+ error = -EPERM;
80786+ if (gr_handle_chroot_sysctl(op))
80787+ goto out;
80788+ dget(filp->f_path.dentry);
80789+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
80790+ dput(filp->f_path.dentry);
80791+ goto out;
80792+ }
80793+ dput(filp->f_path.dentry);
80794+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
80795+ goto out;
80796+ if (write) {
80797+ if (current->nsproxy->net_ns != table->extra2) {
80798+ if (!capable(CAP_SYS_ADMIN))
80799+ goto out;
80800+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
80801+ goto out;
80802+ }
80803+#endif
80804+
80805 /* careful: calling conventions are nasty here */
80806 res = count;
80807 error = table->proc_handler(table, write, buf, &res, ppos);
80808@@ -635,6 +672,9 @@ static bool proc_sys_fill_cache(struct file *file,
80809 return false;
80810 } else {
80811 d_set_d_op(child, &proc_sys_dentry_operations);
80812+
80813+ gr_handle_proc_create(child, inode);
80814+
80815 d_add(child, inode);
80816 }
80817 } else {
80818@@ -678,6 +718,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
80819 if ((*pos)++ < ctx->pos)
80820 return true;
80821
80822+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
80823+ return 0;
80824+
80825 if (unlikely(S_ISLNK(table->mode)))
80826 res = proc_sys_link_fill_cache(file, ctx, head, table);
80827 else
80828@@ -771,6 +814,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
80829 if (IS_ERR(head))
80830 return PTR_ERR(head);
80831
80832+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
80833+ return -ENOENT;
80834+
80835 generic_fillattr(inode, stat);
80836 if (table)
80837 stat->mode = (stat->mode & S_IFMT) | table->mode;
80838@@ -793,13 +839,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
80839 .llseek = generic_file_llseek,
80840 };
80841
80842-static const struct inode_operations proc_sys_inode_operations = {
80843+const struct inode_operations proc_sys_inode_operations = {
80844 .permission = proc_sys_permission,
80845 .setattr = proc_sys_setattr,
80846 .getattr = proc_sys_getattr,
80847 };
80848
80849-static const struct inode_operations proc_sys_dir_operations = {
80850+const struct inode_operations proc_sys_dir_operations = {
80851 .lookup = proc_sys_lookup,
80852 .permission = proc_sys_permission,
80853 .setattr = proc_sys_setattr,
80854@@ -876,7 +922,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
80855 static struct ctl_dir *new_dir(struct ctl_table_set *set,
80856 const char *name, int namelen)
80857 {
80858- struct ctl_table *table;
80859+ ctl_table_no_const *table;
80860 struct ctl_dir *new;
80861 struct ctl_node *node;
80862 char *new_name;
80863@@ -888,7 +934,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
80864 return NULL;
80865
80866 node = (struct ctl_node *)(new + 1);
80867- table = (struct ctl_table *)(node + 1);
80868+ table = (ctl_table_no_const *)(node + 1);
80869 new_name = (char *)(table + 2);
80870 memcpy(new_name, name, namelen);
80871 new_name[namelen] = '\0';
80872@@ -1057,7 +1103,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
80873 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
80874 struct ctl_table_root *link_root)
80875 {
80876- struct ctl_table *link_table, *entry, *link;
80877+ ctl_table_no_const *link_table, *link;
80878+ struct ctl_table *entry;
80879 struct ctl_table_header *links;
80880 struct ctl_node *node;
80881 char *link_name;
80882@@ -1080,7 +1127,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
80883 return NULL;
80884
80885 node = (struct ctl_node *)(links + 1);
80886- link_table = (struct ctl_table *)(node + nr_entries);
80887+ link_table = (ctl_table_no_const *)(node + nr_entries);
80888 link_name = (char *)&link_table[nr_entries + 1];
80889
80890 for (link = link_table, entry = table; entry->procname; link++, entry++) {
80891@@ -1328,8 +1375,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
80892 struct ctl_table_header ***subheader, struct ctl_table_set *set,
80893 struct ctl_table *table)
80894 {
80895- struct ctl_table *ctl_table_arg = NULL;
80896- struct ctl_table *entry, *files;
80897+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
80898+ struct ctl_table *entry;
80899 int nr_files = 0;
80900 int nr_dirs = 0;
80901 int err = -ENOMEM;
80902@@ -1341,10 +1388,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
80903 nr_files++;
80904 }
80905
80906- files = table;
80907 /* If there are mixed files and directories we need a new table */
80908 if (nr_dirs && nr_files) {
80909- struct ctl_table *new;
80910+ ctl_table_no_const *new;
80911 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
80912 GFP_KERNEL);
80913 if (!files)
80914@@ -1362,7 +1408,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
80915 /* Register everything except a directory full of subdirectories */
80916 if (nr_files || !nr_dirs) {
80917 struct ctl_table_header *header;
80918- header = __register_sysctl_table(set, path, files);
80919+ header = __register_sysctl_table(set, path, files ? files : table);
80920 if (!header) {
80921 kfree(ctl_table_arg);
80922 goto out;
80923diff --git a/fs/proc/root.c b/fs/proc/root.c
80924index 68feb0f..2c04780 100644
80925--- a/fs/proc/root.c
80926+++ b/fs/proc/root.c
80927@@ -185,7 +185,15 @@ void __init proc_root_init(void)
80928 proc_create_mount_point("openprom");
80929 #endif
80930 proc_tty_init();
80931+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80932+#ifdef CONFIG_GRKERNSEC_PROC_USER
80933+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
80934+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80935+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
80936+#endif
80937+#else
80938 proc_mkdir("bus", NULL);
80939+#endif
80940 proc_sys_init();
80941 }
80942
80943diff --git a/fs/proc/stat.c b/fs/proc/stat.c
80944index 510413eb..34d9a8c 100644
80945--- a/fs/proc/stat.c
80946+++ b/fs/proc/stat.c
80947@@ -11,6 +11,7 @@
80948 #include <linux/irqnr.h>
80949 #include <linux/cputime.h>
80950 #include <linux/tick.h>
80951+#include <linux/grsecurity.h>
80952
80953 #ifndef arch_irq_stat_cpu
80954 #define arch_irq_stat_cpu(cpu) 0
80955@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
80956 u64 sum_softirq = 0;
80957 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
80958 struct timespec boottime;
80959+ int unrestricted = 1;
80960+
80961+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80962+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80963+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
80964+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80965+ && !in_group_p(grsec_proc_gid)
80966+#endif
80967+ )
80968+ unrestricted = 0;
80969+#endif
80970+#endif
80971
80972 user = nice = system = idle = iowait =
80973 irq = softirq = steal = 0;
80974@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
80975 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
80976 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
80977 idle += get_idle_time(i);
80978- iowait += get_iowait_time(i);
80979- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
80980- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
80981- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
80982- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
80983- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
80984- sum += kstat_cpu_irqs_sum(i);
80985- sum += arch_irq_stat_cpu(i);
80986+ if (unrestricted) {
80987+ iowait += get_iowait_time(i);
80988+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
80989+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
80990+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
80991+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
80992+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
80993+ sum += kstat_cpu_irqs_sum(i);
80994+ sum += arch_irq_stat_cpu(i);
80995+ for (j = 0; j < NR_SOFTIRQS; j++) {
80996+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
80997
80998- for (j = 0; j < NR_SOFTIRQS; j++) {
80999- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81000-
81001- per_softirq_sums[j] += softirq_stat;
81002- sum_softirq += softirq_stat;
81003+ per_softirq_sums[j] += softirq_stat;
81004+ sum_softirq += softirq_stat;
81005+ }
81006 }
81007 }
81008- sum += arch_irq_stat();
81009+ if (unrestricted)
81010+ sum += arch_irq_stat();
81011
81012 seq_puts(p, "cpu ");
81013 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81014@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
81015 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81016 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81017 idle = get_idle_time(i);
81018- iowait = get_iowait_time(i);
81019- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81020- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81021- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81022- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81023- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81024+ if (unrestricted) {
81025+ iowait = get_iowait_time(i);
81026+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81027+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81028+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81029+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81030+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81031+ }
81032 seq_printf(p, "cpu%d", i);
81033 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81034 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
81035@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
81036
81037 /* sum again ? it could be updated? */
81038 for_each_irq_nr(j)
81039- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
81040+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
81041
81042 seq_printf(p,
81043 "\nctxt %llu\n"
81044@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
81045 "processes %lu\n"
81046 "procs_running %lu\n"
81047 "procs_blocked %lu\n",
81048- nr_context_switches(),
81049+ unrestricted ? nr_context_switches() : 0ULL,
81050 (unsigned long)jif,
81051- total_forks,
81052- nr_running(),
81053- nr_iowait());
81054+ unrestricted ? total_forks : 0UL,
81055+ unrestricted ? nr_running() : 0UL,
81056+ unrestricted ? nr_iowait() : 0UL);
81057
81058 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
81059
81060diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
81061index 6dee68d..1b4add0 100644
81062--- a/fs/proc/task_mmu.c
81063+++ b/fs/proc/task_mmu.c
81064@@ -13,12 +13,19 @@
81065 #include <linux/swap.h>
81066 #include <linux/swapops.h>
81067 #include <linux/mmu_notifier.h>
81068+#include <linux/grsecurity.h>
81069
81070 #include <asm/elf.h>
81071 #include <asm/uaccess.h>
81072 #include <asm/tlbflush.h>
81073 #include "internal.h"
81074
81075+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81076+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
81077+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
81078+ _mm->pax_flags & MF_PAX_SEGMEXEC))
81079+#endif
81080+
81081 void task_mem(struct seq_file *m, struct mm_struct *mm)
81082 {
81083 unsigned long data, text, lib, swap, ptes, pmds;
81084@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81085 "VmLib:\t%8lu kB\n"
81086 "VmPTE:\t%8lu kB\n"
81087 "VmPMD:\t%8lu kB\n"
81088- "VmSwap:\t%8lu kB\n",
81089- hiwater_vm << (PAGE_SHIFT-10),
81090+ "VmSwap:\t%8lu kB\n"
81091+
81092+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81093+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
81094+#endif
81095+
81096+ ,hiwater_vm << (PAGE_SHIFT-10),
81097 total_vm << (PAGE_SHIFT-10),
81098 mm->locked_vm << (PAGE_SHIFT-10),
81099 mm->pinned_vm << (PAGE_SHIFT-10),
81100@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81101 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
81102 ptes >> 10,
81103 pmds >> 10,
81104- swap << (PAGE_SHIFT-10));
81105+ swap << (PAGE_SHIFT-10)
81106+
81107+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81108+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81109+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
81110+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
81111+#else
81112+ , mm->context.user_cs_base
81113+ , mm->context.user_cs_limit
81114+#endif
81115+#endif
81116+
81117+ );
81118 }
81119
81120 unsigned long task_vsize(struct mm_struct *mm)
81121@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81122 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
81123 }
81124
81125- /* We don't show the stack guard page in /proc/maps */
81126+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81127+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
81128+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
81129+#else
81130 start = vma->vm_start;
81131- if (stack_guard_page_start(vma, start))
81132- start += PAGE_SIZE;
81133 end = vma->vm_end;
81134- if (stack_guard_page_end(vma, end))
81135- end -= PAGE_SIZE;
81136+#endif
81137
81138 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
81139 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
81140@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81141 flags & VM_WRITE ? 'w' : '-',
81142 flags & VM_EXEC ? 'x' : '-',
81143 flags & VM_MAYSHARE ? 's' : 'p',
81144+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81145+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
81146+#else
81147 pgoff,
81148+#endif
81149 MAJOR(dev), MINOR(dev), ino);
81150
81151 /*
81152@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81153 */
81154 if (file) {
81155 seq_pad(m, ' ');
81156- seq_path(m, &file->f_path, "\n");
81157+ seq_path(m, &file->f_path, "\n\\");
81158 goto done;
81159 }
81160
81161@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81162 * Thread stack in /proc/PID/task/TID/maps or
81163 * the main process stack.
81164 */
81165- if (!is_pid || (vma->vm_start <= mm->start_stack &&
81166- vma->vm_end >= mm->start_stack)) {
81167+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
81168+ (vma->vm_start <= mm->start_stack &&
81169+ vma->vm_end >= mm->start_stack)) {
81170 name = "[stack]";
81171 } else {
81172 /* Thread stack in /proc/PID/maps */
81173@@ -362,6 +391,12 @@ done:
81174
81175 static int show_map(struct seq_file *m, void *v, int is_pid)
81176 {
81177+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81178+ if (current->exec_id != m->exec_id) {
81179+ gr_log_badprocpid("maps");
81180+ return 0;
81181+ }
81182+#endif
81183 show_map_vma(m, v, is_pid);
81184 m_cache_vma(m, v);
81185 return 0;
81186@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81187 .private = &mss,
81188 };
81189
81190+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81191+ if (current->exec_id != m->exec_id) {
81192+ gr_log_badprocpid("smaps");
81193+ return 0;
81194+ }
81195+#endif
81196 memset(&mss, 0, sizeof mss);
81197- /* mmap_sem is held in m_start */
81198- walk_page_vma(vma, &smaps_walk);
81199+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81200+ if (!PAX_RAND_FLAGS(vma->vm_mm))
81201+#endif
81202+ /* mmap_sem is held in m_start */
81203+ walk_page_vma(vma, &smaps_walk);
81204
81205 show_map_vma(m, vma, is_pid);
81206
81207@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81208 "KernelPageSize: %8lu kB\n"
81209 "MMUPageSize: %8lu kB\n"
81210 "Locked: %8lu kB\n",
81211+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81212+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
81213+#else
81214 (vma->vm_end - vma->vm_start) >> 10,
81215+#endif
81216 mss.resident >> 10,
81217 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
81218 mss.shared_clean >> 10,
81219@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81220 char buffer[64];
81221 int nid;
81222
81223+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81224+ if (current->exec_id != m->exec_id) {
81225+ gr_log_badprocpid("numa_maps");
81226+ return 0;
81227+ }
81228+#endif
81229+
81230 if (!mm)
81231 return 0;
81232
81233@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81234 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
81235 }
81236
81237+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81238+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
81239+#else
81240 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
81241+#endif
81242
81243 if (file) {
81244 seq_puts(m, " file=");
81245- seq_path(m, &file->f_path, "\n\t= ");
81246+ seq_path(m, &file->f_path, "\n\t\\= ");
81247 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
81248 seq_puts(m, " heap");
81249 } else {
81250diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
81251index 599ec2e..f1413ae 100644
81252--- a/fs/proc/task_nommu.c
81253+++ b/fs/proc/task_nommu.c
81254@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81255 else
81256 bytes += kobjsize(mm);
81257
81258- if (current->fs && current->fs->users > 1)
81259+ if (current->fs && atomic_read(&current->fs->users) > 1)
81260 sbytes += kobjsize(current->fs);
81261 else
81262 bytes += kobjsize(current->fs);
81263@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
81264
81265 if (file) {
81266 seq_pad(m, ' ');
81267- seq_path(m, &file->f_path, "");
81268+ seq_path(m, &file->f_path, "\n\\");
81269 } else if (mm) {
81270 pid_t tid = pid_of_stack(priv, vma, is_pid);
81271
81272diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
81273index 4e61388..1a2523d 100644
81274--- a/fs/proc/vmcore.c
81275+++ b/fs/proc/vmcore.c
81276@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
81277 nr_bytes = count;
81278
81279 /* If pfn is not ram, return zeros for sparse dump files */
81280- if (pfn_is_ram(pfn) == 0)
81281- memset(buf, 0, nr_bytes);
81282- else {
81283+ if (pfn_is_ram(pfn) == 0) {
81284+ if (userbuf) {
81285+ if (clear_user((char __force_user *)buf, nr_bytes))
81286+ return -EFAULT;
81287+ } else
81288+ memset(buf, 0, nr_bytes);
81289+ } else {
81290 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
81291 offset, userbuf);
81292 if (tmp < 0)
81293@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
81294 static int copy_to(void *target, void *src, size_t size, int userbuf)
81295 {
81296 if (userbuf) {
81297- if (copy_to_user((char __user *) target, src, size))
81298+ if (copy_to_user((char __force_user *) target, src, size))
81299 return -EFAULT;
81300 } else {
81301 memcpy(target, src, size);
81302@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81303 if (*fpos < m->offset + m->size) {
81304 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
81305 start = m->paddr + *fpos - m->offset;
81306- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
81307+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
81308 if (tmp < 0)
81309 return tmp;
81310 buflen -= tsz;
81311@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81312 static ssize_t read_vmcore(struct file *file, char __user *buffer,
81313 size_t buflen, loff_t *fpos)
81314 {
81315- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
81316+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
81317 }
81318
81319 /*
81320diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
81321index d3fb2b6..43a8140 100644
81322--- a/fs/qnx6/qnx6.h
81323+++ b/fs/qnx6/qnx6.h
81324@@ -74,7 +74,7 @@ enum {
81325 BYTESEX_BE,
81326 };
81327
81328-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81329+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81330 {
81331 if (sbi->s_bytesex == BYTESEX_LE)
81332 return le64_to_cpu((__force __le64)n);
81333@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
81334 return (__force __fs64)cpu_to_be64(n);
81335 }
81336
81337-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81338+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81339 {
81340 if (sbi->s_bytesex == BYTESEX_LE)
81341 return le32_to_cpu((__force __le32)n);
81342diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
81343index bb2869f..d34ada8 100644
81344--- a/fs/quota/netlink.c
81345+++ b/fs/quota/netlink.c
81346@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
81347 void quota_send_warning(struct kqid qid, dev_t dev,
81348 const char warntype)
81349 {
81350- static atomic_t seq;
81351+ static atomic_unchecked_t seq;
81352 struct sk_buff *skb;
81353 void *msg_head;
81354 int ret;
81355@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
81356 "VFS: Not enough memory to send quota warning.\n");
81357 return;
81358 }
81359- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
81360+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
81361 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
81362 if (!msg_head) {
81363 printk(KERN_ERR
81364diff --git a/fs/read_write.c b/fs/read_write.c
81365index 819ef3f..f07222d 100644
81366--- a/fs/read_write.c
81367+++ b/fs/read_write.c
81368@@ -505,7 +505,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
81369
81370 old_fs = get_fs();
81371 set_fs(get_ds());
81372- p = (__force const char __user *)buf;
81373+ p = (const char __force_user *)buf;
81374 if (count > MAX_RW_COUNT)
81375 count = MAX_RW_COUNT;
81376 ret = __vfs_write(file, p, count, pos);
81377diff --git a/fs/readdir.c b/fs/readdir.c
81378index ced6791..936687b 100644
81379--- a/fs/readdir.c
81380+++ b/fs/readdir.c
81381@@ -18,6 +18,7 @@
81382 #include <linux/security.h>
81383 #include <linux/syscalls.h>
81384 #include <linux/unistd.h>
81385+#include <linux/namei.h>
81386
81387 #include <asm/uaccess.h>
81388
81389@@ -71,6 +72,7 @@ struct old_linux_dirent {
81390 struct readdir_callback {
81391 struct dir_context ctx;
81392 struct old_linux_dirent __user * dirent;
81393+ struct file * file;
81394 int result;
81395 };
81396
81397@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
81398 buf->result = -EOVERFLOW;
81399 return -EOVERFLOW;
81400 }
81401+
81402+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81403+ return 0;
81404+
81405 buf->result++;
81406 dirent = buf->dirent;
81407 if (!access_ok(VERIFY_WRITE, dirent,
81408@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
81409 if (!f.file)
81410 return -EBADF;
81411
81412+ buf.file = f.file;
81413 error = iterate_dir(f.file, &buf.ctx);
81414 if (buf.result)
81415 error = buf.result;
81416@@ -145,6 +152,7 @@ struct getdents_callback {
81417 struct dir_context ctx;
81418 struct linux_dirent __user * current_dir;
81419 struct linux_dirent __user * previous;
81420+ struct file * file;
81421 int count;
81422 int error;
81423 };
81424@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
81425 buf->error = -EOVERFLOW;
81426 return -EOVERFLOW;
81427 }
81428+
81429+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81430+ return 0;
81431+
81432 dirent = buf->previous;
81433 if (dirent) {
81434 if (__put_user(offset, &dirent->d_off))
81435@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
81436 if (!f.file)
81437 return -EBADF;
81438
81439+ buf.file = f.file;
81440 error = iterate_dir(f.file, &buf.ctx);
81441 if (error >= 0)
81442 error = buf.error;
81443@@ -230,6 +243,7 @@ struct getdents_callback64 {
81444 struct dir_context ctx;
81445 struct linux_dirent64 __user * current_dir;
81446 struct linux_dirent64 __user * previous;
81447+ struct file *file;
81448 int count;
81449 int error;
81450 };
81451@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
81452 buf->error = -EINVAL; /* only used if we fail.. */
81453 if (reclen > buf->count)
81454 return -EINVAL;
81455+
81456+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81457+ return 0;
81458+
81459 dirent = buf->previous;
81460 if (dirent) {
81461 if (__put_user(offset, &dirent->d_off))
81462@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
81463 if (!f.file)
81464 return -EBADF;
81465
81466+ buf.file = f.file;
81467 error = iterate_dir(f.file, &buf.ctx);
81468 if (error >= 0)
81469 error = buf.error;
81470diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
81471index 9c02d96..6562c10 100644
81472--- a/fs/reiserfs/do_balan.c
81473+++ b/fs/reiserfs/do_balan.c
81474@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
81475 return;
81476 }
81477
81478- atomic_inc(&fs_generation(tb->tb_sb));
81479+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
81480 do_balance_starts(tb);
81481
81482 /*
81483diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
81484index aca73dd..e3c558d 100644
81485--- a/fs/reiserfs/item_ops.c
81486+++ b/fs/reiserfs/item_ops.c
81487@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
81488 }
81489
81490 static struct item_operations errcatch_ops = {
81491- errcatch_bytes_number,
81492- errcatch_decrement_key,
81493- errcatch_is_left_mergeable,
81494- errcatch_print_item,
81495- errcatch_check_item,
81496+ .bytes_number = errcatch_bytes_number,
81497+ .decrement_key = errcatch_decrement_key,
81498+ .is_left_mergeable = errcatch_is_left_mergeable,
81499+ .print_item = errcatch_print_item,
81500+ .check_item = errcatch_check_item,
81501
81502- errcatch_create_vi,
81503- errcatch_check_left,
81504- errcatch_check_right,
81505- errcatch_part_size,
81506- errcatch_unit_num,
81507- errcatch_print_vi
81508+ .create_vi = errcatch_create_vi,
81509+ .check_left = errcatch_check_left,
81510+ .check_right = errcatch_check_right,
81511+ .part_size = errcatch_part_size,
81512+ .unit_num = errcatch_unit_num,
81513+ .print_vi = errcatch_print_vi
81514 };
81515
81516 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
81517diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
81518index 621b9f3..af527fd 100644
81519--- a/fs/reiserfs/procfs.c
81520+++ b/fs/reiserfs/procfs.c
81521@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
81522 "SMALL_TAILS " : "NO_TAILS ",
81523 replay_only(sb) ? "REPLAY_ONLY " : "",
81524 convert_reiserfs(sb) ? "CONV " : "",
81525- atomic_read(&r->s_generation_counter),
81526+ atomic_read_unchecked(&r->s_generation_counter),
81527 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
81528 SF(s_do_balance), SF(s_unneeded_left_neighbor),
81529 SF(s_good_search_by_key_reada), SF(s_bmaps),
81530diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
81531index 2adcde1..7d27bc8 100644
81532--- a/fs/reiserfs/reiserfs.h
81533+++ b/fs/reiserfs/reiserfs.h
81534@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
81535 /* Comment? -Hans */
81536 wait_queue_head_t s_wait;
81537 /* increased by one every time the tree gets re-balanced */
81538- atomic_t s_generation_counter;
81539+ atomic_unchecked_t s_generation_counter;
81540
81541 /* File system properties. Currently holds on-disk FS format */
81542 unsigned long s_properties;
81543@@ -2300,7 +2300,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
81544 #define REISERFS_USER_MEM 1 /* user memory mode */
81545
81546 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
81547-#define get_generation(s) atomic_read (&fs_generation(s))
81548+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
81549 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
81550 #define __fs_changed(gen,s) (gen != get_generation (s))
81551 #define fs_changed(gen,s) \
81552diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
81553index 0111ad0..00f4749 100644
81554--- a/fs/reiserfs/super.c
81555+++ b/fs/reiserfs/super.c
81556@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
81557 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
81558 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
81559 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
81560+#ifdef CONFIG_REISERFS_FS_XATTR
81561+ /* turn on user xattrs by default */
81562+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
81563+#endif
81564 /* no preallocation minimum, be smart in reiserfs_file_write instead */
81565 sbi->s_alloc_options.preallocmin = 0;
81566 /* Preallocate by 16 blocks (17-1) at once */
81567diff --git a/fs/select.c b/fs/select.c
81568index f684c75..4117611 100644
81569--- a/fs/select.c
81570+++ b/fs/select.c
81571@@ -20,6 +20,7 @@
81572 #include <linux/export.h>
81573 #include <linux/slab.h>
81574 #include <linux/poll.h>
81575+#include <linux/security.h>
81576 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
81577 #include <linux/file.h>
81578 #include <linux/fdtable.h>
81579@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
81580 struct poll_list *walk = head;
81581 unsigned long todo = nfds;
81582
81583+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
81584 if (nfds > rlimit(RLIMIT_NOFILE))
81585 return -EINVAL;
81586
81587diff --git a/fs/seq_file.c b/fs/seq_file.c
81588index 555f821..02a990b 100644
81589--- a/fs/seq_file.c
81590+++ b/fs/seq_file.c
81591@@ -12,6 +12,8 @@
81592 #include <linux/slab.h>
81593 #include <linux/cred.h>
81594 #include <linux/mm.h>
81595+#include <linux/sched.h>
81596+#include <linux/grsecurity.h>
81597
81598 #include <asm/uaccess.h>
81599 #include <asm/page.h>
81600@@ -29,9 +31,9 @@ static void *seq_buf_alloc(unsigned long size)
81601 * __GFP_NORETRY to avoid oom-killings with high-order allocations -
81602 * it's better to fall back to vmalloc() than to kill things.
81603 */
81604- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
81605+ buf = kmalloc(size, GFP_KERNEL | GFP_USERCOPY | __GFP_NORETRY | __GFP_NOWARN);
81606 if (!buf && size > PAGE_SIZE)
81607- buf = vmalloc(size);
81608+ buf = vmalloc_usercopy(size);
81609 return buf;
81610 }
81611
81612@@ -65,6 +67,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
81613 #ifdef CONFIG_USER_NS
81614 p->user_ns = file->f_cred->user_ns;
81615 #endif
81616+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81617+ p->exec_id = current->exec_id;
81618+#endif
81619
81620 /*
81621 * Wrappers around seq_open(e.g. swaps_open) need to be
81622@@ -87,6 +92,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
81623 }
81624 EXPORT_SYMBOL(seq_open);
81625
81626+
81627+int seq_open_restrict(struct file *file, const struct seq_operations *op)
81628+{
81629+ if (gr_proc_is_restricted())
81630+ return -EACCES;
81631+
81632+ return seq_open(file, op);
81633+}
81634+EXPORT_SYMBOL(seq_open_restrict);
81635+
81636 static int traverse(struct seq_file *m, loff_t offset)
81637 {
81638 loff_t pos = 0, index;
81639@@ -158,7 +173,7 @@ Eoverflow:
81640 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
81641 {
81642 struct seq_file *m = file->private_data;
81643- size_t copied = 0;
81644+ ssize_t copied = 0;
81645 loff_t pos;
81646 size_t n;
81647 void *p;
81648@@ -557,7 +572,7 @@ static void single_stop(struct seq_file *p, void *v)
81649 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
81650 void *data)
81651 {
81652- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
81653+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
81654 int res = -ENOMEM;
81655
81656 if (op) {
81657@@ -593,6 +608,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
81658 }
81659 EXPORT_SYMBOL(single_open_size);
81660
81661+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
81662+ void *data)
81663+{
81664+ if (gr_proc_is_restricted())
81665+ return -EACCES;
81666+
81667+ return single_open(file, show, data);
81668+}
81669+EXPORT_SYMBOL(single_open_restrict);
81670+
81671+
81672 int single_release(struct inode *inode, struct file *file)
81673 {
81674 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
81675diff --git a/fs/splice.c b/fs/splice.c
81676index bfe62ae..a84920d 100644
81677--- a/fs/splice.c
81678+++ b/fs/splice.c
81679@@ -192,7 +192,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81680 pipe_lock(pipe);
81681
81682 for (;;) {
81683- if (!pipe->readers) {
81684+ if (!atomic_read(&pipe->readers)) {
81685 send_sig(SIGPIPE, current, 0);
81686 if (!ret)
81687 ret = -EPIPE;
81688@@ -215,7 +215,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81689 page_nr++;
81690 ret += buf->len;
81691
81692- if (pipe->files)
81693+ if (atomic_read(&pipe->files))
81694 do_wakeup = 1;
81695
81696 if (!--spd->nr_pages)
81697@@ -246,9 +246,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81698 do_wakeup = 0;
81699 }
81700
81701- pipe->waiting_writers++;
81702+ atomic_inc(&pipe->waiting_writers);
81703 pipe_wait(pipe);
81704- pipe->waiting_writers--;
81705+ atomic_dec(&pipe->waiting_writers);
81706 }
81707
81708 pipe_unlock(pipe);
81709@@ -578,7 +578,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
81710 old_fs = get_fs();
81711 set_fs(get_ds());
81712 /* The cast to a user pointer is valid due to the set_fs() */
81713- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
81714+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
81715 set_fs(old_fs);
81716
81717 return res;
81718@@ -593,7 +593,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
81719 old_fs = get_fs();
81720 set_fs(get_ds());
81721 /* The cast to a user pointer is valid due to the set_fs() */
81722- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
81723+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
81724 set_fs(old_fs);
81725
81726 return res;
81727@@ -646,7 +646,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
81728 goto err;
81729
81730 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
81731- vec[i].iov_base = (void __user *) page_address(page);
81732+ vec[i].iov_base = (void __force_user *) page_address(page);
81733 vec[i].iov_len = this_len;
81734 spd.pages[i] = page;
81735 spd.nr_pages++;
81736@@ -785,7 +785,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
81737 ops->release(pipe, buf);
81738 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
81739 pipe->nrbufs--;
81740- if (pipe->files)
81741+ if (atomic_read(&pipe->files))
81742 sd->need_wakeup = true;
81743 }
81744
81745@@ -809,10 +809,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
81746 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
81747 {
81748 while (!pipe->nrbufs) {
81749- if (!pipe->writers)
81750+ if (!atomic_read(&pipe->writers))
81751 return 0;
81752
81753- if (!pipe->waiting_writers && sd->num_spliced)
81754+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
81755 return 0;
81756
81757 if (sd->flags & SPLICE_F_NONBLOCK)
81758@@ -1027,7 +1027,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
81759 ops->release(pipe, buf);
81760 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
81761 pipe->nrbufs--;
81762- if (pipe->files)
81763+ if (atomic_read(&pipe->files))
81764 sd.need_wakeup = true;
81765 } else {
81766 buf->offset += ret;
81767@@ -1187,7 +1187,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
81768 * out of the pipe right after the splice_to_pipe(). So set
81769 * PIPE_READERS appropriately.
81770 */
81771- pipe->readers = 1;
81772+ atomic_set(&pipe->readers, 1);
81773
81774 current->splice_pipe = pipe;
81775 }
81776@@ -1494,6 +1494,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
81777
81778 partial[buffers].offset = off;
81779 partial[buffers].len = plen;
81780+ partial[buffers].private = 0;
81781
81782 off = 0;
81783 len -= plen;
81784@@ -1725,9 +1726,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81785 ret = -ERESTARTSYS;
81786 break;
81787 }
81788- if (!pipe->writers)
81789+ if (!atomic_read(&pipe->writers))
81790 break;
81791- if (!pipe->waiting_writers) {
81792+ if (!atomic_read(&pipe->waiting_writers)) {
81793 if (flags & SPLICE_F_NONBLOCK) {
81794 ret = -EAGAIN;
81795 break;
81796@@ -1759,7 +1760,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81797 pipe_lock(pipe);
81798
81799 while (pipe->nrbufs >= pipe->buffers) {
81800- if (!pipe->readers) {
81801+ if (!atomic_read(&pipe->readers)) {
81802 send_sig(SIGPIPE, current, 0);
81803 ret = -EPIPE;
81804 break;
81805@@ -1772,9 +1773,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81806 ret = -ERESTARTSYS;
81807 break;
81808 }
81809- pipe->waiting_writers++;
81810+ atomic_inc(&pipe->waiting_writers);
81811 pipe_wait(pipe);
81812- pipe->waiting_writers--;
81813+ atomic_dec(&pipe->waiting_writers);
81814 }
81815
81816 pipe_unlock(pipe);
81817@@ -1810,14 +1811,14 @@ retry:
81818 pipe_double_lock(ipipe, opipe);
81819
81820 do {
81821- if (!opipe->readers) {
81822+ if (!atomic_read(&opipe->readers)) {
81823 send_sig(SIGPIPE, current, 0);
81824 if (!ret)
81825 ret = -EPIPE;
81826 break;
81827 }
81828
81829- if (!ipipe->nrbufs && !ipipe->writers)
81830+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
81831 break;
81832
81833 /*
81834@@ -1914,7 +1915,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
81835 pipe_double_lock(ipipe, opipe);
81836
81837 do {
81838- if (!opipe->readers) {
81839+ if (!atomic_read(&opipe->readers)) {
81840 send_sig(SIGPIPE, current, 0);
81841 if (!ret)
81842 ret = -EPIPE;
81843@@ -1959,7 +1960,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
81844 * return EAGAIN if we have the potential of some data in the
81845 * future, otherwise just return 0
81846 */
81847- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
81848+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
81849 ret = -EAGAIN;
81850
81851 pipe_unlock(ipipe);
81852diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
81853index e5e0ddf..09598c4 100644
81854--- a/fs/squashfs/xattr.c
81855+++ b/fs/squashfs/xattr.c
81856@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81857 + msblk->xattr_table;
81858 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
81859 int count = squashfs_i(inode)->xattr_count;
81860- size_t rest = buffer_size;
81861- int err;
81862+ size_t used = 0;
81863+ ssize_t err;
81864
81865 /* check that the file system has xattrs */
81866 if (msblk->xattr_id_table == NULL)
81867@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81868 name_size = le16_to_cpu(entry.size);
81869 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
81870 if (handler)
81871- prefix_size = handler->list(d, buffer, rest, NULL,
81872+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
81873 name_size, handler->flags);
81874 if (prefix_size) {
81875 if (buffer) {
81876- if (prefix_size + name_size + 1 > rest) {
81877+ if (prefix_size + name_size + 1 > buffer_size - used) {
81878 err = -ERANGE;
81879 goto failed;
81880 }
81881@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81882 buffer[name_size] = '\0';
81883 buffer += name_size + 1;
81884 }
81885- rest -= prefix_size + name_size + 1;
81886+ used += prefix_size + name_size + 1;
81887 } else {
81888 /* no handler or insuffficient privileges, so skip */
81889 err = squashfs_read_metadata(sb, NULL, &start,
81890@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81891 if (err < 0)
81892 goto failed;
81893 }
81894- err = buffer_size - rest;
81895+ err = used;
81896
81897 failed:
81898 return err;
81899diff --git a/fs/stat.c b/fs/stat.c
81900index cccc1aa..7fe8951 100644
81901--- a/fs/stat.c
81902+++ b/fs/stat.c
81903@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
81904 stat->gid = inode->i_gid;
81905 stat->rdev = inode->i_rdev;
81906 stat->size = i_size_read(inode);
81907- stat->atime = inode->i_atime;
81908- stat->mtime = inode->i_mtime;
81909+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
81910+ stat->atime = inode->i_ctime;
81911+ stat->mtime = inode->i_ctime;
81912+ } else {
81913+ stat->atime = inode->i_atime;
81914+ stat->mtime = inode->i_mtime;
81915+ }
81916 stat->ctime = inode->i_ctime;
81917 stat->blksize = (1 << inode->i_blkbits);
81918 stat->blocks = inode->i_blocks;
81919@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
81920 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
81921 {
81922 struct inode *inode = d_backing_inode(path->dentry);
81923+ int retval;
81924
81925- if (inode->i_op->getattr)
81926- return inode->i_op->getattr(path->mnt, path->dentry, stat);
81927+ if (inode->i_op->getattr) {
81928+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
81929+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
81930+ stat->atime = stat->ctime;
81931+ stat->mtime = stat->ctime;
81932+ }
81933+ return retval;
81934+ }
81935
81936 generic_fillattr(inode, stat);
81937 return 0;
81938diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
81939index 94374e4..b5da3a1 100644
81940--- a/fs/sysfs/dir.c
81941+++ b/fs/sysfs/dir.c
81942@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
81943 kfree(buf);
81944 }
81945
81946+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
81947+extern int grsec_enable_sysfs_restrict;
81948+#endif
81949+
81950 /**
81951 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
81952 * @kobj: object we're creating directory for
81953@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
81954 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
81955 {
81956 struct kernfs_node *parent, *kn;
81957+ const char *name;
81958+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
81959+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
81960+ const char *parent_name;
81961+#endif
81962
81963 BUG_ON(!kobj);
81964
81965+ name = kobject_name(kobj);
81966+
81967 if (kobj->parent)
81968 parent = kobj->parent->sd;
81969 else
81970@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
81971 if (!parent)
81972 return -ENOENT;
81973
81974- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
81975- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
81976+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
81977+ parent_name = parent->name;
81978+ mode = S_IRWXU;
81979+
81980+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
81981+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
81982+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
81983+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
81984+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
81985+ if (!grsec_enable_sysfs_restrict)
81986+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
81987+#endif
81988+
81989+ kn = kernfs_create_dir_ns(parent, name,
81990+ mode, kobj, ns);
81991 if (IS_ERR(kn)) {
81992 if (PTR_ERR(kn) == -EEXIST)
81993- sysfs_warn_dup(parent, kobject_name(kobj));
81994+ sysfs_warn_dup(parent, name);
81995 return PTR_ERR(kn);
81996 }
81997
81998diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
81999index 69d4889..a810bd4 100644
82000--- a/fs/sysv/sysv.h
82001+++ b/fs/sysv/sysv.h
82002@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
82003 #endif
82004 }
82005
82006-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82007+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82008 {
82009 if (sbi->s_bytesex == BYTESEX_PDP)
82010 return PDP_swab((__force __u32)n);
82011diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
82012index a43df11..c368e71 100644
82013--- a/fs/tracefs/inode.c
82014+++ b/fs/tracefs/inode.c
82015@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
82016 static struct tracefs_dir_ops {
82017 int (*mkdir)(const char *name);
82018 int (*rmdir)(const char *name);
82019-} tracefs_ops;
82020+} __no_const tracefs_ops __read_only;
82021
82022 static char *get_dname(struct dentry *dentry)
82023 {
82024@@ -490,8 +490,10 @@ struct dentry *tracefs_create_instance_dir(const char *name, struct dentry *pare
82025 if (!dentry)
82026 return NULL;
82027
82028- tracefs_ops.mkdir = mkdir;
82029- tracefs_ops.rmdir = rmdir;
82030+ pax_open_kernel();
82031+ *(void **)&tracefs_ops.mkdir = mkdir;
82032+ *(void **)&tracefs_ops.rmdir = rmdir;
82033+ pax_close_kernel();
82034
82035 return dentry;
82036 }
82037diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
82038index 97be412..974b37f 100644
82039--- a/fs/ubifs/io.c
82040+++ b/fs/ubifs/io.c
82041@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
82042 return err;
82043 }
82044
82045-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82046+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82047 {
82048 int err;
82049
82050diff --git a/fs/udf/misc.c b/fs/udf/misc.c
82051index 71d1c25..084e2ad 100644
82052--- a/fs/udf/misc.c
82053+++ b/fs/udf/misc.c
82054@@ -288,7 +288,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
82055
82056 u8 udf_tag_checksum(const struct tag *t)
82057 {
82058- u8 *data = (u8 *)t;
82059+ const u8 *data = (const u8 *)t;
82060 u8 checksum = 0;
82061 int i;
82062 for (i = 0; i < sizeof(struct tag); ++i)
82063diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
82064index 8d974c4..b82f6ec 100644
82065--- a/fs/ufs/swab.h
82066+++ b/fs/ufs/swab.h
82067@@ -22,7 +22,7 @@ enum {
82068 BYTESEX_BE
82069 };
82070
82071-static inline u64
82072+static inline u64 __intentional_overflow(-1)
82073 fs64_to_cpu(struct super_block *sbp, __fs64 n)
82074 {
82075 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82076@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
82077 return (__force __fs64)cpu_to_be64(n);
82078 }
82079
82080-static inline u32
82081+static inline u32 __intentional_overflow(-1)
82082 fs32_to_cpu(struct super_block *sbp, __fs32 n)
82083 {
82084 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82085diff --git a/fs/utimes.c b/fs/utimes.c
82086index aa138d6..5f3a811 100644
82087--- a/fs/utimes.c
82088+++ b/fs/utimes.c
82089@@ -1,6 +1,7 @@
82090 #include <linux/compiler.h>
82091 #include <linux/file.h>
82092 #include <linux/fs.h>
82093+#include <linux/security.h>
82094 #include <linux/linkage.h>
82095 #include <linux/mount.h>
82096 #include <linux/namei.h>
82097@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
82098 }
82099 }
82100 retry_deleg:
82101+
82102+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
82103+ error = -EACCES;
82104+ goto mnt_drop_write_and_out;
82105+ }
82106+
82107 mutex_lock(&inode->i_mutex);
82108 error = notify_change(path->dentry, &newattrs, &delegated_inode);
82109 mutex_unlock(&inode->i_mutex);
82110diff --git a/fs/xattr.c b/fs/xattr.c
82111index 4ef6985..a6cd6567 100644
82112--- a/fs/xattr.c
82113+++ b/fs/xattr.c
82114@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
82115 return rc;
82116 }
82117
82118+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
82119+ssize_t
82120+pax_getxattr(struct dentry *dentry, void *value, size_t size)
82121+{
82122+ struct inode *inode = dentry->d_inode;
82123+ ssize_t error;
82124+
82125+ error = inode_permission(inode, MAY_EXEC);
82126+ if (error)
82127+ return error;
82128+
82129+ if (inode->i_op->getxattr)
82130+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
82131+ else
82132+ error = -EOPNOTSUPP;
82133+
82134+ return error;
82135+}
82136+EXPORT_SYMBOL(pax_getxattr);
82137+#endif
82138+
82139 ssize_t
82140 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
82141 {
82142@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
82143 * Extended attribute SET operations
82144 */
82145 static long
82146-setxattr(struct dentry *d, const char __user *name, const void __user *value,
82147+setxattr(struct path *path, const char __user *name, const void __user *value,
82148 size_t size, int flags)
82149 {
82150 int error;
82151@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
82152 posix_acl_fix_xattr_from_user(kvalue, size);
82153 }
82154
82155- error = vfs_setxattr(d, kname, kvalue, size, flags);
82156+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
82157+ error = -EACCES;
82158+ goto out;
82159+ }
82160+
82161+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
82162 out:
82163 if (vvalue)
82164 vfree(vvalue);
82165@@ -376,7 +402,7 @@ retry:
82166 return error;
82167 error = mnt_want_write(path.mnt);
82168 if (!error) {
82169- error = setxattr(path.dentry, name, value, size, flags);
82170+ error = setxattr(&path, name, value, size, flags);
82171 mnt_drop_write(path.mnt);
82172 }
82173 path_put(&path);
82174@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
82175 audit_file(f.file);
82176 error = mnt_want_write_file(f.file);
82177 if (!error) {
82178- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
82179+ error = setxattr(&f.file->f_path, name, value, size, flags);
82180 mnt_drop_write_file(f.file);
82181 }
82182 fdput(f);
82183@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
82184 * Extended attribute REMOVE operations
82185 */
82186 static long
82187-removexattr(struct dentry *d, const char __user *name)
82188+removexattr(struct path *path, const char __user *name)
82189 {
82190 int error;
82191 char kname[XATTR_NAME_MAX + 1];
82192@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
82193 if (error < 0)
82194 return error;
82195
82196- return vfs_removexattr(d, kname);
82197+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
82198+ return -EACCES;
82199+
82200+ return vfs_removexattr(path->dentry, kname);
82201 }
82202
82203 static int path_removexattr(const char __user *pathname,
82204@@ -623,7 +652,7 @@ retry:
82205 return error;
82206 error = mnt_want_write(path.mnt);
82207 if (!error) {
82208- error = removexattr(path.dentry, name);
82209+ error = removexattr(&path, name);
82210 mnt_drop_write(path.mnt);
82211 }
82212 path_put(&path);
82213@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
82214 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
82215 {
82216 struct fd f = fdget(fd);
82217+ struct path *path;
82218 int error = -EBADF;
82219
82220 if (!f.file)
82221 return error;
82222+ path = &f.file->f_path;
82223 audit_file(f.file);
82224 error = mnt_want_write_file(f.file);
82225 if (!error) {
82226- error = removexattr(f.file->f_path.dentry, name);
82227+ error = removexattr(path, name);
82228 mnt_drop_write_file(f.file);
82229 }
82230 fdput(f);
82231diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
82232index f1026e8..a0fbe4f 100644
82233--- a/fs/xfs/libxfs/xfs_bmap.c
82234+++ b/fs/xfs/libxfs/xfs_bmap.c
82235@@ -554,7 +554,7 @@ xfs_bmap_validate_ret(
82236
82237 #else
82238 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
82239-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
82240+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
82241 #endif /* DEBUG */
82242
82243 /*
82244diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
82245index 098cd78..724d3f8 100644
82246--- a/fs/xfs/xfs_dir2_readdir.c
82247+++ b/fs/xfs/xfs_dir2_readdir.c
82248@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
82249 ino = dp->d_ops->sf_get_ino(sfp, sfep);
82250 filetype = dp->d_ops->sf_get_ftype(sfep);
82251 ctx->pos = off & 0x7fffffff;
82252- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82253+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
82254+ char name[sfep->namelen];
82255+ memcpy(name, sfep->name, sfep->namelen);
82256+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
82257+ return 0;
82258+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82259 xfs_dir3_get_dtype(dp->i_mount, filetype)))
82260 return 0;
82261 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
82262diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
82263index 87f67c6..7e335bf 100644
82264--- a/fs/xfs/xfs_ioctl.c
82265+++ b/fs/xfs/xfs_ioctl.c
82266@@ -120,7 +120,7 @@ xfs_find_handle(
82267 }
82268
82269 error = -EFAULT;
82270- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
82271+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
82272 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
82273 goto out_put;
82274
82275diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
82276index 7c7842c..ce15222 100644
82277--- a/fs/xfs/xfs_linux.h
82278+++ b/fs/xfs/xfs_linux.h
82279@@ -225,7 +225,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
82280 * of the compiler which do not like us using do_div in the middle
82281 * of large functions.
82282 */
82283-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82284+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82285 {
82286 __u32 mod;
82287
82288@@ -281,7 +281,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
82289 return 0;
82290 }
82291 #else
82292-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82293+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82294 {
82295 __u32 mod;
82296
82297diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
82298new file mode 100644
82299index 0000000..31f8fe4
82300--- /dev/null
82301+++ b/grsecurity/Kconfig
82302@@ -0,0 +1,1182 @@
82303+#
82304+# grecurity configuration
82305+#
82306+menu "Memory Protections"
82307+depends on GRKERNSEC
82308+
82309+config GRKERNSEC_KMEM
82310+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
82311+ default y if GRKERNSEC_CONFIG_AUTO
82312+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
82313+ help
82314+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
82315+ be written to or read from to modify or leak the contents of the running
82316+ kernel. /dev/port will also not be allowed to be opened, writing to
82317+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
82318+ If you have module support disabled, enabling this will close up several
82319+ ways that are currently used to insert malicious code into the running
82320+ kernel.
82321+
82322+ Even with this feature enabled, we still highly recommend that
82323+ you use the RBAC system, as it is still possible for an attacker to
82324+ modify the running kernel through other more obscure methods.
82325+
82326+ It is highly recommended that you say Y here if you meet all the
82327+ conditions above.
82328+
82329+config GRKERNSEC_VM86
82330+ bool "Restrict VM86 mode"
82331+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82332+ depends on X86_32
82333+
82334+ help
82335+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
82336+ make use of a special execution mode on 32bit x86 processors called
82337+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
82338+ video cards and will still work with this option enabled. The purpose
82339+ of the option is to prevent exploitation of emulation errors in
82340+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
82341+ Nearly all users should be able to enable this option.
82342+
82343+config GRKERNSEC_IO
82344+ bool "Disable privileged I/O"
82345+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82346+ depends on X86
82347+ select RTC_CLASS
82348+ select RTC_INTF_DEV
82349+ select RTC_DRV_CMOS
82350+
82351+ help
82352+ If you say Y here, all ioperm and iopl calls will return an error.
82353+ Ioperm and iopl can be used to modify the running kernel.
82354+ Unfortunately, some programs need this access to operate properly,
82355+ the most notable of which are XFree86 and hwclock. hwclock can be
82356+ remedied by having RTC support in the kernel, so real-time
82357+ clock support is enabled if this option is enabled, to ensure
82358+ that hwclock operates correctly. If hwclock still does not work,
82359+ either update udev or symlink /dev/rtc to /dev/rtc0.
82360+
82361+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
82362+ you may not be able to boot into a graphical environment with this
82363+ option enabled. In this case, you should use the RBAC system instead.
82364+
82365+config GRKERNSEC_BPF_HARDEN
82366+ bool "Harden BPF interpreter"
82367+ default y if GRKERNSEC_CONFIG_AUTO
82368+ help
82369+ Unlike previous versions of grsecurity that hardened both the BPF
82370+ interpreted code against corruption at rest as well as the JIT code
82371+ against JIT-spray attacks and attacker-controlled immediate values
82372+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
82373+ and will ensure the interpreted code is read-only at rest. This feature
82374+ may be removed at a later time when eBPF stabilizes to entirely revert
82375+ back to the more secure pre-3.16 BPF interpreter/JIT.
82376+
82377+ If you're using KERNEXEC, it's recommended that you enable this option
82378+ to supplement the hardening of the kernel.
82379+
82380+config GRKERNSEC_PERF_HARDEN
82381+ bool "Disable unprivileged PERF_EVENTS usage by default"
82382+ default y if GRKERNSEC_CONFIG_AUTO
82383+ depends on PERF_EVENTS
82384+ help
82385+ If you say Y here, the range of acceptable values for the
82386+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
82387+ default to a new value: 3. When the sysctl is set to this value, no
82388+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
82389+
82390+ Though PERF_EVENTS can be used legitimately for performance monitoring
82391+ and low-level application profiling, it is forced on regardless of
82392+ configuration, has been at fault for several vulnerabilities, and
82393+ creates new opportunities for side channels and other information leaks.
82394+
82395+ This feature puts PERF_EVENTS into a secure default state and permits
82396+ the administrator to change out of it temporarily if unprivileged
82397+ application profiling is needed.
82398+
82399+config GRKERNSEC_RAND_THREADSTACK
82400+ bool "Insert random gaps between thread stacks"
82401+ default y if GRKERNSEC_CONFIG_AUTO
82402+ depends on PAX_RANDMMAP && !PPC
82403+ help
82404+ If you say Y here, a random-sized gap will be enforced between allocated
82405+ thread stacks. Glibc's NPTL and other threading libraries that
82406+ pass MAP_STACK to the kernel for thread stack allocation are supported.
82407+ The implementation currently provides 8 bits of entropy for the gap.
82408+
82409+ Many distributions do not compile threaded remote services with the
82410+ -fstack-check argument to GCC, causing the variable-sized stack-based
82411+ allocator, alloca(), to not probe the stack on allocation. This
82412+ permits an unbounded alloca() to skip over any guard page and potentially
82413+ modify another thread's stack reliably. An enforced random gap
82414+ reduces the reliability of such an attack and increases the chance
82415+ that such a read/write to another thread's stack instead lands in
82416+ an unmapped area, causing a crash and triggering grsecurity's
82417+ anti-bruteforcing logic.
82418+
82419+config GRKERNSEC_PROC_MEMMAP
82420+ bool "Harden ASLR against information leaks and entropy reduction"
82421+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
82422+ depends on PAX_NOEXEC || PAX_ASLR
82423+ help
82424+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
82425+ give no information about the addresses of its mappings if
82426+ PaX features that rely on random addresses are enabled on the task.
82427+ In addition to sanitizing this information and disabling other
82428+ dangerous sources of information, this option causes reads of sensitive
82429+ /proc/<pid> entries where the file descriptor was opened in a different
82430+ task than the one performing the read. Such attempts are logged.
82431+ This option also limits argv/env strings for suid/sgid binaries
82432+ to 512KB to prevent a complete exhaustion of the stack entropy provided
82433+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
82434+ binaries to prevent alternative mmap layouts from being abused.
82435+
82436+ If you use PaX it is essential that you say Y here as it closes up
82437+ several holes that make full ASLR useless locally.
82438+
82439+
82440+config GRKERNSEC_KSTACKOVERFLOW
82441+ bool "Prevent kernel stack overflows"
82442+ default y if GRKERNSEC_CONFIG_AUTO
82443+ depends on !IA64 && 64BIT
82444+ help
82445+ If you say Y here, the kernel's process stacks will be allocated
82446+ with vmalloc instead of the kernel's default allocator. This
82447+ introduces guard pages that in combination with the alloca checking
82448+ of the STACKLEAK feature prevents all forms of kernel process stack
82449+ overflow abuse. Note that this is different from kernel stack
82450+ buffer overflows.
82451+
82452+config GRKERNSEC_BRUTE
82453+ bool "Deter exploit bruteforcing"
82454+ default y if GRKERNSEC_CONFIG_AUTO
82455+ help
82456+ If you say Y here, attempts to bruteforce exploits against forking
82457+ daemons such as apache or sshd, as well as against suid/sgid binaries
82458+ will be deterred. When a child of a forking daemon is killed by PaX
82459+ or crashes due to an illegal instruction or other suspicious signal,
82460+ the parent process will be delayed 30 seconds upon every subsequent
82461+ fork until the administrator is able to assess the situation and
82462+ restart the daemon.
82463+ In the suid/sgid case, the attempt is logged, the user has all their
82464+ existing instances of the suid/sgid binary terminated and will
82465+ be unable to execute any suid/sgid binaries for 15 minutes.
82466+
82467+ It is recommended that you also enable signal logging in the auditing
82468+ section so that logs are generated when a process triggers a suspicious
82469+ signal.
82470+ If the sysctl option is enabled, a sysctl option with name
82471+ "deter_bruteforce" is created.
82472+
82473+config GRKERNSEC_MODHARDEN
82474+ bool "Harden module auto-loading"
82475+ default y if GRKERNSEC_CONFIG_AUTO
82476+ depends on MODULES
82477+ help
82478+ If you say Y here, module auto-loading in response to use of some
82479+ feature implemented by an unloaded module will be restricted to
82480+ root users. Enabling this option helps defend against attacks
82481+ by unprivileged users who abuse the auto-loading behavior to
82482+ cause a vulnerable module to load that is then exploited.
82483+
82484+ If this option prevents a legitimate use of auto-loading for a
82485+ non-root user, the administrator can execute modprobe manually
82486+ with the exact name of the module mentioned in the alert log.
82487+ Alternatively, the administrator can add the module to the list
82488+ of modules loaded at boot by modifying init scripts.
82489+
82490+ Modification of init scripts will most likely be needed on
82491+ Ubuntu servers with encrypted home directory support enabled,
82492+ as the first non-root user logging in will cause the ecb(aes),
82493+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
82494+
82495+config GRKERNSEC_HIDESYM
82496+ bool "Hide kernel symbols"
82497+ default y if GRKERNSEC_CONFIG_AUTO
82498+ select PAX_USERCOPY_SLABS
82499+ help
82500+ If you say Y here, getting information on loaded modules, and
82501+ displaying all kernel symbols through a syscall will be restricted
82502+ to users with CAP_SYS_MODULE. For software compatibility reasons,
82503+ /proc/kallsyms will be restricted to the root user. The RBAC
82504+ system can hide that entry even from root.
82505+
82506+ This option also prevents leaking of kernel addresses through
82507+ several /proc entries.
82508+
82509+ Note that this option is only effective provided the following
82510+ conditions are met:
82511+ 1) The kernel using grsecurity is not precompiled by some distribution
82512+ 2) You have also enabled GRKERNSEC_DMESG
82513+ 3) You are using the RBAC system and hiding other files such as your
82514+ kernel image and System.map. Alternatively, enabling this option
82515+ causes the permissions on /boot, /lib/modules, and the kernel
82516+ source directory to change at compile time to prevent
82517+ reading by non-root users.
82518+ If the above conditions are met, this option will aid in providing a
82519+ useful protection against local kernel exploitation of overflows
82520+ and arbitrary read/write vulnerabilities.
82521+
82522+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
82523+ in addition to this feature.
82524+
82525+config GRKERNSEC_RANDSTRUCT
82526+ bool "Randomize layout of sensitive kernel structures"
82527+ default y if GRKERNSEC_CONFIG_AUTO
82528+ select GRKERNSEC_HIDESYM
82529+ select MODVERSIONS if MODULES
82530+ help
82531+ If you say Y here, the layouts of a number of sensitive kernel
82532+ structures (task, fs, cred, etc) and all structures composed entirely
82533+ of function pointers (aka "ops" structs) will be randomized at compile-time.
82534+ This can introduce the requirement of an additional infoleak
82535+ vulnerability for exploits targeting these structure types.
82536+
82537+ Enabling this feature will introduce some performance impact, slightly
82538+ increase memory usage, and prevent the use of forensic tools like
82539+ Volatility against the system (unless the kernel source tree isn't
82540+ cleaned after kernel installation).
82541+
82542+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
82543+ It remains after a make clean to allow for external modules to be compiled
82544+ with the existing seed and will be removed by a make mrproper or
82545+ make distclean.
82546+
82547+ Note that the implementation requires gcc 4.6.4. or newer. You may need
82548+ to install the supporting headers explicitly in addition to the normal
82549+ gcc package.
82550+
82551+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
82552+ bool "Use cacheline-aware structure randomization"
82553+ depends on GRKERNSEC_RANDSTRUCT
82554+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
82555+ help
82556+ If you say Y here, the RANDSTRUCT randomization will make a best effort
82557+ at restricting randomization to cacheline-sized groups of elements. It
82558+ will further not randomize bitfields in structures. This reduces the
82559+ performance hit of RANDSTRUCT at the cost of weakened randomization.
82560+
82561+config GRKERNSEC_KERN_LOCKOUT
82562+ bool "Active kernel exploit response"
82563+ default y if GRKERNSEC_CONFIG_AUTO
82564+ depends on X86 || ARM || PPC || SPARC
82565+ help
82566+ If you say Y here, when a PaX alert is triggered due to suspicious
82567+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
82568+ or an OOPS occurs due to bad memory accesses, instead of just
82569+ terminating the offending process (and potentially allowing
82570+ a subsequent exploit from the same user), we will take one of two
82571+ actions:
82572+ If the user was root, we will panic the system
82573+ If the user was non-root, we will log the attempt, terminate
82574+ all processes owned by the user, then prevent them from creating
82575+ any new processes until the system is restarted
82576+ This deters repeated kernel exploitation/bruteforcing attempts
82577+ and is useful for later forensics.
82578+
82579+config GRKERNSEC_OLD_ARM_USERLAND
82580+ bool "Old ARM userland compatibility"
82581+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
82582+ help
82583+ If you say Y here, stubs of executable code to perform such operations
82584+ as "compare-exchange" will be placed at fixed locations in the ARM vector
82585+ table. This is unfortunately needed for old ARM userland meant to run
82586+ across a wide range of processors. Without this option enabled,
82587+ the get_tls and data memory barrier stubs will be emulated by the kernel,
82588+ which is enough for Linaro userlands or other userlands designed for v6
82589+ and newer ARM CPUs. It's recommended that you try without this option enabled
82590+ first, and only enable it if your userland does not boot (it will likely fail
82591+ at init time).
82592+
82593+endmenu
82594+menu "Role Based Access Control Options"
82595+depends on GRKERNSEC
82596+
82597+config GRKERNSEC_RBAC_DEBUG
82598+ bool
82599+
82600+config GRKERNSEC_NO_RBAC
82601+ bool "Disable RBAC system"
82602+ help
82603+ If you say Y here, the /dev/grsec device will be removed from the kernel,
82604+ preventing the RBAC system from being enabled. You should only say Y
82605+ here if you have no intention of using the RBAC system, so as to prevent
82606+ an attacker with root access from misusing the RBAC system to hide files
82607+ and processes when loadable module support and /dev/[k]mem have been
82608+ locked down.
82609+
82610+config GRKERNSEC_ACL_HIDEKERN
82611+ bool "Hide kernel processes"
82612+ help
82613+ If you say Y here, all kernel threads will be hidden to all
82614+ processes but those whose subject has the "view hidden processes"
82615+ flag.
82616+
82617+config GRKERNSEC_ACL_MAXTRIES
82618+ int "Maximum tries before password lockout"
82619+ default 3
82620+ help
82621+ This option enforces the maximum number of times a user can attempt
82622+ to authorize themselves with the grsecurity RBAC system before being
82623+ denied the ability to attempt authorization again for a specified time.
82624+ The lower the number, the harder it will be to brute-force a password.
82625+
82626+config GRKERNSEC_ACL_TIMEOUT
82627+ int "Time to wait after max password tries, in seconds"
82628+ default 30
82629+ help
82630+ This option specifies the time the user must wait after attempting to
82631+ authorize to the RBAC system with the maximum number of invalid
82632+ passwords. The higher the number, the harder it will be to brute-force
82633+ a password.
82634+
82635+endmenu
82636+menu "Filesystem Protections"
82637+depends on GRKERNSEC
82638+
82639+config GRKERNSEC_PROC
82640+ bool "Proc restrictions"
82641+ default y if GRKERNSEC_CONFIG_AUTO
82642+ help
82643+ If you say Y here, the permissions of the /proc filesystem
82644+ will be altered to enhance system security and privacy. You MUST
82645+ choose either a user only restriction or a user and group restriction.
82646+ Depending upon the option you choose, you can either restrict users to
82647+ see only the processes they themselves run, or choose a group that can
82648+ view all processes and files normally restricted to root if you choose
82649+ the "restrict to user only" option. NOTE: If you're running identd or
82650+ ntpd as a non-root user, you will have to run it as the group you
82651+ specify here.
82652+
82653+config GRKERNSEC_PROC_USER
82654+ bool "Restrict /proc to user only"
82655+ depends on GRKERNSEC_PROC
82656+ help
82657+ If you say Y here, non-root users will only be able to view their own
82658+ processes, and restricts them from viewing network-related information,
82659+ and viewing kernel symbol and module information.
82660+
82661+config GRKERNSEC_PROC_USERGROUP
82662+ bool "Allow special group"
82663+ default y if GRKERNSEC_CONFIG_AUTO
82664+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
82665+ help
82666+ If you say Y here, you will be able to select a group that will be
82667+ able to view all processes and network-related information. If you've
82668+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
82669+ remain hidden. This option is useful if you want to run identd as
82670+ a non-root user. The group you select may also be chosen at boot time
82671+ via "grsec_proc_gid=" on the kernel commandline.
82672+
82673+config GRKERNSEC_PROC_GID
82674+ int "GID for special group"
82675+ depends on GRKERNSEC_PROC_USERGROUP
82676+ default 1001
82677+
82678+config GRKERNSEC_PROC_ADD
82679+ bool "Additional restrictions"
82680+ default y if GRKERNSEC_CONFIG_AUTO
82681+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
82682+ help
82683+ If you say Y here, additional restrictions will be placed on
82684+ /proc that keep normal users from viewing device information and
82685+ slabinfo information that could be useful for exploits.
82686+
82687+config GRKERNSEC_LINK
82688+ bool "Linking restrictions"
82689+ default y if GRKERNSEC_CONFIG_AUTO
82690+ help
82691+ If you say Y here, /tmp race exploits will be prevented, since users
82692+ will no longer be able to follow symlinks owned by other users in
82693+ world-writable +t directories (e.g. /tmp), unless the owner of the
82694+ symlink is the owner of the directory. users will also not be
82695+ able to hardlink to files they do not own. If the sysctl option is
82696+ enabled, a sysctl option with name "linking_restrictions" is created.
82697+
82698+config GRKERNSEC_SYMLINKOWN
82699+ bool "Kernel-enforced SymlinksIfOwnerMatch"
82700+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
82701+ help
82702+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
82703+ that prevents it from being used as a security feature. As Apache
82704+ verifies the symlink by performing a stat() against the target of
82705+ the symlink before it is followed, an attacker can setup a symlink
82706+ to point to a same-owned file, then replace the symlink with one
82707+ that targets another user's file just after Apache "validates" the
82708+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
82709+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
82710+ will be in place for the group you specify. If the sysctl option
82711+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
82712+ created.
82713+
82714+config GRKERNSEC_SYMLINKOWN_GID
82715+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
82716+ depends on GRKERNSEC_SYMLINKOWN
82717+ default 1006
82718+ help
82719+ Setting this GID determines what group kernel-enforced
82720+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
82721+ is enabled, a sysctl option with name "symlinkown_gid" is created.
82722+
82723+config GRKERNSEC_FIFO
82724+ bool "FIFO restrictions"
82725+ default y if GRKERNSEC_CONFIG_AUTO
82726+ help
82727+ If you say Y here, users will not be able to write to FIFOs they don't
82728+ own in world-writable +t directories (e.g. /tmp), unless the owner of
82729+ the FIFO is the same owner of the directory it's held in. If the sysctl
82730+ option is enabled, a sysctl option with name "fifo_restrictions" is
82731+ created.
82732+
82733+config GRKERNSEC_SYSFS_RESTRICT
82734+ bool "Sysfs/debugfs restriction"
82735+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82736+ depends on SYSFS
82737+ help
82738+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
82739+ any filesystem normally mounted under it (e.g. debugfs) will be
82740+ mostly accessible only by root. These filesystems generally provide access
82741+ to hardware and debug information that isn't appropriate for unprivileged
82742+ users of the system. Sysfs and debugfs have also become a large source
82743+ of new vulnerabilities, ranging from infoleaks to local compromise.
82744+ There has been very little oversight with an eye toward security involved
82745+ in adding new exporters of information to these filesystems, so their
82746+ use is discouraged.
82747+ For reasons of compatibility, a few directories have been whitelisted
82748+ for access by non-root users:
82749+ /sys/fs/selinux
82750+ /sys/fs/fuse
82751+ /sys/devices/system/cpu
82752+
82753+config GRKERNSEC_ROFS
82754+ bool "Runtime read-only mount protection"
82755+ depends on SYSCTL
82756+ help
82757+ If you say Y here, a sysctl option with name "romount_protect" will
82758+ be created. By setting this option to 1 at runtime, filesystems
82759+ will be protected in the following ways:
82760+ * No new writable mounts will be allowed
82761+ * Existing read-only mounts won't be able to be remounted read/write
82762+ * Write operations will be denied on all block devices
82763+ This option acts independently of grsec_lock: once it is set to 1,
82764+ it cannot be turned off. Therefore, please be mindful of the resulting
82765+ behavior if this option is enabled in an init script on a read-only
82766+ filesystem.
82767+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
82768+ and GRKERNSEC_IO should be enabled and module loading disabled via
82769+ config or at runtime.
82770+ This feature is mainly intended for secure embedded systems.
82771+
82772+
82773+config GRKERNSEC_DEVICE_SIDECHANNEL
82774+ bool "Eliminate stat/notify-based device sidechannels"
82775+ default y if GRKERNSEC_CONFIG_AUTO
82776+ help
82777+ If you say Y here, timing analyses on block or character
82778+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
82779+ will be thwarted for unprivileged users. If a process without
82780+ CAP_MKNOD stats such a device, the last access and last modify times
82781+ will match the device's create time. No access or modify events
82782+ will be triggered through inotify/dnotify/fanotify for such devices.
82783+ This feature will prevent attacks that may at a minimum
82784+ allow an attacker to determine the administrator's password length.
82785+
82786+config GRKERNSEC_CHROOT
82787+ bool "Chroot jail restrictions"
82788+ default y if GRKERNSEC_CONFIG_AUTO
82789+ help
82790+ If you say Y here, you will be able to choose several options that will
82791+ make breaking out of a chrooted jail much more difficult. If you
82792+ encounter no software incompatibilities with the following options, it
82793+ is recommended that you enable each one.
82794+
82795+ Note that the chroot restrictions are not intended to apply to "chroots"
82796+ to directories that are simple bind mounts of the global root filesystem.
82797+ For several other reasons, a user shouldn't expect any significant
82798+ security by performing such a chroot.
82799+
82800+config GRKERNSEC_CHROOT_MOUNT
82801+ bool "Deny mounts"
82802+ default y if GRKERNSEC_CONFIG_AUTO
82803+ depends on GRKERNSEC_CHROOT
82804+ help
82805+ If you say Y here, processes inside a chroot will not be able to
82806+ mount or remount filesystems. If the sysctl option is enabled, a
82807+ sysctl option with name "chroot_deny_mount" is created.
82808+
82809+config GRKERNSEC_CHROOT_DOUBLE
82810+ bool "Deny double-chroots"
82811+ default y if GRKERNSEC_CONFIG_AUTO
82812+ depends on GRKERNSEC_CHROOT
82813+ help
82814+ If you say Y here, processes inside a chroot will not be able to chroot
82815+ again outside the chroot. This is a widely used method of breaking
82816+ out of a chroot jail and should not be allowed. If the sysctl
82817+ option is enabled, a sysctl option with name
82818+ "chroot_deny_chroot" is created.
82819+
82820+config GRKERNSEC_CHROOT_PIVOT
82821+ bool "Deny pivot_root in chroot"
82822+ default y if GRKERNSEC_CONFIG_AUTO
82823+ depends on GRKERNSEC_CHROOT
82824+ help
82825+ If you say Y here, processes inside a chroot will not be able to use
82826+ a function called pivot_root() that was introduced in Linux 2.3.41. It
82827+ works similar to chroot in that it changes the root filesystem. This
82828+ function could be misused in a chrooted process to attempt to break out
82829+ of the chroot, and therefore should not be allowed. If the sysctl
82830+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
82831+ created.
82832+
82833+config GRKERNSEC_CHROOT_CHDIR
82834+ bool "Enforce chdir(\"/\") on all chroots"
82835+ default y if GRKERNSEC_CONFIG_AUTO
82836+ depends on GRKERNSEC_CHROOT
82837+ help
82838+ If you say Y here, the current working directory of all newly-chrooted
82839+ applications will be set to the the root directory of the chroot.
82840+ The man page on chroot(2) states:
82841+ Note that this call does not change the current working
82842+ directory, so that `.' can be outside the tree rooted at
82843+ `/'. In particular, the super-user can escape from a
82844+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
82845+
82846+ It is recommended that you say Y here, since it's not known to break
82847+ any software. If the sysctl option is enabled, a sysctl option with
82848+ name "chroot_enforce_chdir" is created.
82849+
82850+config GRKERNSEC_CHROOT_CHMOD
82851+ bool "Deny (f)chmod +s"
82852+ default y if GRKERNSEC_CONFIG_AUTO
82853+ depends on GRKERNSEC_CHROOT
82854+ help
82855+ If you say Y here, processes inside a chroot will not be able to chmod
82856+ or fchmod files to make them have suid or sgid bits. This protects
82857+ against another published method of breaking a chroot. If the sysctl
82858+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
82859+ created.
82860+
82861+config GRKERNSEC_CHROOT_FCHDIR
82862+ bool "Deny fchdir and fhandle out of chroot"
82863+ default y if GRKERNSEC_CONFIG_AUTO
82864+ depends on GRKERNSEC_CHROOT
82865+ help
82866+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
82867+ to a file descriptor of the chrooting process that points to a directory
82868+ outside the filesystem will be stopped. Additionally, this option prevents
82869+ use of the recently-created syscall for opening files by a guessable "file
82870+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
82871+ with name "chroot_deny_fchdir" is created.
82872+
82873+config GRKERNSEC_CHROOT_MKNOD
82874+ bool "Deny mknod"
82875+ default y if GRKERNSEC_CONFIG_AUTO
82876+ depends on GRKERNSEC_CHROOT
82877+ help
82878+ If you say Y here, processes inside a chroot will not be allowed to
82879+ mknod. The problem with using mknod inside a chroot is that it
82880+ would allow an attacker to create a device entry that is the same
82881+ as one on the physical root of your system, which could range from
82882+ anything from the console device to a device for your harddrive (which
82883+ they could then use to wipe the drive or steal data). It is recommended
82884+ that you say Y here, unless you run into software incompatibilities.
82885+ If the sysctl option is enabled, a sysctl option with name
82886+ "chroot_deny_mknod" is created.
82887+
82888+config GRKERNSEC_CHROOT_SHMAT
82889+ bool "Deny shmat() out of chroot"
82890+ default y if GRKERNSEC_CONFIG_AUTO
82891+ depends on GRKERNSEC_CHROOT
82892+ help
82893+ If you say Y here, processes inside a chroot will not be able to attach
82894+ to shared memory segments that were created outside of the chroot jail.
82895+ It is recommended that you say Y here. If the sysctl option is enabled,
82896+ a sysctl option with name "chroot_deny_shmat" is created.
82897+
82898+config GRKERNSEC_CHROOT_UNIX
82899+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
82900+ default y if GRKERNSEC_CONFIG_AUTO
82901+ depends on GRKERNSEC_CHROOT
82902+ help
82903+ If you say Y here, processes inside a chroot will not be able to
82904+ connect to abstract (meaning not belonging to a filesystem) Unix
82905+ domain sockets that were bound outside of a chroot. It is recommended
82906+ that you say Y here. If the sysctl option is enabled, a sysctl option
82907+ with name "chroot_deny_unix" is created.
82908+
82909+config GRKERNSEC_CHROOT_FINDTASK
82910+ bool "Protect outside processes"
82911+ default y if GRKERNSEC_CONFIG_AUTO
82912+ depends on GRKERNSEC_CHROOT
82913+ help
82914+ If you say Y here, processes inside a chroot will not be able to
82915+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
82916+ getsid, or view any process outside of the chroot. If the sysctl
82917+ option is enabled, a sysctl option with name "chroot_findtask" is
82918+ created.
82919+
82920+config GRKERNSEC_CHROOT_NICE
82921+ bool "Restrict priority changes"
82922+ default y if GRKERNSEC_CONFIG_AUTO
82923+ depends on GRKERNSEC_CHROOT
82924+ help
82925+ If you say Y here, processes inside a chroot will not be able to raise
82926+ the priority of processes in the chroot, or alter the priority of
82927+ processes outside the chroot. This provides more security than simply
82928+ removing CAP_SYS_NICE from the process' capability set. If the
82929+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
82930+ is created.
82931+
82932+config GRKERNSEC_CHROOT_SYSCTL
82933+ bool "Deny sysctl writes"
82934+ default y if GRKERNSEC_CONFIG_AUTO
82935+ depends on GRKERNSEC_CHROOT
82936+ help
82937+ If you say Y here, an attacker in a chroot will not be able to
82938+ write to sysctl entries, either by sysctl(2) or through a /proc
82939+ interface. It is strongly recommended that you say Y here. If the
82940+ sysctl option is enabled, a sysctl option with name
82941+ "chroot_deny_sysctl" is created.
82942+
82943+config GRKERNSEC_CHROOT_RENAME
82944+ bool "Deny bad renames"
82945+ default y if GRKERNSEC_CONFIG_AUTO
82946+ depends on GRKERNSEC_CHROOT
82947+ help
82948+ If you say Y here, an attacker in a chroot will not be able to
82949+ abuse the ability to create double chroots to break out of the
82950+ chroot by exploiting a race condition between a rename of a directory
82951+ within a chroot against an open of a symlink with relative path
82952+ components. This feature will likewise prevent an accomplice outside
82953+ a chroot from enabling a user inside the chroot to break out and make
82954+ use of their credentials on the global filesystem. Enabling this
82955+ feature is essential to prevent root users from breaking out of a
82956+ chroot. If the sysctl option is enabled, a sysctl option with name
82957+ "chroot_deny_bad_rename" is created.
82958+
82959+config GRKERNSEC_CHROOT_CAPS
82960+ bool "Capability restrictions"
82961+ default y if GRKERNSEC_CONFIG_AUTO
82962+ depends on GRKERNSEC_CHROOT
82963+ help
82964+ If you say Y here, the capabilities on all processes within a
82965+ chroot jail will be lowered to stop module insertion, raw i/o,
82966+ system and net admin tasks, rebooting the system, modifying immutable
82967+ files, modifying IPC owned by another, and changing the system time.
82968+ This is left an option because it can break some apps. Disable this
82969+ if your chrooted apps are having problems performing those kinds of
82970+ tasks. If the sysctl option is enabled, a sysctl option with
82971+ name "chroot_caps" is created.
82972+
82973+config GRKERNSEC_CHROOT_INITRD
82974+ bool "Exempt initrd tasks from restrictions"
82975+ default y if GRKERNSEC_CONFIG_AUTO
82976+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
82977+ help
82978+ If you say Y here, tasks started prior to init will be exempted from
82979+ grsecurity's chroot restrictions. This option is mainly meant to
82980+ resolve Plymouth's performing privileged operations unnecessarily
82981+ in a chroot.
82982+
82983+endmenu
82984+menu "Kernel Auditing"
82985+depends on GRKERNSEC
82986+
82987+config GRKERNSEC_AUDIT_GROUP
82988+ bool "Single group for auditing"
82989+ help
82990+ If you say Y here, the exec and chdir logging features will only operate
82991+ on a group you specify. This option is recommended if you only want to
82992+ watch certain users instead of having a large amount of logs from the
82993+ entire system. If the sysctl option is enabled, a sysctl option with
82994+ name "audit_group" is created.
82995+
82996+config GRKERNSEC_AUDIT_GID
82997+ int "GID for auditing"
82998+ depends on GRKERNSEC_AUDIT_GROUP
82999+ default 1007
83000+
83001+config GRKERNSEC_EXECLOG
83002+ bool "Exec logging"
83003+ help
83004+ If you say Y here, all execve() calls will be logged (since the
83005+ other exec*() calls are frontends to execve(), all execution
83006+ will be logged). Useful for shell-servers that like to keep track
83007+ of their users. If the sysctl option is enabled, a sysctl option with
83008+ name "exec_logging" is created.
83009+ WARNING: This option when enabled will produce a LOT of logs, especially
83010+ on an active system.
83011+
83012+config GRKERNSEC_RESLOG
83013+ bool "Resource logging"
83014+ default y if GRKERNSEC_CONFIG_AUTO
83015+ help
83016+ If you say Y here, all attempts to overstep resource limits will
83017+ be logged with the resource name, the requested size, and the current
83018+ limit. It is highly recommended that you say Y here. If the sysctl
83019+ option is enabled, a sysctl option with name "resource_logging" is
83020+ created. If the RBAC system is enabled, the sysctl value is ignored.
83021+
83022+config GRKERNSEC_CHROOT_EXECLOG
83023+ bool "Log execs within chroot"
83024+ help
83025+ If you say Y here, all executions inside a chroot jail will be logged
83026+ to syslog. This can cause a large amount of logs if certain
83027+ applications (eg. djb's daemontools) are installed on the system, and
83028+ is therefore left as an option. If the sysctl option is enabled, a
83029+ sysctl option with name "chroot_execlog" is created.
83030+
83031+config GRKERNSEC_AUDIT_PTRACE
83032+ bool "Ptrace logging"
83033+ help
83034+ If you say Y here, all attempts to attach to a process via ptrace
83035+ will be logged. If the sysctl option is enabled, a sysctl option
83036+ with name "audit_ptrace" is created.
83037+
83038+config GRKERNSEC_AUDIT_CHDIR
83039+ bool "Chdir logging"
83040+ help
83041+ If you say Y here, all chdir() calls will be logged. If the sysctl
83042+ option is enabled, a sysctl option with name "audit_chdir" is created.
83043+
83044+config GRKERNSEC_AUDIT_MOUNT
83045+ bool "(Un)Mount logging"
83046+ help
83047+ If you say Y here, all mounts and unmounts will be logged. If the
83048+ sysctl option is enabled, a sysctl option with name "audit_mount" is
83049+ created.
83050+
83051+config GRKERNSEC_SIGNAL
83052+ bool "Signal logging"
83053+ default y if GRKERNSEC_CONFIG_AUTO
83054+ help
83055+ If you say Y here, certain important signals will be logged, such as
83056+ SIGSEGV, which will as a result inform you of when a error in a program
83057+ occurred, which in some cases could mean a possible exploit attempt.
83058+ If the sysctl option is enabled, a sysctl option with name
83059+ "signal_logging" is created.
83060+
83061+config GRKERNSEC_FORKFAIL
83062+ bool "Fork failure logging"
83063+ help
83064+ If you say Y here, all failed fork() attempts will be logged.
83065+ This could suggest a fork bomb, or someone attempting to overstep
83066+ their process limit. If the sysctl option is enabled, a sysctl option
83067+ with name "forkfail_logging" is created.
83068+
83069+config GRKERNSEC_TIME
83070+ bool "Time change logging"
83071+ default y if GRKERNSEC_CONFIG_AUTO
83072+ help
83073+ If you say Y here, any changes of the system clock will be logged.
83074+ If the sysctl option is enabled, a sysctl option with name
83075+ "timechange_logging" is created.
83076+
83077+config GRKERNSEC_PROC_IPADDR
83078+ bool "/proc/<pid>/ipaddr support"
83079+ default y if GRKERNSEC_CONFIG_AUTO
83080+ help
83081+ If you say Y here, a new entry will be added to each /proc/<pid>
83082+ directory that contains the IP address of the person using the task.
83083+ The IP is carried across local TCP and AF_UNIX stream sockets.
83084+ This information can be useful for IDS/IPSes to perform remote response
83085+ to a local attack. The entry is readable by only the owner of the
83086+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
83087+ the RBAC system), and thus does not create privacy concerns.
83088+
83089+config GRKERNSEC_RWXMAP_LOG
83090+ bool 'Denied RWX mmap/mprotect logging'
83091+ default y if GRKERNSEC_CONFIG_AUTO
83092+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
83093+ help
83094+ If you say Y here, calls to mmap() and mprotect() with explicit
83095+ usage of PROT_WRITE and PROT_EXEC together will be logged when
83096+ denied by the PAX_MPROTECT feature. This feature will also
83097+ log other problematic scenarios that can occur when PAX_MPROTECT
83098+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
83099+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
83100+ is created.
83101+
83102+endmenu
83103+
83104+menu "Executable Protections"
83105+depends on GRKERNSEC
83106+
83107+config GRKERNSEC_DMESG
83108+ bool "Dmesg(8) restriction"
83109+ default y if GRKERNSEC_CONFIG_AUTO
83110+ help
83111+ If you say Y here, non-root users will not be able to use dmesg(8)
83112+ to view the contents of the kernel's circular log buffer.
83113+ The kernel's log buffer often contains kernel addresses and other
83114+ identifying information useful to an attacker in fingerprinting a
83115+ system for a targeted exploit.
83116+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
83117+ created.
83118+
83119+config GRKERNSEC_HARDEN_PTRACE
83120+ bool "Deter ptrace-based process snooping"
83121+ default y if GRKERNSEC_CONFIG_AUTO
83122+ help
83123+ If you say Y here, TTY sniffers and other malicious monitoring
83124+ programs implemented through ptrace will be defeated. If you
83125+ have been using the RBAC system, this option has already been
83126+ enabled for several years for all users, with the ability to make
83127+ fine-grained exceptions.
83128+
83129+ This option only affects the ability of non-root users to ptrace
83130+ processes that are not a descendent of the ptracing process.
83131+ This means that strace ./binary and gdb ./binary will still work,
83132+ but attaching to arbitrary processes will not. If the sysctl
83133+ option is enabled, a sysctl option with name "harden_ptrace" is
83134+ created.
83135+
83136+config GRKERNSEC_PTRACE_READEXEC
83137+ bool "Require read access to ptrace sensitive binaries"
83138+ default y if GRKERNSEC_CONFIG_AUTO
83139+ help
83140+ If you say Y here, unprivileged users will not be able to ptrace unreadable
83141+ binaries. This option is useful in environments that
83142+ remove the read bits (e.g. file mode 4711) from suid binaries to
83143+ prevent infoleaking of their contents. This option adds
83144+ consistency to the use of that file mode, as the binary could normally
83145+ be read out when run without privileges while ptracing.
83146+
83147+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
83148+ is created.
83149+
83150+config GRKERNSEC_SETXID
83151+ bool "Enforce consistent multithreaded privileges"
83152+ default y if GRKERNSEC_CONFIG_AUTO
83153+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
83154+ help
83155+ If you say Y here, a change from a root uid to a non-root uid
83156+ in a multithreaded application will cause the resulting uids,
83157+ gids, supplementary groups, and capabilities in that thread
83158+ to be propagated to the other threads of the process. In most
83159+ cases this is unnecessary, as glibc will emulate this behavior
83160+ on behalf of the application. Other libcs do not act in the
83161+ same way, allowing the other threads of the process to continue
83162+ running with root privileges. If the sysctl option is enabled,
83163+ a sysctl option with name "consistent_setxid" is created.
83164+
83165+config GRKERNSEC_HARDEN_IPC
83166+ bool "Disallow access to overly-permissive IPC objects"
83167+ default y if GRKERNSEC_CONFIG_AUTO
83168+ depends on SYSVIPC
83169+ help
83170+ If you say Y here, access to overly-permissive IPC objects (shared
83171+ memory, message queues, and semaphores) will be denied for processes
83172+ given the following criteria beyond normal permission checks:
83173+ 1) If the IPC object is world-accessible and the euid doesn't match
83174+ that of the creator or current uid for the IPC object
83175+ 2) If the IPC object is group-accessible and the egid doesn't
83176+ match that of the creator or current gid for the IPC object
83177+ It's a common error to grant too much permission to these objects,
83178+ with impact ranging from denial of service and information leaking to
83179+ privilege escalation. This feature was developed in response to
83180+ research by Tim Brown:
83181+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
83182+ who found hundreds of such insecure usages. Processes with
83183+ CAP_IPC_OWNER are still permitted to access these IPC objects.
83184+ If the sysctl option is enabled, a sysctl option with name
83185+ "harden_ipc" is created.
83186+
83187+config GRKERNSEC_TPE
83188+ bool "Trusted Path Execution (TPE)"
83189+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
83190+ help
83191+ If you say Y here, you will be able to choose a gid to add to the
83192+ supplementary groups of users you want to mark as "untrusted."
83193+ These users will not be able to execute any files that are not in
83194+ root-owned directories writable only by root. If the sysctl option
83195+ is enabled, a sysctl option with name "tpe" is created.
83196+
83197+config GRKERNSEC_TPE_ALL
83198+ bool "Partially restrict all non-root users"
83199+ depends on GRKERNSEC_TPE
83200+ help
83201+ If you say Y here, all non-root users will be covered under
83202+ a weaker TPE restriction. This is separate from, and in addition to,
83203+ the main TPE options that you have selected elsewhere. Thus, if a
83204+ "trusted" GID is chosen, this restriction applies to even that GID.
83205+ Under this restriction, all non-root users will only be allowed to
83206+ execute files in directories they own that are not group or
83207+ world-writable, or in directories owned by root and writable only by
83208+ root. If the sysctl option is enabled, a sysctl option with name
83209+ "tpe_restrict_all" is created.
83210+
83211+config GRKERNSEC_TPE_INVERT
83212+ bool "Invert GID option"
83213+ depends on GRKERNSEC_TPE
83214+ help
83215+ If you say Y here, the group you specify in the TPE configuration will
83216+ decide what group TPE restrictions will be *disabled* for. This
83217+ option is useful if you want TPE restrictions to be applied to most
83218+ users on the system. If the sysctl option is enabled, a sysctl option
83219+ with name "tpe_invert" is created. Unlike other sysctl options, this
83220+ entry will default to on for backward-compatibility.
83221+
83222+config GRKERNSEC_TPE_GID
83223+ int
83224+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
83225+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
83226+
83227+config GRKERNSEC_TPE_UNTRUSTED_GID
83228+ int "GID for TPE-untrusted users"
83229+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
83230+ default 1005
83231+ help
83232+ Setting this GID determines what group TPE restrictions will be
83233+ *enabled* for. If the sysctl option is enabled, a sysctl option
83234+ with name "tpe_gid" is created.
83235+
83236+config GRKERNSEC_TPE_TRUSTED_GID
83237+ int "GID for TPE-trusted users"
83238+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
83239+ default 1005
83240+ help
83241+ Setting this GID determines what group TPE restrictions will be
83242+ *disabled* for. If the sysctl option is enabled, a sysctl option
83243+ with name "tpe_gid" is created.
83244+
83245+endmenu
83246+menu "Network Protections"
83247+depends on GRKERNSEC
83248+
83249+config GRKERNSEC_BLACKHOLE
83250+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
83251+ default y if GRKERNSEC_CONFIG_AUTO
83252+ depends on NET
83253+ help
83254+ If you say Y here, neither TCP resets nor ICMP
83255+ destination-unreachable packets will be sent in response to packets
83256+ sent to ports for which no associated listening process exists.
83257+ It will also prevent the sending of ICMP protocol unreachable packets
83258+ in response to packets with unknown protocols.
83259+ This feature supports both IPV4 and IPV6 and exempts the
83260+ loopback interface from blackholing. Enabling this feature
83261+ makes a host more resilient to DoS attacks and reduces network
83262+ visibility against scanners.
83263+
83264+ The blackhole feature as-implemented is equivalent to the FreeBSD
83265+ blackhole feature, as it prevents RST responses to all packets, not
83266+ just SYNs. Under most application behavior this causes no
83267+ problems, but applications (like haproxy) may not close certain
83268+ connections in a way that cleanly terminates them on the remote
83269+ end, leaving the remote host in LAST_ACK state. Because of this
83270+ side-effect and to prevent intentional LAST_ACK DoSes, this
83271+ feature also adds automatic mitigation against such attacks.
83272+ The mitigation drastically reduces the amount of time a socket
83273+ can spend in LAST_ACK state. If you're using haproxy and not
83274+ all servers it connects to have this option enabled, consider
83275+ disabling this feature on the haproxy host.
83276+
83277+ If the sysctl option is enabled, two sysctl options with names
83278+ "ip_blackhole" and "lastack_retries" will be created.
83279+ While "ip_blackhole" takes the standard zero/non-zero on/off
83280+ toggle, "lastack_retries" uses the same kinds of values as
83281+ "tcp_retries1" and "tcp_retries2". The default value of 4
83282+ prevents a socket from lasting more than 45 seconds in LAST_ACK
83283+ state.
83284+
83285+config GRKERNSEC_NO_SIMULT_CONNECT
83286+ bool "Disable TCP Simultaneous Connect"
83287+ default y if GRKERNSEC_CONFIG_AUTO
83288+ depends on NET
83289+ help
83290+ If you say Y here, a feature by Willy Tarreau will be enabled that
83291+ removes a weakness in Linux's strict implementation of TCP that
83292+ allows two clients to connect to each other without either entering
83293+ a listening state. The weakness allows an attacker to easily prevent
83294+ a client from connecting to a known server provided the source port
83295+ for the connection is guessed correctly.
83296+
83297+ As the weakness could be used to prevent an antivirus or IPS from
83298+ fetching updates, or prevent an SSL gateway from fetching a CRL,
83299+ it should be eliminated by enabling this option. Though Linux is
83300+ one of few operating systems supporting simultaneous connect, it
83301+ has no legitimate use in practice and is rarely supported by firewalls.
83302+
83303+config GRKERNSEC_SOCKET
83304+ bool "Socket restrictions"
83305+ depends on NET
83306+ help
83307+ If you say Y here, you will be able to choose from several options.
83308+ If you assign a GID on your system and add it to the supplementary
83309+ groups of users you want to restrict socket access to, this patch
83310+ will perform up to three things, based on the option(s) you choose.
83311+
83312+config GRKERNSEC_SOCKET_ALL
83313+ bool "Deny any sockets to group"
83314+ depends on GRKERNSEC_SOCKET
83315+ help
83316+ If you say Y here, you will be able to choose a GID of whose users will
83317+ be unable to connect to other hosts from your machine or run server
83318+ applications from your machine. If the sysctl option is enabled, a
83319+ sysctl option with name "socket_all" is created.
83320+
83321+config GRKERNSEC_SOCKET_ALL_GID
83322+ int "GID to deny all sockets for"
83323+ depends on GRKERNSEC_SOCKET_ALL
83324+ default 1004
83325+ help
83326+ Here you can choose the GID to disable socket access for. Remember to
83327+ add the users you want socket access disabled for to the GID
83328+ specified here. If the sysctl option is enabled, a sysctl option
83329+ with name "socket_all_gid" is created.
83330+
83331+config GRKERNSEC_SOCKET_CLIENT
83332+ bool "Deny client sockets to group"
83333+ depends on GRKERNSEC_SOCKET
83334+ help
83335+ If you say Y here, you will be able to choose a GID of whose users will
83336+ be unable to connect to other hosts from your machine, but will be
83337+ able to run servers. If this option is enabled, all users in the group
83338+ you specify will have to use passive mode when initiating ftp transfers
83339+ from the shell on your machine. If the sysctl option is enabled, a
83340+ sysctl option with name "socket_client" is created.
83341+
83342+config GRKERNSEC_SOCKET_CLIENT_GID
83343+ int "GID to deny client sockets for"
83344+ depends on GRKERNSEC_SOCKET_CLIENT
83345+ default 1003
83346+ help
83347+ Here you can choose the GID to disable client socket access for.
83348+ Remember to add the users you want client socket access disabled for to
83349+ the GID specified here. If the sysctl option is enabled, a sysctl
83350+ option with name "socket_client_gid" is created.
83351+
83352+config GRKERNSEC_SOCKET_SERVER
83353+ bool "Deny server sockets to group"
83354+ depends on GRKERNSEC_SOCKET
83355+ help
83356+ If you say Y here, you will be able to choose a GID of whose users will
83357+ be unable to run server applications from your machine. If the sysctl
83358+ option is enabled, a sysctl option with name "socket_server" is created.
83359+
83360+config GRKERNSEC_SOCKET_SERVER_GID
83361+ int "GID to deny server sockets for"
83362+ depends on GRKERNSEC_SOCKET_SERVER
83363+ default 1002
83364+ help
83365+ Here you can choose the GID to disable server socket access for.
83366+ Remember to add the users you want server socket access disabled for to
83367+ the GID specified here. If the sysctl option is enabled, a sysctl
83368+ option with name "socket_server_gid" is created.
83369+
83370+endmenu
83371+
83372+menu "Physical Protections"
83373+depends on GRKERNSEC
83374+
83375+config GRKERNSEC_DENYUSB
83376+ bool "Deny new USB connections after toggle"
83377+ default y if GRKERNSEC_CONFIG_AUTO
83378+ depends on SYSCTL && USB_SUPPORT
83379+ help
83380+ If you say Y here, a new sysctl option with name "deny_new_usb"
83381+ will be created. Setting its value to 1 will prevent any new
83382+ USB devices from being recognized by the OS. Any attempted USB
83383+ device insertion will be logged. This option is intended to be
83384+ used against custom USB devices designed to exploit vulnerabilities
83385+ in various USB device drivers.
83386+
83387+ For greatest effectiveness, this sysctl should be set after any
83388+ relevant init scripts. This option is safe to enable in distros
83389+ as each user can choose whether or not to toggle the sysctl.
83390+
83391+config GRKERNSEC_DENYUSB_FORCE
83392+ bool "Reject all USB devices not connected at boot"
83393+ select USB
83394+ depends on GRKERNSEC_DENYUSB
83395+ help
83396+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
83397+ that doesn't involve a sysctl entry. This option should only be
83398+ enabled if you're sure you want to deny all new USB connections
83399+ at runtime and don't want to modify init scripts. This should not
83400+ be enabled by distros. It forces the core USB code to be built
83401+ into the kernel image so that all devices connected at boot time
83402+ can be recognized and new USB device connections can be prevented
83403+ prior to init running.
83404+
83405+endmenu
83406+
83407+menu "Sysctl Support"
83408+depends on GRKERNSEC && SYSCTL
83409+
83410+config GRKERNSEC_SYSCTL
83411+ bool "Sysctl support"
83412+ default y if GRKERNSEC_CONFIG_AUTO
83413+ help
83414+ If you say Y here, you will be able to change the options that
83415+ grsecurity runs with at bootup, without having to recompile your
83416+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
83417+ to enable (1) or disable (0) various features. All the sysctl entries
83418+ are mutable until the "grsec_lock" entry is set to a non-zero value.
83419+ All features enabled in the kernel configuration are disabled at boot
83420+ if you do not say Y to the "Turn on features by default" option.
83421+ All options should be set at startup, and the grsec_lock entry should
83422+ be set to a non-zero value after all the options are set.
83423+ *THIS IS EXTREMELY IMPORTANT*
83424+
83425+config GRKERNSEC_SYSCTL_DISTRO
83426+ bool "Extra sysctl support for distro makers (READ HELP)"
83427+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
83428+ help
83429+ If you say Y here, additional sysctl options will be created
83430+ for features that affect processes running as root. Therefore,
83431+ it is critical when using this option that the grsec_lock entry be
83432+ enabled after boot. Only distros with prebuilt kernel packages
83433+ with this option enabled that can ensure grsec_lock is enabled
83434+ after boot should use this option.
83435+ *Failure to set grsec_lock after boot makes all grsec features
83436+ this option covers useless*
83437+
83438+ Currently this option creates the following sysctl entries:
83439+ "Disable Privileged I/O": "disable_priv_io"
83440+
83441+config GRKERNSEC_SYSCTL_ON
83442+ bool "Turn on features by default"
83443+ default y if GRKERNSEC_CONFIG_AUTO
83444+ depends on GRKERNSEC_SYSCTL
83445+ help
83446+ If you say Y here, instead of having all features enabled in the
83447+ kernel configuration disabled at boot time, the features will be
83448+ enabled at boot time. It is recommended you say Y here unless
83449+ there is some reason you would want all sysctl-tunable features to
83450+ be disabled by default. As mentioned elsewhere, it is important
83451+ to enable the grsec_lock entry once you have finished modifying
83452+ the sysctl entries.
83453+
83454+endmenu
83455+menu "Logging Options"
83456+depends on GRKERNSEC
83457+
83458+config GRKERNSEC_FLOODTIME
83459+ int "Seconds in between log messages (minimum)"
83460+ default 10
83461+ help
83462+ This option allows you to enforce the number of seconds between
83463+ grsecurity log messages. The default should be suitable for most
83464+ people, however, if you choose to change it, choose a value small enough
83465+ to allow informative logs to be produced, but large enough to
83466+ prevent flooding.
83467+
83468+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
83469+ any rate limiting on grsecurity log messages.
83470+
83471+config GRKERNSEC_FLOODBURST
83472+ int "Number of messages in a burst (maximum)"
83473+ default 6
83474+ help
83475+ This option allows you to choose the maximum number of messages allowed
83476+ within the flood time interval you chose in a separate option. The
83477+ default should be suitable for most people, however if you find that
83478+ many of your logs are being interpreted as flooding, you may want to
83479+ raise this value.
83480+
83481+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
83482+ any rate limiting on grsecurity log messages.
83483+
83484+endmenu
83485diff --git a/grsecurity/Makefile b/grsecurity/Makefile
83486new file mode 100644
83487index 0000000..30ababb
83488--- /dev/null
83489+++ b/grsecurity/Makefile
83490@@ -0,0 +1,54 @@
83491+# grsecurity – access control and security hardening for Linux
83492+# All code in this directory and various hooks located throughout the Linux kernel are
83493+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
83494+# http://www.grsecurity.net spender@grsecurity.net
83495+#
83496+# This program is free software; you can redistribute it and/or
83497+# modify it under the terms of the GNU General Public License version 2
83498+# as published by the Free Software Foundation.
83499+#
83500+# This program is distributed in the hope that it will be useful,
83501+# but WITHOUT ANY WARRANTY; without even the implied warranty of
83502+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83503+# GNU General Public License for more details.
83504+#
83505+# You should have received a copy of the GNU General Public License
83506+# along with this program; if not, write to the Free Software
83507+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
83508+
83509+KBUILD_CFLAGS += -Werror
83510+
83511+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
83512+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
83513+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
83514+ grsec_usb.o grsec_ipc.o grsec_proc.o
83515+
83516+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
83517+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
83518+ gracl_learn.o grsec_log.o gracl_policy.o
83519+ifdef CONFIG_COMPAT
83520+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
83521+endif
83522+
83523+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
83524+
83525+ifdef CONFIG_NET
83526+obj-y += grsec_sock.o
83527+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
83528+endif
83529+
83530+ifndef CONFIG_GRKERNSEC
83531+obj-y += grsec_disabled.o
83532+endif
83533+
83534+ifdef CONFIG_GRKERNSEC_HIDESYM
83535+extra-y := grsec_hidesym.o
83536+$(obj)/grsec_hidesym.o:
83537+ @-chmod -f 500 /boot
83538+ @-chmod -f 500 /lib/modules
83539+ @-chmod -f 500 /lib64/modules
83540+ @-chmod -f 500 /lib32/modules
83541+ @-chmod -f 700 .
83542+ @-chmod -f 700 $(objtree)
83543+ @echo ' grsec: protected kernel image paths'
83544+endif
83545diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
83546new file mode 100644
83547index 0000000..7ad630a
83548--- /dev/null
83549+++ b/grsecurity/gracl.c
83550@@ -0,0 +1,2757 @@
83551+#include <linux/kernel.h>
83552+#include <linux/module.h>
83553+#include <linux/sched.h>
83554+#include <linux/mm.h>
83555+#include <linux/file.h>
83556+#include <linux/fs.h>
83557+#include <linux/namei.h>
83558+#include <linux/mount.h>
83559+#include <linux/tty.h>
83560+#include <linux/proc_fs.h>
83561+#include <linux/lglock.h>
83562+#include <linux/slab.h>
83563+#include <linux/vmalloc.h>
83564+#include <linux/types.h>
83565+#include <linux/sysctl.h>
83566+#include <linux/netdevice.h>
83567+#include <linux/ptrace.h>
83568+#include <linux/gracl.h>
83569+#include <linux/gralloc.h>
83570+#include <linux/security.h>
83571+#include <linux/grinternal.h>
83572+#include <linux/pid_namespace.h>
83573+#include <linux/stop_machine.h>
83574+#include <linux/fdtable.h>
83575+#include <linux/percpu.h>
83576+#include <linux/lglock.h>
83577+#include <linux/hugetlb.h>
83578+#include <linux/posix-timers.h>
83579+#include <linux/prefetch.h>
83580+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83581+#include <linux/magic.h>
83582+#include <linux/pagemap.h>
83583+#include "../fs/btrfs/async-thread.h"
83584+#include "../fs/btrfs/ctree.h"
83585+#include "../fs/btrfs/btrfs_inode.h"
83586+#endif
83587+#include "../fs/mount.h"
83588+
83589+#include <asm/uaccess.h>
83590+#include <asm/errno.h>
83591+#include <asm/mman.h>
83592+
83593+#define FOR_EACH_ROLE_START(role) \
83594+ role = running_polstate.role_list; \
83595+ while (role) {
83596+
83597+#define FOR_EACH_ROLE_END(role) \
83598+ role = role->prev; \
83599+ }
83600+
83601+extern struct path gr_real_root;
83602+
83603+static struct gr_policy_state running_polstate;
83604+struct gr_policy_state *polstate = &running_polstate;
83605+extern struct gr_alloc_state *current_alloc_state;
83606+
83607+extern char *gr_shared_page[4];
83608+DEFINE_RWLOCK(gr_inode_lock);
83609+
83610+static unsigned int gr_status __read_only = GR_STATUS_INIT;
83611+
83612+#ifdef CONFIG_NET
83613+extern struct vfsmount *sock_mnt;
83614+#endif
83615+
83616+extern struct vfsmount *pipe_mnt;
83617+extern struct vfsmount *shm_mnt;
83618+
83619+#ifdef CONFIG_HUGETLBFS
83620+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
83621+#endif
83622+
83623+extern u16 acl_sp_role_value;
83624+extern struct acl_object_label *fakefs_obj_rw;
83625+extern struct acl_object_label *fakefs_obj_rwx;
83626+
83627+int gr_acl_is_enabled(void)
83628+{
83629+ return (gr_status & GR_READY);
83630+}
83631+
83632+void gr_enable_rbac_system(void)
83633+{
83634+ pax_open_kernel();
83635+ gr_status |= GR_READY;
83636+ pax_close_kernel();
83637+}
83638+
83639+int gr_rbac_disable(void *unused)
83640+{
83641+ pax_open_kernel();
83642+ gr_status &= ~GR_READY;
83643+ pax_close_kernel();
83644+
83645+ return 0;
83646+}
83647+
83648+static inline dev_t __get_dev(const struct dentry *dentry)
83649+{
83650+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83651+
83652+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83653+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83654+ return BTRFS_I(d_inode(ldentry))->root->anon_dev;
83655+ else
83656+#endif
83657+ return d_inode(ldentry)->i_sb->s_dev;
83658+}
83659+
83660+static inline u64 __get_ino(const struct dentry *dentry)
83661+{
83662+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83663+
83664+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83665+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83666+ return btrfs_ino(d_inode(dentry));
83667+ else
83668+#endif
83669+ return d_inode(ldentry)->i_ino;
83670+}
83671+
83672+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
83673+{
83674+ return __get_dev(dentry);
83675+}
83676+
83677+u64 gr_get_ino_from_dentry(struct dentry *dentry)
83678+{
83679+ return __get_ino(dentry);
83680+}
83681+
83682+static char gr_task_roletype_to_char(struct task_struct *task)
83683+{
83684+ switch (task->role->roletype &
83685+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
83686+ GR_ROLE_SPECIAL)) {
83687+ case GR_ROLE_DEFAULT:
83688+ return 'D';
83689+ case GR_ROLE_USER:
83690+ return 'U';
83691+ case GR_ROLE_GROUP:
83692+ return 'G';
83693+ case GR_ROLE_SPECIAL:
83694+ return 'S';
83695+ }
83696+
83697+ return 'X';
83698+}
83699+
83700+char gr_roletype_to_char(void)
83701+{
83702+ return gr_task_roletype_to_char(current);
83703+}
83704+
83705+int
83706+gr_acl_tpe_check(void)
83707+{
83708+ if (unlikely(!(gr_status & GR_READY)))
83709+ return 0;
83710+ if (current->role->roletype & GR_ROLE_TPE)
83711+ return 1;
83712+ else
83713+ return 0;
83714+}
83715+
83716+int
83717+gr_handle_rawio(const struct inode *inode)
83718+{
83719+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
83720+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
83721+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
83722+ !capable(CAP_SYS_RAWIO))
83723+ return 1;
83724+#endif
83725+ return 0;
83726+}
83727+
83728+int
83729+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
83730+{
83731+ if (likely(lena != lenb))
83732+ return 0;
83733+
83734+ return !memcmp(a, b, lena);
83735+}
83736+
83737+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
83738+{
83739+ *buflen -= namelen;
83740+ if (*buflen < 0)
83741+ return -ENAMETOOLONG;
83742+ *buffer -= namelen;
83743+ memcpy(*buffer, str, namelen);
83744+ return 0;
83745+}
83746+
83747+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
83748+{
83749+ return prepend(buffer, buflen, name->name, name->len);
83750+}
83751+
83752+static int prepend_path(const struct path *path, struct path *root,
83753+ char **buffer, int *buflen)
83754+{
83755+ struct dentry *dentry = path->dentry;
83756+ struct vfsmount *vfsmnt = path->mnt;
83757+ struct mount *mnt = real_mount(vfsmnt);
83758+ bool slash = false;
83759+ int error = 0;
83760+
83761+ while (dentry != root->dentry || vfsmnt != root->mnt) {
83762+ struct dentry * parent;
83763+
83764+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
83765+ /* Global root? */
83766+ if (!mnt_has_parent(mnt)) {
83767+ goto out;
83768+ }
83769+ dentry = mnt->mnt_mountpoint;
83770+ mnt = mnt->mnt_parent;
83771+ vfsmnt = &mnt->mnt;
83772+ continue;
83773+ }
83774+ parent = dentry->d_parent;
83775+ prefetch(parent);
83776+ spin_lock(&dentry->d_lock);
83777+ error = prepend_name(buffer, buflen, &dentry->d_name);
83778+ spin_unlock(&dentry->d_lock);
83779+ if (!error)
83780+ error = prepend(buffer, buflen, "/", 1);
83781+ if (error)
83782+ break;
83783+
83784+ slash = true;
83785+ dentry = parent;
83786+ }
83787+
83788+out:
83789+ if (!error && !slash)
83790+ error = prepend(buffer, buflen, "/", 1);
83791+
83792+ return error;
83793+}
83794+
83795+/* this must be called with mount_lock and rename_lock held */
83796+
83797+static char *__our_d_path(const struct path *path, struct path *root,
83798+ char *buf, int buflen)
83799+{
83800+ char *res = buf + buflen;
83801+ int error;
83802+
83803+ prepend(&res, &buflen, "\0", 1);
83804+ error = prepend_path(path, root, &res, &buflen);
83805+ if (error)
83806+ return ERR_PTR(error);
83807+
83808+ return res;
83809+}
83810+
83811+static char *
83812+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
83813+{
83814+ char *retval;
83815+
83816+ retval = __our_d_path(path, root, buf, buflen);
83817+ if (unlikely(IS_ERR(retval)))
83818+ retval = strcpy(buf, "<path too long>");
83819+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
83820+ retval[1] = '\0';
83821+
83822+ return retval;
83823+}
83824+
83825+static char *
83826+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
83827+ char *buf, int buflen)
83828+{
83829+ struct path path;
83830+ char *res;
83831+
83832+ path.dentry = (struct dentry *)dentry;
83833+ path.mnt = (struct vfsmount *)vfsmnt;
83834+
83835+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
83836+ by the RBAC system */
83837+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
83838+
83839+ return res;
83840+}
83841+
83842+static char *
83843+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
83844+ char *buf, int buflen)
83845+{
83846+ char *res;
83847+ struct path path;
83848+ struct path root;
83849+ struct task_struct *reaper = init_pid_ns.child_reaper;
83850+
83851+ path.dentry = (struct dentry *)dentry;
83852+ path.mnt = (struct vfsmount *)vfsmnt;
83853+
83854+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
83855+ get_fs_root(reaper->fs, &root);
83856+
83857+ read_seqlock_excl(&mount_lock);
83858+ write_seqlock(&rename_lock);
83859+ res = gen_full_path(&path, &root, buf, buflen);
83860+ write_sequnlock(&rename_lock);
83861+ read_sequnlock_excl(&mount_lock);
83862+
83863+ path_put(&root);
83864+ return res;
83865+}
83866+
83867+char *
83868+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
83869+{
83870+ char *ret;
83871+ read_seqlock_excl(&mount_lock);
83872+ write_seqlock(&rename_lock);
83873+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
83874+ PAGE_SIZE);
83875+ write_sequnlock(&rename_lock);
83876+ read_sequnlock_excl(&mount_lock);
83877+ return ret;
83878+}
83879+
83880+static char *
83881+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
83882+{
83883+ char *ret;
83884+ char *buf;
83885+ int buflen;
83886+
83887+ read_seqlock_excl(&mount_lock);
83888+ write_seqlock(&rename_lock);
83889+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
83890+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
83891+ buflen = (int)(ret - buf);
83892+ if (buflen >= 5)
83893+ prepend(&ret, &buflen, "/proc", 5);
83894+ else
83895+ ret = strcpy(buf, "<path too long>");
83896+ write_sequnlock(&rename_lock);
83897+ read_sequnlock_excl(&mount_lock);
83898+ return ret;
83899+}
83900+
83901+char *
83902+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
83903+{
83904+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
83905+ PAGE_SIZE);
83906+}
83907+
83908+char *
83909+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
83910+{
83911+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
83912+ PAGE_SIZE);
83913+}
83914+
83915+char *
83916+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
83917+{
83918+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
83919+ PAGE_SIZE);
83920+}
83921+
83922+char *
83923+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
83924+{
83925+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
83926+ PAGE_SIZE);
83927+}
83928+
83929+char *
83930+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
83931+{
83932+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
83933+ PAGE_SIZE);
83934+}
83935+
83936+__u32
83937+to_gr_audit(const __u32 reqmode)
83938+{
83939+ /* masks off auditable permission flags, then shifts them to create
83940+ auditing flags, and adds the special case of append auditing if
83941+ we're requesting write */
83942+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
83943+}
83944+
83945+struct acl_role_label *
83946+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
83947+ const gid_t gid)
83948+{
83949+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
83950+ struct acl_role_label *match;
83951+ struct role_allowed_ip *ipp;
83952+ unsigned int x;
83953+ u32 curr_ip = task->signal->saved_ip;
83954+
83955+ match = state->acl_role_set.r_hash[index];
83956+
83957+ while (match) {
83958+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
83959+ for (x = 0; x < match->domain_child_num; x++) {
83960+ if (match->domain_children[x] == uid)
83961+ goto found;
83962+ }
83963+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
83964+ break;
83965+ match = match->next;
83966+ }
83967+found:
83968+ if (match == NULL) {
83969+ try_group:
83970+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
83971+ match = state->acl_role_set.r_hash[index];
83972+
83973+ while (match) {
83974+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
83975+ for (x = 0; x < match->domain_child_num; x++) {
83976+ if (match->domain_children[x] == gid)
83977+ goto found2;
83978+ }
83979+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
83980+ break;
83981+ match = match->next;
83982+ }
83983+found2:
83984+ if (match == NULL)
83985+ match = state->default_role;
83986+ if (match->allowed_ips == NULL)
83987+ return match;
83988+ else {
83989+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
83990+ if (likely
83991+ ((ntohl(curr_ip) & ipp->netmask) ==
83992+ (ntohl(ipp->addr) & ipp->netmask)))
83993+ return match;
83994+ }
83995+ match = state->default_role;
83996+ }
83997+ } else if (match->allowed_ips == NULL) {
83998+ return match;
83999+ } else {
84000+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84001+ if (likely
84002+ ((ntohl(curr_ip) & ipp->netmask) ==
84003+ (ntohl(ipp->addr) & ipp->netmask)))
84004+ return match;
84005+ }
84006+ goto try_group;
84007+ }
84008+
84009+ return match;
84010+}
84011+
84012+static struct acl_role_label *
84013+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
84014+ const gid_t gid)
84015+{
84016+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
84017+}
84018+
84019+struct acl_subject_label *
84020+lookup_acl_subj_label(const u64 ino, const dev_t dev,
84021+ const struct acl_role_label *role)
84022+{
84023+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84024+ struct acl_subject_label *match;
84025+
84026+ match = role->subj_hash[index];
84027+
84028+ while (match && (match->inode != ino || match->device != dev ||
84029+ (match->mode & GR_DELETED))) {
84030+ match = match->next;
84031+ }
84032+
84033+ if (match && !(match->mode & GR_DELETED))
84034+ return match;
84035+ else
84036+ return NULL;
84037+}
84038+
84039+struct acl_subject_label *
84040+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
84041+ const struct acl_role_label *role)
84042+{
84043+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84044+ struct acl_subject_label *match;
84045+
84046+ match = role->subj_hash[index];
84047+
84048+ while (match && (match->inode != ino || match->device != dev ||
84049+ !(match->mode & GR_DELETED))) {
84050+ match = match->next;
84051+ }
84052+
84053+ if (match && (match->mode & GR_DELETED))
84054+ return match;
84055+ else
84056+ return NULL;
84057+}
84058+
84059+static struct acl_object_label *
84060+lookup_acl_obj_label(const u64 ino, const dev_t dev,
84061+ const struct acl_subject_label *subj)
84062+{
84063+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84064+ struct acl_object_label *match;
84065+
84066+ match = subj->obj_hash[index];
84067+
84068+ while (match && (match->inode != ino || match->device != dev ||
84069+ (match->mode & GR_DELETED))) {
84070+ match = match->next;
84071+ }
84072+
84073+ if (match && !(match->mode & GR_DELETED))
84074+ return match;
84075+ else
84076+ return NULL;
84077+}
84078+
84079+static struct acl_object_label *
84080+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
84081+ const struct acl_subject_label *subj)
84082+{
84083+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84084+ struct acl_object_label *match;
84085+
84086+ match = subj->obj_hash[index];
84087+
84088+ while (match && (match->inode != ino || match->device != dev ||
84089+ !(match->mode & GR_DELETED))) {
84090+ match = match->next;
84091+ }
84092+
84093+ if (match && (match->mode & GR_DELETED))
84094+ return match;
84095+
84096+ match = subj->obj_hash[index];
84097+
84098+ while (match && (match->inode != ino || match->device != dev ||
84099+ (match->mode & GR_DELETED))) {
84100+ match = match->next;
84101+ }
84102+
84103+ if (match && !(match->mode & GR_DELETED))
84104+ return match;
84105+ else
84106+ return NULL;
84107+}
84108+
84109+struct name_entry *
84110+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
84111+{
84112+ unsigned int len = strlen(name);
84113+ unsigned int key = full_name_hash(name, len);
84114+ unsigned int index = key % state->name_set.n_size;
84115+ struct name_entry *match;
84116+
84117+ match = state->name_set.n_hash[index];
84118+
84119+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
84120+ match = match->next;
84121+
84122+ return match;
84123+}
84124+
84125+static struct name_entry *
84126+lookup_name_entry(const char *name)
84127+{
84128+ return __lookup_name_entry(&running_polstate, name);
84129+}
84130+
84131+static struct name_entry *
84132+lookup_name_entry_create(const char *name)
84133+{
84134+ unsigned int len = strlen(name);
84135+ unsigned int key = full_name_hash(name, len);
84136+ unsigned int index = key % running_polstate.name_set.n_size;
84137+ struct name_entry *match;
84138+
84139+ match = running_polstate.name_set.n_hash[index];
84140+
84141+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84142+ !match->deleted))
84143+ match = match->next;
84144+
84145+ if (match && match->deleted)
84146+ return match;
84147+
84148+ match = running_polstate.name_set.n_hash[index];
84149+
84150+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84151+ match->deleted))
84152+ match = match->next;
84153+
84154+ if (match && !match->deleted)
84155+ return match;
84156+ else
84157+ return NULL;
84158+}
84159+
84160+static struct inodev_entry *
84161+lookup_inodev_entry(const u64 ino, const dev_t dev)
84162+{
84163+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
84164+ struct inodev_entry *match;
84165+
84166+ match = running_polstate.inodev_set.i_hash[index];
84167+
84168+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
84169+ match = match->next;
84170+
84171+ return match;
84172+}
84173+
84174+void
84175+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
84176+{
84177+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
84178+ state->inodev_set.i_size);
84179+ struct inodev_entry **curr;
84180+
84181+ entry->prev = NULL;
84182+
84183+ curr = &state->inodev_set.i_hash[index];
84184+ if (*curr != NULL)
84185+ (*curr)->prev = entry;
84186+
84187+ entry->next = *curr;
84188+ *curr = entry;
84189+
84190+ return;
84191+}
84192+
84193+static void
84194+insert_inodev_entry(struct inodev_entry *entry)
84195+{
84196+ __insert_inodev_entry(&running_polstate, entry);
84197+}
84198+
84199+void
84200+insert_acl_obj_label(struct acl_object_label *obj,
84201+ struct acl_subject_label *subj)
84202+{
84203+ unsigned int index =
84204+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
84205+ struct acl_object_label **curr;
84206+
84207+ obj->prev = NULL;
84208+
84209+ curr = &subj->obj_hash[index];
84210+ if (*curr != NULL)
84211+ (*curr)->prev = obj;
84212+
84213+ obj->next = *curr;
84214+ *curr = obj;
84215+
84216+ return;
84217+}
84218+
84219+void
84220+insert_acl_subj_label(struct acl_subject_label *obj,
84221+ struct acl_role_label *role)
84222+{
84223+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
84224+ struct acl_subject_label **curr;
84225+
84226+ obj->prev = NULL;
84227+
84228+ curr = &role->subj_hash[index];
84229+ if (*curr != NULL)
84230+ (*curr)->prev = obj;
84231+
84232+ obj->next = *curr;
84233+ *curr = obj;
84234+
84235+ return;
84236+}
84237+
84238+/* derived from glibc fnmatch() 0: match, 1: no match*/
84239+
84240+static int
84241+glob_match(const char *p, const char *n)
84242+{
84243+ char c;
84244+
84245+ while ((c = *p++) != '\0') {
84246+ switch (c) {
84247+ case '?':
84248+ if (*n == '\0')
84249+ return 1;
84250+ else if (*n == '/')
84251+ return 1;
84252+ break;
84253+ case '\\':
84254+ if (*n != c)
84255+ return 1;
84256+ break;
84257+ case '*':
84258+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
84259+ if (*n == '/')
84260+ return 1;
84261+ else if (c == '?') {
84262+ if (*n == '\0')
84263+ return 1;
84264+ else
84265+ ++n;
84266+ }
84267+ }
84268+ if (c == '\0') {
84269+ return 0;
84270+ } else {
84271+ const char *endp;
84272+
84273+ if ((endp = strchr(n, '/')) == NULL)
84274+ endp = n + strlen(n);
84275+
84276+ if (c == '[') {
84277+ for (--p; n < endp; ++n)
84278+ if (!glob_match(p, n))
84279+ return 0;
84280+ } else if (c == '/') {
84281+ while (*n != '\0' && *n != '/')
84282+ ++n;
84283+ if (*n == '/' && !glob_match(p, n + 1))
84284+ return 0;
84285+ } else {
84286+ for (--p; n < endp; ++n)
84287+ if (*n == c && !glob_match(p, n))
84288+ return 0;
84289+ }
84290+
84291+ return 1;
84292+ }
84293+ case '[':
84294+ {
84295+ int not;
84296+ char cold;
84297+
84298+ if (*n == '\0' || *n == '/')
84299+ return 1;
84300+
84301+ not = (*p == '!' || *p == '^');
84302+ if (not)
84303+ ++p;
84304+
84305+ c = *p++;
84306+ for (;;) {
84307+ unsigned char fn = (unsigned char)*n;
84308+
84309+ if (c == '\0')
84310+ return 1;
84311+ else {
84312+ if (c == fn)
84313+ goto matched;
84314+ cold = c;
84315+ c = *p++;
84316+
84317+ if (c == '-' && *p != ']') {
84318+ unsigned char cend = *p++;
84319+
84320+ if (cend == '\0')
84321+ return 1;
84322+
84323+ if (cold <= fn && fn <= cend)
84324+ goto matched;
84325+
84326+ c = *p++;
84327+ }
84328+ }
84329+
84330+ if (c == ']')
84331+ break;
84332+ }
84333+ if (!not)
84334+ return 1;
84335+ break;
84336+ matched:
84337+ while (c != ']') {
84338+ if (c == '\0')
84339+ return 1;
84340+
84341+ c = *p++;
84342+ }
84343+ if (not)
84344+ return 1;
84345+ }
84346+ break;
84347+ default:
84348+ if (c != *n)
84349+ return 1;
84350+ }
84351+
84352+ ++n;
84353+ }
84354+
84355+ if (*n == '\0')
84356+ return 0;
84357+
84358+ if (*n == '/')
84359+ return 0;
84360+
84361+ return 1;
84362+}
84363+
84364+static struct acl_object_label *
84365+chk_glob_label(struct acl_object_label *globbed,
84366+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
84367+{
84368+ struct acl_object_label *tmp;
84369+
84370+ if (*path == NULL)
84371+ *path = gr_to_filename_nolock(dentry, mnt);
84372+
84373+ tmp = globbed;
84374+
84375+ while (tmp) {
84376+ if (!glob_match(tmp->filename, *path))
84377+ return tmp;
84378+ tmp = tmp->next;
84379+ }
84380+
84381+ return NULL;
84382+}
84383+
84384+static struct acl_object_label *
84385+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84386+ const u64 curr_ino, const dev_t curr_dev,
84387+ const struct acl_subject_label *subj, char **path, const int checkglob)
84388+{
84389+ struct acl_subject_label *tmpsubj;
84390+ struct acl_object_label *retval;
84391+ struct acl_object_label *retval2;
84392+
84393+ tmpsubj = (struct acl_subject_label *) subj;
84394+ read_lock(&gr_inode_lock);
84395+ do {
84396+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
84397+ if (retval) {
84398+ if (checkglob && retval->globbed) {
84399+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
84400+ if (retval2)
84401+ retval = retval2;
84402+ }
84403+ break;
84404+ }
84405+ } while ((tmpsubj = tmpsubj->parent_subject));
84406+ read_unlock(&gr_inode_lock);
84407+
84408+ return retval;
84409+}
84410+
84411+static struct acl_object_label *
84412+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84413+ struct dentry *curr_dentry,
84414+ const struct acl_subject_label *subj, char **path, const int checkglob)
84415+{
84416+ int newglob = checkglob;
84417+ u64 inode;
84418+ dev_t device;
84419+
84420+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
84421+ as we don't want a / * rule to match instead of the / object
84422+ don't do this for create lookups that call this function though, since they're looking up
84423+ on the parent and thus need globbing checks on all paths
84424+ */
84425+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
84426+ newglob = GR_NO_GLOB;
84427+
84428+ spin_lock(&curr_dentry->d_lock);
84429+ inode = __get_ino(curr_dentry);
84430+ device = __get_dev(curr_dentry);
84431+ spin_unlock(&curr_dentry->d_lock);
84432+
84433+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
84434+}
84435+
84436+#ifdef CONFIG_HUGETLBFS
84437+static inline bool
84438+is_hugetlbfs_mnt(const struct vfsmount *mnt)
84439+{
84440+ int i;
84441+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
84442+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
84443+ return true;
84444+ }
84445+
84446+ return false;
84447+}
84448+#endif
84449+
84450+static struct acl_object_label *
84451+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84452+ const struct acl_subject_label *subj, char *path, const int checkglob)
84453+{
84454+ struct dentry *dentry = (struct dentry *) l_dentry;
84455+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84456+ struct inode * inode = d_backing_inode(dentry);
84457+ struct mount *real_mnt = real_mount(mnt);
84458+ struct acl_object_label *retval;
84459+ struct dentry *parent;
84460+
84461+ read_seqlock_excl(&mount_lock);
84462+ write_seqlock(&rename_lock);
84463+
84464+ if (unlikely((mnt == shm_mnt && inode->i_nlink == 0) || mnt == pipe_mnt ||
84465+#ifdef CONFIG_NET
84466+ mnt == sock_mnt ||
84467+#endif
84468+#ifdef CONFIG_HUGETLBFS
84469+ (is_hugetlbfs_mnt(mnt) && inode->i_nlink == 0) ||
84470+#endif
84471+ /* ignore Eric Biederman */
84472+ IS_PRIVATE(inode))) {
84473+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
84474+ goto out;
84475+ }
84476+
84477+ for (;;) {
84478+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84479+ break;
84480+
84481+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84482+ if (!mnt_has_parent(real_mnt))
84483+ break;
84484+
84485+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84486+ if (retval != NULL)
84487+ goto out;
84488+
84489+ dentry = real_mnt->mnt_mountpoint;
84490+ real_mnt = real_mnt->mnt_parent;
84491+ mnt = &real_mnt->mnt;
84492+ continue;
84493+ }
84494+
84495+ parent = dentry->d_parent;
84496+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84497+ if (retval != NULL)
84498+ goto out;
84499+
84500+ dentry = parent;
84501+ }
84502+
84503+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84504+
84505+ /* gr_real_root is pinned so we don't have to hold a reference */
84506+ if (retval == NULL)
84507+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
84508+out:
84509+ write_sequnlock(&rename_lock);
84510+ read_sequnlock_excl(&mount_lock);
84511+
84512+ BUG_ON(retval == NULL);
84513+
84514+ return retval;
84515+}
84516+
84517+static struct acl_object_label *
84518+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84519+ const struct acl_subject_label *subj)
84520+{
84521+ char *path = NULL;
84522+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
84523+}
84524+
84525+static struct acl_object_label *
84526+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84527+ const struct acl_subject_label *subj)
84528+{
84529+ char *path = NULL;
84530+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
84531+}
84532+
84533+static struct acl_object_label *
84534+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84535+ const struct acl_subject_label *subj, char *path)
84536+{
84537+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
84538+}
84539+
84540+struct acl_subject_label *
84541+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84542+ const struct acl_role_label *role)
84543+{
84544+ struct dentry *dentry = (struct dentry *) l_dentry;
84545+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84546+ struct mount *real_mnt = real_mount(mnt);
84547+ struct acl_subject_label *retval;
84548+ struct dentry *parent;
84549+
84550+ read_seqlock_excl(&mount_lock);
84551+ write_seqlock(&rename_lock);
84552+
84553+ for (;;) {
84554+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84555+ break;
84556+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84557+ if (!mnt_has_parent(real_mnt))
84558+ break;
84559+
84560+ spin_lock(&dentry->d_lock);
84561+ read_lock(&gr_inode_lock);
84562+ retval =
84563+ lookup_acl_subj_label(__get_ino(dentry),
84564+ __get_dev(dentry), role);
84565+ read_unlock(&gr_inode_lock);
84566+ spin_unlock(&dentry->d_lock);
84567+ if (retval != NULL)
84568+ goto out;
84569+
84570+ dentry = real_mnt->mnt_mountpoint;
84571+ real_mnt = real_mnt->mnt_parent;
84572+ mnt = &real_mnt->mnt;
84573+ continue;
84574+ }
84575+
84576+ spin_lock(&dentry->d_lock);
84577+ read_lock(&gr_inode_lock);
84578+ retval = lookup_acl_subj_label(__get_ino(dentry),
84579+ __get_dev(dentry), role);
84580+ read_unlock(&gr_inode_lock);
84581+ parent = dentry->d_parent;
84582+ spin_unlock(&dentry->d_lock);
84583+
84584+ if (retval != NULL)
84585+ goto out;
84586+
84587+ dentry = parent;
84588+ }
84589+
84590+ spin_lock(&dentry->d_lock);
84591+ read_lock(&gr_inode_lock);
84592+ retval = lookup_acl_subj_label(__get_ino(dentry),
84593+ __get_dev(dentry), role);
84594+ read_unlock(&gr_inode_lock);
84595+ spin_unlock(&dentry->d_lock);
84596+
84597+ if (unlikely(retval == NULL)) {
84598+ /* gr_real_root is pinned, we don't need to hold a reference */
84599+ read_lock(&gr_inode_lock);
84600+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
84601+ __get_dev(gr_real_root.dentry), role);
84602+ read_unlock(&gr_inode_lock);
84603+ }
84604+out:
84605+ write_sequnlock(&rename_lock);
84606+ read_sequnlock_excl(&mount_lock);
84607+
84608+ BUG_ON(retval == NULL);
84609+
84610+ return retval;
84611+}
84612+
84613+void
84614+assign_special_role(const char *rolename)
84615+{
84616+ struct acl_object_label *obj;
84617+ struct acl_role_label *r;
84618+ struct acl_role_label *assigned = NULL;
84619+ struct task_struct *tsk;
84620+ struct file *filp;
84621+
84622+ FOR_EACH_ROLE_START(r)
84623+ if (!strcmp(rolename, r->rolename) &&
84624+ (r->roletype & GR_ROLE_SPECIAL)) {
84625+ assigned = r;
84626+ break;
84627+ }
84628+ FOR_EACH_ROLE_END(r)
84629+
84630+ if (!assigned)
84631+ return;
84632+
84633+ read_lock(&tasklist_lock);
84634+ read_lock(&grsec_exec_file_lock);
84635+
84636+ tsk = current->real_parent;
84637+ if (tsk == NULL)
84638+ goto out_unlock;
84639+
84640+ filp = tsk->exec_file;
84641+ if (filp == NULL)
84642+ goto out_unlock;
84643+
84644+ tsk->is_writable = 0;
84645+ tsk->inherited = 0;
84646+
84647+ tsk->acl_sp_role = 1;
84648+ tsk->acl_role_id = ++acl_sp_role_value;
84649+ tsk->role = assigned;
84650+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
84651+
84652+ /* ignore additional mmap checks for processes that are writable
84653+ by the default ACL */
84654+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
84655+ if (unlikely(obj->mode & GR_WRITE))
84656+ tsk->is_writable = 1;
84657+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
84658+ if (unlikely(obj->mode & GR_WRITE))
84659+ tsk->is_writable = 1;
84660+
84661+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
84662+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
84663+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
84664+#endif
84665+
84666+out_unlock:
84667+ read_unlock(&grsec_exec_file_lock);
84668+ read_unlock(&tasklist_lock);
84669+ return;
84670+}
84671+
84672+
84673+static void
84674+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
84675+{
84676+ struct task_struct *task = current;
84677+ const struct cred *cred = current_cred();
84678+
84679+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
84680+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84681+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84682+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
84683+
84684+ return;
84685+}
84686+
84687+static void
84688+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
84689+{
84690+ struct task_struct *task = current;
84691+ const struct cred *cred = current_cred();
84692+
84693+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84694+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84695+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84696+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
84697+
84698+ return;
84699+}
84700+
84701+static void
84702+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
84703+{
84704+ struct task_struct *task = current;
84705+ const struct cred *cred = current_cred();
84706+
84707+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84708+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84709+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84710+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
84711+
84712+ return;
84713+}
84714+
84715+static void
84716+gr_set_proc_res(struct task_struct *task)
84717+{
84718+ struct acl_subject_label *proc;
84719+ unsigned short i;
84720+
84721+ proc = task->acl;
84722+
84723+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
84724+ return;
84725+
84726+ for (i = 0; i < RLIM_NLIMITS; i++) {
84727+ unsigned long rlim_cur, rlim_max;
84728+
84729+ if (!(proc->resmask & (1U << i)))
84730+ continue;
84731+
84732+ rlim_cur = proc->res[i].rlim_cur;
84733+ rlim_max = proc->res[i].rlim_max;
84734+
84735+ if (i == RLIMIT_NOFILE) {
84736+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
84737+ if (rlim_cur > saved_sysctl_nr_open)
84738+ rlim_cur = saved_sysctl_nr_open;
84739+ if (rlim_max > saved_sysctl_nr_open)
84740+ rlim_max = saved_sysctl_nr_open;
84741+ }
84742+
84743+ task->signal->rlim[i].rlim_cur = rlim_cur;
84744+ task->signal->rlim[i].rlim_max = rlim_max;
84745+
84746+ if (i == RLIMIT_CPU)
84747+ update_rlimit_cpu(task, rlim_cur);
84748+ }
84749+
84750+ return;
84751+}
84752+
84753+/* both of the below must be called with
84754+ rcu_read_lock();
84755+ read_lock(&tasklist_lock);
84756+ read_lock(&grsec_exec_file_lock);
84757+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
84758+*/
84759+
84760+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
84761+{
84762+ char *tmpname;
84763+ struct acl_subject_label *tmpsubj;
84764+ struct file *filp;
84765+ struct name_entry *nmatch;
84766+
84767+ filp = task->exec_file;
84768+ if (filp == NULL)
84769+ return NULL;
84770+
84771+ /* the following is to apply the correct subject
84772+ on binaries running when the RBAC system
84773+ is enabled, when the binaries have been
84774+ replaced or deleted since their execution
84775+ -----
84776+ when the RBAC system starts, the inode/dev
84777+ from exec_file will be one the RBAC system
84778+ is unaware of. It only knows the inode/dev
84779+ of the present file on disk, or the absence
84780+ of it.
84781+ */
84782+
84783+ if (filename)
84784+ nmatch = __lookup_name_entry(state, filename);
84785+ else {
84786+ preempt_disable();
84787+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
84788+
84789+ nmatch = __lookup_name_entry(state, tmpname);
84790+ preempt_enable();
84791+ }
84792+ tmpsubj = NULL;
84793+ if (nmatch) {
84794+ if (nmatch->deleted)
84795+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
84796+ else
84797+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
84798+ }
84799+ /* this also works for the reload case -- if we don't match a potentially inherited subject
84800+ then we fall back to a normal lookup based on the binary's ino/dev
84801+ */
84802+ if (tmpsubj == NULL && fallback)
84803+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
84804+
84805+ return tmpsubj;
84806+}
84807+
84808+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
84809+{
84810+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
84811+}
84812+
84813+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
84814+{
84815+ struct acl_object_label *obj;
84816+ struct file *filp;
84817+
84818+ filp = task->exec_file;
84819+
84820+ task->acl = subj;
84821+ task->is_writable = 0;
84822+ /* ignore additional mmap checks for processes that are writable
84823+ by the default ACL */
84824+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
84825+ if (unlikely(obj->mode & GR_WRITE))
84826+ task->is_writable = 1;
84827+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
84828+ if (unlikely(obj->mode & GR_WRITE))
84829+ task->is_writable = 1;
84830+
84831+ gr_set_proc_res(task);
84832+
84833+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
84834+ 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);
84835+#endif
84836+}
84837+
84838+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
84839+{
84840+ __gr_apply_subject_to_task(&running_polstate, task, subj);
84841+}
84842+
84843+__u32
84844+gr_search_file(const struct dentry * dentry, const __u32 mode,
84845+ const struct vfsmount * mnt)
84846+{
84847+ __u32 retval = mode;
84848+ struct acl_subject_label *curracl;
84849+ struct acl_object_label *currobj;
84850+
84851+ if (unlikely(!(gr_status & GR_READY)))
84852+ return (mode & ~GR_AUDITS);
84853+
84854+ curracl = current->acl;
84855+
84856+ currobj = chk_obj_label(dentry, mnt, curracl);
84857+ retval = currobj->mode & mode;
84858+
84859+ /* if we're opening a specified transfer file for writing
84860+ (e.g. /dev/initctl), then transfer our role to init
84861+ */
84862+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
84863+ current->role->roletype & GR_ROLE_PERSIST)) {
84864+ struct task_struct *task = init_pid_ns.child_reaper;
84865+
84866+ if (task->role != current->role) {
84867+ struct acl_subject_label *subj;
84868+
84869+ task->acl_sp_role = 0;
84870+ task->acl_role_id = current->acl_role_id;
84871+ task->role = current->role;
84872+ rcu_read_lock();
84873+ read_lock(&grsec_exec_file_lock);
84874+ subj = gr_get_subject_for_task(task, NULL, 1);
84875+ gr_apply_subject_to_task(task, subj);
84876+ read_unlock(&grsec_exec_file_lock);
84877+ rcu_read_unlock();
84878+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
84879+ }
84880+ }
84881+
84882+ if (unlikely
84883+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
84884+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
84885+ __u32 new_mode = mode;
84886+
84887+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
84888+
84889+ retval = new_mode;
84890+
84891+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
84892+ new_mode |= GR_INHERIT;
84893+
84894+ if (!(mode & GR_NOLEARN))
84895+ gr_log_learn(dentry, mnt, new_mode);
84896+ }
84897+
84898+ return retval;
84899+}
84900+
84901+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
84902+ const struct dentry *parent,
84903+ const struct vfsmount *mnt)
84904+{
84905+ struct name_entry *match;
84906+ struct acl_object_label *matchpo;
84907+ struct acl_subject_label *curracl;
84908+ char *path;
84909+
84910+ if (unlikely(!(gr_status & GR_READY)))
84911+ return NULL;
84912+
84913+ preempt_disable();
84914+ path = gr_to_filename_rbac(new_dentry, mnt);
84915+ match = lookup_name_entry_create(path);
84916+
84917+ curracl = current->acl;
84918+
84919+ if (match) {
84920+ read_lock(&gr_inode_lock);
84921+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
84922+ read_unlock(&gr_inode_lock);
84923+
84924+ if (matchpo) {
84925+ preempt_enable();
84926+ return matchpo;
84927+ }
84928+ }
84929+
84930+ // lookup parent
84931+
84932+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
84933+
84934+ preempt_enable();
84935+ return matchpo;
84936+}
84937+
84938+__u32
84939+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
84940+ const struct vfsmount * mnt, const __u32 mode)
84941+{
84942+ struct acl_object_label *matchpo;
84943+ __u32 retval;
84944+
84945+ if (unlikely(!(gr_status & GR_READY)))
84946+ return (mode & ~GR_AUDITS);
84947+
84948+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
84949+
84950+ retval = matchpo->mode & mode;
84951+
84952+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
84953+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
84954+ __u32 new_mode = mode;
84955+
84956+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
84957+
84958+ gr_log_learn(new_dentry, mnt, new_mode);
84959+ return new_mode;
84960+ }
84961+
84962+ return retval;
84963+}
84964+
84965+__u32
84966+gr_check_link(const struct dentry * new_dentry,
84967+ const struct dentry * parent_dentry,
84968+ const struct vfsmount * parent_mnt,
84969+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
84970+{
84971+ struct acl_object_label *obj;
84972+ __u32 oldmode, newmode;
84973+ __u32 needmode;
84974+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
84975+ GR_DELETE | GR_INHERIT;
84976+
84977+ if (unlikely(!(gr_status & GR_READY)))
84978+ return (GR_CREATE | GR_LINK);
84979+
84980+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
84981+ oldmode = obj->mode;
84982+
84983+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
84984+ newmode = obj->mode;
84985+
84986+ needmode = newmode & checkmodes;
84987+
84988+ // old name for hardlink must have at least the permissions of the new name
84989+ if ((oldmode & needmode) != needmode)
84990+ goto bad;
84991+
84992+ // if old name had restrictions/auditing, make sure the new name does as well
84993+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
84994+
84995+ // don't allow hardlinking of suid/sgid/fcapped files without permission
84996+ if (is_privileged_binary(old_dentry))
84997+ needmode |= GR_SETID;
84998+
84999+ if ((newmode & needmode) != needmode)
85000+ goto bad;
85001+
85002+ // enforce minimum permissions
85003+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
85004+ return newmode;
85005+bad:
85006+ needmode = oldmode;
85007+ if (is_privileged_binary(old_dentry))
85008+ needmode |= GR_SETID;
85009+
85010+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
85011+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
85012+ return (GR_CREATE | GR_LINK);
85013+ } else if (newmode & GR_SUPPRESS)
85014+ return GR_SUPPRESS;
85015+ else
85016+ return 0;
85017+}
85018+
85019+int
85020+gr_check_hidden_task(const struct task_struct *task)
85021+{
85022+ if (unlikely(!(gr_status & GR_READY)))
85023+ return 0;
85024+
85025+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
85026+ return 1;
85027+
85028+ return 0;
85029+}
85030+
85031+int
85032+gr_check_protected_task(const struct task_struct *task)
85033+{
85034+ if (unlikely(!(gr_status & GR_READY) || !task))
85035+ return 0;
85036+
85037+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85038+ task->acl != current->acl)
85039+ return 1;
85040+
85041+ return 0;
85042+}
85043+
85044+int
85045+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
85046+{
85047+ struct task_struct *p;
85048+ int ret = 0;
85049+
85050+ if (unlikely(!(gr_status & GR_READY) || !pid))
85051+ return ret;
85052+
85053+ read_lock(&tasklist_lock);
85054+ do_each_pid_task(pid, type, p) {
85055+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85056+ p->acl != current->acl) {
85057+ ret = 1;
85058+ goto out;
85059+ }
85060+ } while_each_pid_task(pid, type, p);
85061+out:
85062+ read_unlock(&tasklist_lock);
85063+
85064+ return ret;
85065+}
85066+
85067+void
85068+gr_copy_label(struct task_struct *tsk)
85069+{
85070+ struct task_struct *p = current;
85071+
85072+ tsk->inherited = p->inherited;
85073+ tsk->acl_sp_role = 0;
85074+ tsk->acl_role_id = p->acl_role_id;
85075+ tsk->acl = p->acl;
85076+ tsk->role = p->role;
85077+ tsk->signal->used_accept = 0;
85078+ tsk->signal->curr_ip = p->signal->curr_ip;
85079+ tsk->signal->saved_ip = p->signal->saved_ip;
85080+ if (p->exec_file)
85081+ get_file(p->exec_file);
85082+ tsk->exec_file = p->exec_file;
85083+ tsk->is_writable = p->is_writable;
85084+ if (unlikely(p->signal->used_accept)) {
85085+ p->signal->curr_ip = 0;
85086+ p->signal->saved_ip = 0;
85087+ }
85088+
85089+ return;
85090+}
85091+
85092+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
85093+
85094+int
85095+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85096+{
85097+ unsigned int i;
85098+ __u16 num;
85099+ uid_t *uidlist;
85100+ uid_t curuid;
85101+ int realok = 0;
85102+ int effectiveok = 0;
85103+ int fsok = 0;
85104+ uid_t globalreal, globaleffective, globalfs;
85105+
85106+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
85107+ struct user_struct *user;
85108+
85109+ if (!uid_valid(real))
85110+ goto skipit;
85111+
85112+ /* find user based on global namespace */
85113+
85114+ globalreal = GR_GLOBAL_UID(real);
85115+
85116+ user = find_user(make_kuid(&init_user_ns, globalreal));
85117+ if (user == NULL)
85118+ goto skipit;
85119+
85120+ if (gr_process_kernel_setuid_ban(user)) {
85121+ /* for find_user */
85122+ free_uid(user);
85123+ return 1;
85124+ }
85125+
85126+ /* for find_user */
85127+ free_uid(user);
85128+
85129+skipit:
85130+#endif
85131+
85132+ if (unlikely(!(gr_status & GR_READY)))
85133+ return 0;
85134+
85135+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85136+ gr_log_learn_uid_change(real, effective, fs);
85137+
85138+ num = current->acl->user_trans_num;
85139+ uidlist = current->acl->user_transitions;
85140+
85141+ if (uidlist == NULL)
85142+ return 0;
85143+
85144+ if (!uid_valid(real)) {
85145+ realok = 1;
85146+ globalreal = (uid_t)-1;
85147+ } else {
85148+ globalreal = GR_GLOBAL_UID(real);
85149+ }
85150+ if (!uid_valid(effective)) {
85151+ effectiveok = 1;
85152+ globaleffective = (uid_t)-1;
85153+ } else {
85154+ globaleffective = GR_GLOBAL_UID(effective);
85155+ }
85156+ if (!uid_valid(fs)) {
85157+ fsok = 1;
85158+ globalfs = (uid_t)-1;
85159+ } else {
85160+ globalfs = GR_GLOBAL_UID(fs);
85161+ }
85162+
85163+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
85164+ for (i = 0; i < num; i++) {
85165+ curuid = uidlist[i];
85166+ if (globalreal == curuid)
85167+ realok = 1;
85168+ if (globaleffective == curuid)
85169+ effectiveok = 1;
85170+ if (globalfs == curuid)
85171+ fsok = 1;
85172+ }
85173+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
85174+ for (i = 0; i < num; i++) {
85175+ curuid = uidlist[i];
85176+ if (globalreal == curuid)
85177+ break;
85178+ if (globaleffective == curuid)
85179+ break;
85180+ if (globalfs == curuid)
85181+ break;
85182+ }
85183+ /* not in deny list */
85184+ if (i == num) {
85185+ realok = 1;
85186+ effectiveok = 1;
85187+ fsok = 1;
85188+ }
85189+ }
85190+
85191+ if (realok && effectiveok && fsok)
85192+ return 0;
85193+ else {
85194+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85195+ return 1;
85196+ }
85197+}
85198+
85199+int
85200+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85201+{
85202+ unsigned int i;
85203+ __u16 num;
85204+ gid_t *gidlist;
85205+ gid_t curgid;
85206+ int realok = 0;
85207+ int effectiveok = 0;
85208+ int fsok = 0;
85209+ gid_t globalreal, globaleffective, globalfs;
85210+
85211+ if (unlikely(!(gr_status & GR_READY)))
85212+ return 0;
85213+
85214+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85215+ gr_log_learn_gid_change(real, effective, fs);
85216+
85217+ num = current->acl->group_trans_num;
85218+ gidlist = current->acl->group_transitions;
85219+
85220+ if (gidlist == NULL)
85221+ return 0;
85222+
85223+ if (!gid_valid(real)) {
85224+ realok = 1;
85225+ globalreal = (gid_t)-1;
85226+ } else {
85227+ globalreal = GR_GLOBAL_GID(real);
85228+ }
85229+ if (!gid_valid(effective)) {
85230+ effectiveok = 1;
85231+ globaleffective = (gid_t)-1;
85232+ } else {
85233+ globaleffective = GR_GLOBAL_GID(effective);
85234+ }
85235+ if (!gid_valid(fs)) {
85236+ fsok = 1;
85237+ globalfs = (gid_t)-1;
85238+ } else {
85239+ globalfs = GR_GLOBAL_GID(fs);
85240+ }
85241+
85242+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
85243+ for (i = 0; i < num; i++) {
85244+ curgid = gidlist[i];
85245+ if (globalreal == curgid)
85246+ realok = 1;
85247+ if (globaleffective == curgid)
85248+ effectiveok = 1;
85249+ if (globalfs == curgid)
85250+ fsok = 1;
85251+ }
85252+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
85253+ for (i = 0; i < num; i++) {
85254+ curgid = gidlist[i];
85255+ if (globalreal == curgid)
85256+ break;
85257+ if (globaleffective == curgid)
85258+ break;
85259+ if (globalfs == curgid)
85260+ break;
85261+ }
85262+ /* not in deny list */
85263+ if (i == num) {
85264+ realok = 1;
85265+ effectiveok = 1;
85266+ fsok = 1;
85267+ }
85268+ }
85269+
85270+ if (realok && effectiveok && fsok)
85271+ return 0;
85272+ else {
85273+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85274+ return 1;
85275+ }
85276+}
85277+
85278+extern int gr_acl_is_capable(const int cap);
85279+
85280+void
85281+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
85282+{
85283+ struct acl_role_label *role = task->role;
85284+ struct acl_role_label *origrole = role;
85285+ struct acl_subject_label *subj = NULL;
85286+ struct acl_object_label *obj;
85287+ struct file *filp;
85288+ uid_t uid;
85289+ gid_t gid;
85290+
85291+ if (unlikely(!(gr_status & GR_READY)))
85292+ return;
85293+
85294+ uid = GR_GLOBAL_UID(kuid);
85295+ gid = GR_GLOBAL_GID(kgid);
85296+
85297+ filp = task->exec_file;
85298+
85299+ /* kernel process, we'll give them the kernel role */
85300+ if (unlikely(!filp)) {
85301+ task->role = running_polstate.kernel_role;
85302+ task->acl = running_polstate.kernel_role->root_label;
85303+ return;
85304+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
85305+ /* save the current ip at time of role lookup so that the proper
85306+ IP will be learned for role_allowed_ip */
85307+ task->signal->saved_ip = task->signal->curr_ip;
85308+ role = lookup_acl_role_label(task, uid, gid);
85309+ }
85310+
85311+ /* don't change the role if we're not a privileged process */
85312+ if (role && task->role != role &&
85313+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
85314+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
85315+ return;
85316+
85317+ task->role = role;
85318+
85319+ if (task->inherited) {
85320+ /* if we reached our subject through inheritance, then first see
85321+ if there's a subject of the same name in the new role that has
85322+ an object that would result in the same inherited subject
85323+ */
85324+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
85325+ if (subj) {
85326+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
85327+ if (!(obj->mode & GR_INHERIT))
85328+ subj = NULL;
85329+ }
85330+
85331+ }
85332+ if (subj == NULL) {
85333+ /* otherwise:
85334+ perform subject lookup in possibly new role
85335+ we can use this result below in the case where role == task->role
85336+ */
85337+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
85338+ }
85339+
85340+ /* if we changed uid/gid, but result in the same role
85341+ and are using inheritance, don't lose the inherited subject
85342+ if current subject is other than what normal lookup
85343+ would result in, we arrived via inheritance, don't
85344+ lose subject
85345+ */
85346+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
85347+ (subj == task->acl)))
85348+ task->acl = subj;
85349+
85350+ /* leave task->inherited unaffected */
85351+
85352+ task->is_writable = 0;
85353+
85354+ /* ignore additional mmap checks for processes that are writable
85355+ by the default ACL */
85356+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
85357+ if (unlikely(obj->mode & GR_WRITE))
85358+ task->is_writable = 1;
85359+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
85360+ if (unlikely(obj->mode & GR_WRITE))
85361+ task->is_writable = 1;
85362+
85363+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85364+ 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);
85365+#endif
85366+
85367+ gr_set_proc_res(task);
85368+
85369+ return;
85370+}
85371+
85372+int
85373+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
85374+ const int unsafe_flags)
85375+{
85376+ struct task_struct *task = current;
85377+ struct acl_subject_label *newacl;
85378+ struct acl_object_label *obj;
85379+ __u32 retmode;
85380+
85381+ if (unlikely(!(gr_status & GR_READY)))
85382+ return 0;
85383+
85384+ newacl = chk_subj_label(dentry, mnt, task->role);
85385+
85386+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
85387+ did an exec
85388+ */
85389+ rcu_read_lock();
85390+ read_lock(&tasklist_lock);
85391+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
85392+ (task->parent->acl->mode & GR_POVERRIDE))) {
85393+ read_unlock(&tasklist_lock);
85394+ rcu_read_unlock();
85395+ goto skip_check;
85396+ }
85397+ read_unlock(&tasklist_lock);
85398+ rcu_read_unlock();
85399+
85400+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
85401+ !(task->role->roletype & GR_ROLE_GOD) &&
85402+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
85403+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85404+ if (unsafe_flags & LSM_UNSAFE_SHARE)
85405+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
85406+ else
85407+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
85408+ return -EACCES;
85409+ }
85410+
85411+skip_check:
85412+
85413+ obj = chk_obj_label(dentry, mnt, task->acl);
85414+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
85415+
85416+ if (!(task->acl->mode & GR_INHERITLEARN) &&
85417+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
85418+ if (obj->nested)
85419+ task->acl = obj->nested;
85420+ else
85421+ task->acl = newacl;
85422+ task->inherited = 0;
85423+ } else {
85424+ task->inherited = 1;
85425+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
85426+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
85427+ }
85428+
85429+ task->is_writable = 0;
85430+
85431+ /* ignore additional mmap checks for processes that are writable
85432+ by the default ACL */
85433+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
85434+ if (unlikely(obj->mode & GR_WRITE))
85435+ task->is_writable = 1;
85436+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
85437+ if (unlikely(obj->mode & GR_WRITE))
85438+ task->is_writable = 1;
85439+
85440+ gr_set_proc_res(task);
85441+
85442+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85443+ 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);
85444+#endif
85445+ return 0;
85446+}
85447+
85448+/* always called with valid inodev ptr */
85449+static void
85450+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
85451+{
85452+ struct acl_object_label *matchpo;
85453+ struct acl_subject_label *matchps;
85454+ struct acl_subject_label *subj;
85455+ struct acl_role_label *role;
85456+ unsigned int x;
85457+
85458+ FOR_EACH_ROLE_START(role)
85459+ FOR_EACH_SUBJECT_START(role, subj, x)
85460+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85461+ matchpo->mode |= GR_DELETED;
85462+ FOR_EACH_SUBJECT_END(subj,x)
85463+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85464+ /* nested subjects aren't in the role's subj_hash table */
85465+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85466+ matchpo->mode |= GR_DELETED;
85467+ FOR_EACH_NESTED_SUBJECT_END(subj)
85468+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
85469+ matchps->mode |= GR_DELETED;
85470+ FOR_EACH_ROLE_END(role)
85471+
85472+ inodev->nentry->deleted = 1;
85473+
85474+ return;
85475+}
85476+
85477+void
85478+gr_handle_delete(const u64 ino, const dev_t dev)
85479+{
85480+ struct inodev_entry *inodev;
85481+
85482+ if (unlikely(!(gr_status & GR_READY)))
85483+ return;
85484+
85485+ write_lock(&gr_inode_lock);
85486+ inodev = lookup_inodev_entry(ino, dev);
85487+ if (inodev != NULL)
85488+ do_handle_delete(inodev, ino, dev);
85489+ write_unlock(&gr_inode_lock);
85490+
85491+ return;
85492+}
85493+
85494+static void
85495+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
85496+ const u64 newinode, const dev_t newdevice,
85497+ struct acl_subject_label *subj)
85498+{
85499+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
85500+ struct acl_object_label *match;
85501+
85502+ match = subj->obj_hash[index];
85503+
85504+ while (match && (match->inode != oldinode ||
85505+ match->device != olddevice ||
85506+ !(match->mode & GR_DELETED)))
85507+ match = match->next;
85508+
85509+ if (match && (match->inode == oldinode)
85510+ && (match->device == olddevice)
85511+ && (match->mode & GR_DELETED)) {
85512+ if (match->prev == NULL) {
85513+ subj->obj_hash[index] = match->next;
85514+ if (match->next != NULL)
85515+ match->next->prev = NULL;
85516+ } else {
85517+ match->prev->next = match->next;
85518+ if (match->next != NULL)
85519+ match->next->prev = match->prev;
85520+ }
85521+ match->prev = NULL;
85522+ match->next = NULL;
85523+ match->inode = newinode;
85524+ match->device = newdevice;
85525+ match->mode &= ~GR_DELETED;
85526+
85527+ insert_acl_obj_label(match, subj);
85528+ }
85529+
85530+ return;
85531+}
85532+
85533+static void
85534+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
85535+ const u64 newinode, const dev_t newdevice,
85536+ struct acl_role_label *role)
85537+{
85538+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
85539+ struct acl_subject_label *match;
85540+
85541+ match = role->subj_hash[index];
85542+
85543+ while (match && (match->inode != oldinode ||
85544+ match->device != olddevice ||
85545+ !(match->mode & GR_DELETED)))
85546+ match = match->next;
85547+
85548+ if (match && (match->inode == oldinode)
85549+ && (match->device == olddevice)
85550+ && (match->mode & GR_DELETED)) {
85551+ if (match->prev == NULL) {
85552+ role->subj_hash[index] = match->next;
85553+ if (match->next != NULL)
85554+ match->next->prev = NULL;
85555+ } else {
85556+ match->prev->next = match->next;
85557+ if (match->next != NULL)
85558+ match->next->prev = match->prev;
85559+ }
85560+ match->prev = NULL;
85561+ match->next = NULL;
85562+ match->inode = newinode;
85563+ match->device = newdevice;
85564+ match->mode &= ~GR_DELETED;
85565+
85566+ insert_acl_subj_label(match, role);
85567+ }
85568+
85569+ return;
85570+}
85571+
85572+static void
85573+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
85574+ const u64 newinode, const dev_t newdevice)
85575+{
85576+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
85577+ struct inodev_entry *match;
85578+
85579+ match = running_polstate.inodev_set.i_hash[index];
85580+
85581+ while (match && (match->nentry->inode != oldinode ||
85582+ match->nentry->device != olddevice || !match->nentry->deleted))
85583+ match = match->next;
85584+
85585+ if (match && (match->nentry->inode == oldinode)
85586+ && (match->nentry->device == olddevice) &&
85587+ match->nentry->deleted) {
85588+ if (match->prev == NULL) {
85589+ running_polstate.inodev_set.i_hash[index] = match->next;
85590+ if (match->next != NULL)
85591+ match->next->prev = NULL;
85592+ } else {
85593+ match->prev->next = match->next;
85594+ if (match->next != NULL)
85595+ match->next->prev = match->prev;
85596+ }
85597+ match->prev = NULL;
85598+ match->next = NULL;
85599+ match->nentry->inode = newinode;
85600+ match->nentry->device = newdevice;
85601+ match->nentry->deleted = 0;
85602+
85603+ insert_inodev_entry(match);
85604+ }
85605+
85606+ return;
85607+}
85608+
85609+static void
85610+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
85611+{
85612+ struct acl_subject_label *subj;
85613+ struct acl_role_label *role;
85614+ unsigned int x;
85615+
85616+ FOR_EACH_ROLE_START(role)
85617+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
85618+
85619+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85620+ if ((subj->inode == ino) && (subj->device == dev)) {
85621+ subj->inode = ino;
85622+ subj->device = dev;
85623+ }
85624+ /* nested subjects aren't in the role's subj_hash table */
85625+ update_acl_obj_label(matchn->inode, matchn->device,
85626+ ino, dev, subj);
85627+ FOR_EACH_NESTED_SUBJECT_END(subj)
85628+ FOR_EACH_SUBJECT_START(role, subj, x)
85629+ update_acl_obj_label(matchn->inode, matchn->device,
85630+ ino, dev, subj);
85631+ FOR_EACH_SUBJECT_END(subj,x)
85632+ FOR_EACH_ROLE_END(role)
85633+
85634+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
85635+
85636+ return;
85637+}
85638+
85639+static void
85640+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
85641+ const struct vfsmount *mnt)
85642+{
85643+ u64 ino = __get_ino(dentry);
85644+ dev_t dev = __get_dev(dentry);
85645+
85646+ __do_handle_create(matchn, ino, dev);
85647+
85648+ return;
85649+}
85650+
85651+void
85652+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
85653+{
85654+ struct name_entry *matchn;
85655+
85656+ if (unlikely(!(gr_status & GR_READY)))
85657+ return;
85658+
85659+ preempt_disable();
85660+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
85661+
85662+ if (unlikely((unsigned long)matchn)) {
85663+ write_lock(&gr_inode_lock);
85664+ do_handle_create(matchn, dentry, mnt);
85665+ write_unlock(&gr_inode_lock);
85666+ }
85667+ preempt_enable();
85668+
85669+ return;
85670+}
85671+
85672+void
85673+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
85674+{
85675+ struct name_entry *matchn;
85676+
85677+ if (unlikely(!(gr_status & GR_READY)))
85678+ return;
85679+
85680+ preempt_disable();
85681+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
85682+
85683+ if (unlikely((unsigned long)matchn)) {
85684+ write_lock(&gr_inode_lock);
85685+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
85686+ write_unlock(&gr_inode_lock);
85687+ }
85688+ preempt_enable();
85689+
85690+ return;
85691+}
85692+
85693+void
85694+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
85695+ struct dentry *old_dentry,
85696+ struct dentry *new_dentry,
85697+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
85698+{
85699+ struct name_entry *matchn;
85700+ struct name_entry *matchn2 = NULL;
85701+ struct inodev_entry *inodev;
85702+ struct inode *inode = d_backing_inode(new_dentry);
85703+ struct inode *old_inode = d_backing_inode(old_dentry);
85704+ u64 old_ino = __get_ino(old_dentry);
85705+ dev_t old_dev = __get_dev(old_dentry);
85706+ unsigned int exchange = flags & RENAME_EXCHANGE;
85707+
85708+ /* vfs_rename swaps the name and parent link for old_dentry and
85709+ new_dentry
85710+ at this point, old_dentry has the new name, parent link, and inode
85711+ for the renamed file
85712+ if a file is being replaced by a rename, new_dentry has the inode
85713+ and name for the replaced file
85714+ */
85715+
85716+ if (unlikely(!(gr_status & GR_READY)))
85717+ return;
85718+
85719+ preempt_disable();
85720+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
85721+
85722+ /* exchange cases:
85723+ a filename exists for the source, but not dest
85724+ do a recreate on source
85725+ a filename exists for the dest, but not source
85726+ do a recreate on dest
85727+ a filename exists for both source and dest
85728+ delete source and dest, then create source and dest
85729+ a filename exists for neither source nor dest
85730+ no updates needed
85731+
85732+ the name entry lookups get us the old inode/dev associated with
85733+ each name, so do the deletes first (if possible) so that when
85734+ we do the create, we pick up on the right entries
85735+ */
85736+
85737+ if (exchange)
85738+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
85739+
85740+ /* we wouldn't have to check d_inode if it weren't for
85741+ NFS silly-renaming
85742+ */
85743+
85744+ write_lock(&gr_inode_lock);
85745+ if (unlikely((replace || exchange) && inode)) {
85746+ u64 new_ino = __get_ino(new_dentry);
85747+ dev_t new_dev = __get_dev(new_dentry);
85748+
85749+ inodev = lookup_inodev_entry(new_ino, new_dev);
85750+ if (inodev != NULL && ((inode->i_nlink <= 1) || d_is_dir(new_dentry)))
85751+ do_handle_delete(inodev, new_ino, new_dev);
85752+ }
85753+
85754+ inodev = lookup_inodev_entry(old_ino, old_dev);
85755+ if (inodev != NULL && ((old_inode->i_nlink <= 1) || d_is_dir(old_dentry)))
85756+ do_handle_delete(inodev, old_ino, old_dev);
85757+
85758+ if (unlikely(matchn != NULL))
85759+ do_handle_create(matchn, old_dentry, mnt);
85760+
85761+ if (unlikely(matchn2 != NULL))
85762+ do_handle_create(matchn2, new_dentry, mnt);
85763+
85764+ write_unlock(&gr_inode_lock);
85765+ preempt_enable();
85766+
85767+ return;
85768+}
85769+
85770+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
85771+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
85772+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
85773+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
85774+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
85775+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
85776+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
85777+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
85778+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
85779+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
85780+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
85781+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
85782+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
85783+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
85784+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
85785+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
85786+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
85787+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
85788+};
85789+
85790+void
85791+gr_learn_resource(const struct task_struct *task,
85792+ const int res, const unsigned long wanted, const int gt)
85793+{
85794+ struct acl_subject_label *acl;
85795+ const struct cred *cred;
85796+
85797+ if (unlikely((gr_status & GR_READY) &&
85798+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
85799+ goto skip_reslog;
85800+
85801+ gr_log_resource(task, res, wanted, gt);
85802+skip_reslog:
85803+
85804+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
85805+ return;
85806+
85807+ acl = task->acl;
85808+
85809+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
85810+ !(acl->resmask & (1U << (unsigned short) res))))
85811+ return;
85812+
85813+ if (wanted >= acl->res[res].rlim_cur) {
85814+ unsigned long res_add;
85815+
85816+ res_add = wanted + res_learn_bumps[res];
85817+
85818+ acl->res[res].rlim_cur = res_add;
85819+
85820+ if (wanted > acl->res[res].rlim_max)
85821+ acl->res[res].rlim_max = res_add;
85822+
85823+ /* only log the subject filename, since resource logging is supported for
85824+ single-subject learning only */
85825+ rcu_read_lock();
85826+ cred = __task_cred(task);
85827+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
85828+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
85829+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
85830+ "", (unsigned long) res, &task->signal->saved_ip);
85831+ rcu_read_unlock();
85832+ }
85833+
85834+ return;
85835+}
85836+EXPORT_SYMBOL_GPL(gr_learn_resource);
85837+#endif
85838+
85839+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
85840+void
85841+pax_set_initial_flags(struct linux_binprm *bprm)
85842+{
85843+ struct task_struct *task = current;
85844+ struct acl_subject_label *proc;
85845+ unsigned long flags;
85846+
85847+ if (unlikely(!(gr_status & GR_READY)))
85848+ return;
85849+
85850+ flags = pax_get_flags(task);
85851+
85852+ proc = task->acl;
85853+
85854+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
85855+ flags &= ~MF_PAX_PAGEEXEC;
85856+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
85857+ flags &= ~MF_PAX_SEGMEXEC;
85858+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
85859+ flags &= ~MF_PAX_RANDMMAP;
85860+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
85861+ flags &= ~MF_PAX_EMUTRAMP;
85862+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
85863+ flags &= ~MF_PAX_MPROTECT;
85864+
85865+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
85866+ flags |= MF_PAX_PAGEEXEC;
85867+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
85868+ flags |= MF_PAX_SEGMEXEC;
85869+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
85870+ flags |= MF_PAX_RANDMMAP;
85871+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
85872+ flags |= MF_PAX_EMUTRAMP;
85873+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
85874+ flags |= MF_PAX_MPROTECT;
85875+
85876+ pax_set_flags(task, flags);
85877+
85878+ return;
85879+}
85880+#endif
85881+
85882+int
85883+gr_handle_proc_ptrace(struct task_struct *task)
85884+{
85885+ struct file *filp;
85886+ struct task_struct *tmp = task;
85887+ struct task_struct *curtemp = current;
85888+ __u32 retmode;
85889+
85890+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
85891+ if (unlikely(!(gr_status & GR_READY)))
85892+ return 0;
85893+#endif
85894+
85895+ read_lock(&tasklist_lock);
85896+ read_lock(&grsec_exec_file_lock);
85897+ filp = task->exec_file;
85898+
85899+ while (task_pid_nr(tmp) > 0) {
85900+ if (tmp == curtemp)
85901+ break;
85902+ tmp = tmp->real_parent;
85903+ }
85904+
85905+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
85906+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
85907+ read_unlock(&grsec_exec_file_lock);
85908+ read_unlock(&tasklist_lock);
85909+ return 1;
85910+ }
85911+
85912+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85913+ if (!(gr_status & GR_READY)) {
85914+ read_unlock(&grsec_exec_file_lock);
85915+ read_unlock(&tasklist_lock);
85916+ return 0;
85917+ }
85918+#endif
85919+
85920+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
85921+ read_unlock(&grsec_exec_file_lock);
85922+ read_unlock(&tasklist_lock);
85923+
85924+ if (retmode & GR_NOPTRACE)
85925+ return 1;
85926+
85927+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
85928+ && (current->acl != task->acl || (current->acl != current->role->root_label
85929+ && task_pid_nr(current) != task_pid_nr(task))))
85930+ return 1;
85931+
85932+ return 0;
85933+}
85934+
85935+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
85936+{
85937+ if (unlikely(!(gr_status & GR_READY)))
85938+ return;
85939+
85940+ if (!(current->role->roletype & GR_ROLE_GOD))
85941+ return;
85942+
85943+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
85944+ p->role->rolename, gr_task_roletype_to_char(p),
85945+ p->acl->filename);
85946+}
85947+
85948+int
85949+gr_handle_ptrace(struct task_struct *task, const long request)
85950+{
85951+ struct task_struct *tmp = task;
85952+ struct task_struct *curtemp = current;
85953+ __u32 retmode;
85954+
85955+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
85956+ if (unlikely(!(gr_status & GR_READY)))
85957+ return 0;
85958+#endif
85959+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
85960+ read_lock(&tasklist_lock);
85961+ while (task_pid_nr(tmp) > 0) {
85962+ if (tmp == curtemp)
85963+ break;
85964+ tmp = tmp->real_parent;
85965+ }
85966+
85967+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
85968+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
85969+ read_unlock(&tasklist_lock);
85970+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
85971+ return 1;
85972+ }
85973+ read_unlock(&tasklist_lock);
85974+ }
85975+
85976+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85977+ if (!(gr_status & GR_READY))
85978+ return 0;
85979+#endif
85980+
85981+ read_lock(&grsec_exec_file_lock);
85982+ if (unlikely(!task->exec_file)) {
85983+ read_unlock(&grsec_exec_file_lock);
85984+ return 0;
85985+ }
85986+
85987+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
85988+ read_unlock(&grsec_exec_file_lock);
85989+
85990+ if (retmode & GR_NOPTRACE) {
85991+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
85992+ return 1;
85993+ }
85994+
85995+ if (retmode & GR_PTRACERD) {
85996+ switch (request) {
85997+ case PTRACE_SEIZE:
85998+ case PTRACE_POKETEXT:
85999+ case PTRACE_POKEDATA:
86000+ case PTRACE_POKEUSR:
86001+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
86002+ case PTRACE_SETREGS:
86003+ case PTRACE_SETFPREGS:
86004+#endif
86005+#ifdef CONFIG_X86
86006+ case PTRACE_SETFPXREGS:
86007+#endif
86008+#ifdef CONFIG_ALTIVEC
86009+ case PTRACE_SETVRREGS:
86010+#endif
86011+ return 1;
86012+ default:
86013+ return 0;
86014+ }
86015+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
86016+ !(current->role->roletype & GR_ROLE_GOD) &&
86017+ (current->acl != task->acl)) {
86018+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86019+ return 1;
86020+ }
86021+
86022+ return 0;
86023+}
86024+
86025+static int is_writable_mmap(const struct file *filp)
86026+{
86027+ struct task_struct *task = current;
86028+ struct acl_object_label *obj, *obj2;
86029+ struct dentry *dentry = filp->f_path.dentry;
86030+ struct vfsmount *mnt = filp->f_path.mnt;
86031+ struct inode *inode = d_backing_inode(dentry);
86032+
86033+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
86034+ !task->is_writable && d_is_reg(dentry) && (mnt != shm_mnt || (inode->i_nlink > 0))) {
86035+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
86036+ obj2 = chk_obj_label(dentry, mnt, task->role->root_label);
86037+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
86038+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, dentry, mnt);
86039+ return 1;
86040+ }
86041+ }
86042+ return 0;
86043+}
86044+
86045+int
86046+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
86047+{
86048+ __u32 mode;
86049+
86050+ if (unlikely(!file || !(prot & PROT_EXEC)))
86051+ return 1;
86052+
86053+ if (is_writable_mmap(file))
86054+ return 0;
86055+
86056+ mode =
86057+ gr_search_file(file->f_path.dentry,
86058+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86059+ file->f_path.mnt);
86060+
86061+ if (!gr_tpe_allow(file))
86062+ return 0;
86063+
86064+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86065+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86066+ return 0;
86067+ } else if (unlikely(!(mode & GR_EXEC))) {
86068+ return 0;
86069+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86070+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86071+ return 1;
86072+ }
86073+
86074+ return 1;
86075+}
86076+
86077+int
86078+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
86079+{
86080+ __u32 mode;
86081+
86082+ if (unlikely(!file || !(prot & PROT_EXEC)))
86083+ return 1;
86084+
86085+ if (is_writable_mmap(file))
86086+ return 0;
86087+
86088+ mode =
86089+ gr_search_file(file->f_path.dentry,
86090+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86091+ file->f_path.mnt);
86092+
86093+ if (!gr_tpe_allow(file))
86094+ return 0;
86095+
86096+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86097+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86098+ return 0;
86099+ } else if (unlikely(!(mode & GR_EXEC))) {
86100+ return 0;
86101+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86102+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86103+ return 1;
86104+ }
86105+
86106+ return 1;
86107+}
86108+
86109+void
86110+gr_acl_handle_psacct(struct task_struct *task, const long code)
86111+{
86112+ unsigned long runtime, cputime;
86113+ cputime_t utime, stime;
86114+ unsigned int wday, cday;
86115+ __u8 whr, chr;
86116+ __u8 wmin, cmin;
86117+ __u8 wsec, csec;
86118+ struct timespec curtime, starttime;
86119+
86120+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
86121+ !(task->acl->mode & GR_PROCACCT)))
86122+ return;
86123+
86124+ curtime = ns_to_timespec(ktime_get_ns());
86125+ starttime = ns_to_timespec(task->start_time);
86126+ runtime = curtime.tv_sec - starttime.tv_sec;
86127+ wday = runtime / (60 * 60 * 24);
86128+ runtime -= wday * (60 * 60 * 24);
86129+ whr = runtime / (60 * 60);
86130+ runtime -= whr * (60 * 60);
86131+ wmin = runtime / 60;
86132+ runtime -= wmin * 60;
86133+ wsec = runtime;
86134+
86135+ task_cputime(task, &utime, &stime);
86136+ cputime = cputime_to_secs(utime + stime);
86137+ cday = cputime / (60 * 60 * 24);
86138+ cputime -= cday * (60 * 60 * 24);
86139+ chr = cputime / (60 * 60);
86140+ cputime -= chr * (60 * 60);
86141+ cmin = cputime / 60;
86142+ cputime -= cmin * 60;
86143+ csec = cputime;
86144+
86145+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
86146+
86147+ return;
86148+}
86149+
86150+#ifdef CONFIG_TASKSTATS
86151+int gr_is_taskstats_denied(int pid)
86152+{
86153+ struct task_struct *task;
86154+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86155+ const struct cred *cred;
86156+#endif
86157+ int ret = 0;
86158+
86159+ /* restrict taskstats viewing to un-chrooted root users
86160+ who have the 'view' subject flag if the RBAC system is enabled
86161+ */
86162+
86163+ rcu_read_lock();
86164+ read_lock(&tasklist_lock);
86165+ task = find_task_by_vpid(pid);
86166+ if (task) {
86167+#ifdef CONFIG_GRKERNSEC_CHROOT
86168+ if (proc_is_chrooted(task))
86169+ ret = -EACCES;
86170+#endif
86171+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86172+ cred = __task_cred(task);
86173+#ifdef CONFIG_GRKERNSEC_PROC_USER
86174+ if (gr_is_global_nonroot(cred->uid))
86175+ ret = -EACCES;
86176+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86177+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
86178+ ret = -EACCES;
86179+#endif
86180+#endif
86181+ if (gr_status & GR_READY) {
86182+ if (!(task->acl->mode & GR_VIEW))
86183+ ret = -EACCES;
86184+ }
86185+ } else
86186+ ret = -ENOENT;
86187+
86188+ read_unlock(&tasklist_lock);
86189+ rcu_read_unlock();
86190+
86191+ return ret;
86192+}
86193+#endif
86194+
86195+/* AUXV entries are filled via a descendant of search_binary_handler
86196+ after we've already applied the subject for the target
86197+*/
86198+int gr_acl_enable_at_secure(void)
86199+{
86200+ if (unlikely(!(gr_status & GR_READY)))
86201+ return 0;
86202+
86203+ if (current->acl->mode & GR_ATSECURE)
86204+ return 1;
86205+
86206+ return 0;
86207+}
86208+
86209+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
86210+{
86211+ struct task_struct *task = current;
86212+ struct dentry *dentry = file->f_path.dentry;
86213+ struct vfsmount *mnt = file->f_path.mnt;
86214+ struct acl_object_label *obj, *tmp;
86215+ struct acl_subject_label *subj;
86216+ unsigned int bufsize;
86217+ int is_not_root;
86218+ char *path;
86219+ dev_t dev = __get_dev(dentry);
86220+
86221+ if (unlikely(!(gr_status & GR_READY)))
86222+ return 1;
86223+
86224+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
86225+ return 1;
86226+
86227+ /* ignore Eric Biederman */
86228+ if (IS_PRIVATE(d_backing_inode(dentry)))
86229+ return 1;
86230+
86231+ subj = task->acl;
86232+ read_lock(&gr_inode_lock);
86233+ do {
86234+ obj = lookup_acl_obj_label(ino, dev, subj);
86235+ if (obj != NULL) {
86236+ read_unlock(&gr_inode_lock);
86237+ return (obj->mode & GR_FIND) ? 1 : 0;
86238+ }
86239+ } while ((subj = subj->parent_subject));
86240+ read_unlock(&gr_inode_lock);
86241+
86242+ /* this is purely an optimization since we're looking for an object
86243+ for the directory we're doing a readdir on
86244+ if it's possible for any globbed object to match the entry we're
86245+ filling into the directory, then the object we find here will be
86246+ an anchor point with attached globbed objects
86247+ */
86248+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
86249+ if (obj->globbed == NULL)
86250+ return (obj->mode & GR_FIND) ? 1 : 0;
86251+
86252+ is_not_root = ((obj->filename[0] == '/') &&
86253+ (obj->filename[1] == '\0')) ? 0 : 1;
86254+ bufsize = PAGE_SIZE - namelen - is_not_root;
86255+
86256+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
86257+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
86258+ return 1;
86259+
86260+ preempt_disable();
86261+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
86262+ bufsize);
86263+
86264+ bufsize = strlen(path);
86265+
86266+ /* if base is "/", don't append an additional slash */
86267+ if (is_not_root)
86268+ *(path + bufsize) = '/';
86269+ memcpy(path + bufsize + is_not_root, name, namelen);
86270+ *(path + bufsize + namelen + is_not_root) = '\0';
86271+
86272+ tmp = obj->globbed;
86273+ while (tmp) {
86274+ if (!glob_match(tmp->filename, path)) {
86275+ preempt_enable();
86276+ return (tmp->mode & GR_FIND) ? 1 : 0;
86277+ }
86278+ tmp = tmp->next;
86279+ }
86280+ preempt_enable();
86281+ return (obj->mode & GR_FIND) ? 1 : 0;
86282+}
86283+
86284+void gr_put_exec_file(struct task_struct *task)
86285+{
86286+ struct file *filp;
86287+
86288+ write_lock(&grsec_exec_file_lock);
86289+ filp = task->exec_file;
86290+ task->exec_file = NULL;
86291+ write_unlock(&grsec_exec_file_lock);
86292+
86293+ if (filp)
86294+ fput(filp);
86295+
86296+ return;
86297+}
86298+
86299+
86300+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
86301+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
86302+#endif
86303+#ifdef CONFIG_SECURITY
86304+EXPORT_SYMBOL_GPL(gr_check_user_change);
86305+EXPORT_SYMBOL_GPL(gr_check_group_change);
86306+#endif
86307+
86308diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
86309new file mode 100644
86310index 0000000..9adc75c
86311--- /dev/null
86312+++ b/grsecurity/gracl_alloc.c
86313@@ -0,0 +1,105 @@
86314+#include <linux/kernel.h>
86315+#include <linux/mm.h>
86316+#include <linux/slab.h>
86317+#include <linux/vmalloc.h>
86318+#include <linux/gracl.h>
86319+#include <linux/grsecurity.h>
86320+
86321+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
86322+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
86323+
86324+static int
86325+alloc_pop(void)
86326+{
86327+ if (current_alloc_state->alloc_stack_next == 1)
86328+ return 0;
86329+
86330+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
86331+
86332+ current_alloc_state->alloc_stack_next--;
86333+
86334+ return 1;
86335+}
86336+
86337+static int
86338+alloc_push(void *buf)
86339+{
86340+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
86341+ return 1;
86342+
86343+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
86344+
86345+ current_alloc_state->alloc_stack_next++;
86346+
86347+ return 0;
86348+}
86349+
86350+void *
86351+acl_alloc(unsigned long len)
86352+{
86353+ void *ret = NULL;
86354+
86355+ if (!len || len > PAGE_SIZE)
86356+ goto out;
86357+
86358+ ret = kmalloc(len, GFP_KERNEL);
86359+
86360+ if (ret) {
86361+ if (alloc_push(ret)) {
86362+ kfree(ret);
86363+ ret = NULL;
86364+ }
86365+ }
86366+
86367+out:
86368+ return ret;
86369+}
86370+
86371+void *
86372+acl_alloc_num(unsigned long num, unsigned long len)
86373+{
86374+ if (!len || (num > (PAGE_SIZE / len)))
86375+ return NULL;
86376+
86377+ return acl_alloc(num * len);
86378+}
86379+
86380+void
86381+acl_free_all(void)
86382+{
86383+ if (!current_alloc_state->alloc_stack)
86384+ return;
86385+
86386+ while (alloc_pop()) ;
86387+
86388+ if (current_alloc_state->alloc_stack) {
86389+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
86390+ kfree(current_alloc_state->alloc_stack);
86391+ else
86392+ vfree(current_alloc_state->alloc_stack);
86393+ }
86394+
86395+ current_alloc_state->alloc_stack = NULL;
86396+ current_alloc_state->alloc_stack_size = 1;
86397+ current_alloc_state->alloc_stack_next = 1;
86398+
86399+ return;
86400+}
86401+
86402+int
86403+acl_alloc_stack_init(unsigned long size)
86404+{
86405+ if ((size * sizeof (void *)) <= PAGE_SIZE)
86406+ current_alloc_state->alloc_stack =
86407+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
86408+ else
86409+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
86410+
86411+ current_alloc_state->alloc_stack_size = size;
86412+ current_alloc_state->alloc_stack_next = 1;
86413+
86414+ if (!current_alloc_state->alloc_stack)
86415+ return 0;
86416+ else
86417+ return 1;
86418+}
86419diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
86420new file mode 100644
86421index 0000000..1a94c11
86422--- /dev/null
86423+++ b/grsecurity/gracl_cap.c
86424@@ -0,0 +1,127 @@
86425+#include <linux/kernel.h>
86426+#include <linux/module.h>
86427+#include <linux/sched.h>
86428+#include <linux/gracl.h>
86429+#include <linux/grsecurity.h>
86430+#include <linux/grinternal.h>
86431+
86432+extern const char *captab_log[];
86433+extern int captab_log_entries;
86434+
86435+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
86436+{
86437+ struct acl_subject_label *curracl;
86438+
86439+ if (!gr_acl_is_enabled())
86440+ return 1;
86441+
86442+ curracl = task->acl;
86443+
86444+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
86445+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
86446+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
86447+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
86448+ gr_to_filename(task->exec_file->f_path.dentry,
86449+ task->exec_file->f_path.mnt) : curracl->filename,
86450+ curracl->filename, 0UL,
86451+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
86452+ return 1;
86453+ }
86454+
86455+ return 0;
86456+}
86457+
86458+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
86459+{
86460+ struct acl_subject_label *curracl;
86461+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86462+ kernel_cap_t cap_audit = __cap_empty_set;
86463+
86464+ if (!gr_acl_is_enabled())
86465+ return 1;
86466+
86467+ curracl = task->acl;
86468+
86469+ cap_drop = curracl->cap_lower;
86470+ cap_mask = curracl->cap_mask;
86471+ cap_audit = curracl->cap_invert_audit;
86472+
86473+ while ((curracl = curracl->parent_subject)) {
86474+ /* if the cap isn't specified in the current computed mask but is specified in the
86475+ current level subject, and is lowered in the current level subject, then add
86476+ it to the set of dropped capabilities
86477+ otherwise, add the current level subject's mask to the current computed mask
86478+ */
86479+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86480+ cap_raise(cap_mask, cap);
86481+ if (cap_raised(curracl->cap_lower, cap))
86482+ cap_raise(cap_drop, cap);
86483+ if (cap_raised(curracl->cap_invert_audit, cap))
86484+ cap_raise(cap_audit, cap);
86485+ }
86486+ }
86487+
86488+ if (!cap_raised(cap_drop, cap)) {
86489+ if (cap_raised(cap_audit, cap))
86490+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
86491+ return 1;
86492+ }
86493+
86494+ /* only learn the capability use if the process has the capability in the
86495+ general case, the two uses in sys.c of gr_learn_cap are an exception
86496+ to this rule to ensure any role transition involves what the full-learned
86497+ policy believes in a privileged process
86498+ */
86499+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
86500+ return 1;
86501+
86502+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
86503+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
86504+
86505+ return 0;
86506+}
86507+
86508+int
86509+gr_acl_is_capable(const int cap)
86510+{
86511+ return gr_task_acl_is_capable(current, current_cred(), cap);
86512+}
86513+
86514+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
86515+{
86516+ struct acl_subject_label *curracl;
86517+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86518+
86519+ if (!gr_acl_is_enabled())
86520+ return 1;
86521+
86522+ curracl = task->acl;
86523+
86524+ cap_drop = curracl->cap_lower;
86525+ cap_mask = curracl->cap_mask;
86526+
86527+ while ((curracl = curracl->parent_subject)) {
86528+ /* if the cap isn't specified in the current computed mask but is specified in the
86529+ current level subject, and is lowered in the current level subject, then add
86530+ it to the set of dropped capabilities
86531+ otherwise, add the current level subject's mask to the current computed mask
86532+ */
86533+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86534+ cap_raise(cap_mask, cap);
86535+ if (cap_raised(curracl->cap_lower, cap))
86536+ cap_raise(cap_drop, cap);
86537+ }
86538+ }
86539+
86540+ if (!cap_raised(cap_drop, cap))
86541+ return 1;
86542+
86543+ return 0;
86544+}
86545+
86546+int
86547+gr_acl_is_capable_nolog(const int cap)
86548+{
86549+ return gr_task_acl_is_capable_nolog(current, cap);
86550+}
86551+
86552diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
86553new file mode 100644
86554index 0000000..a43dd06
86555--- /dev/null
86556+++ b/grsecurity/gracl_compat.c
86557@@ -0,0 +1,269 @@
86558+#include <linux/kernel.h>
86559+#include <linux/gracl.h>
86560+#include <linux/compat.h>
86561+#include <linux/gracl_compat.h>
86562+
86563+#include <asm/uaccess.h>
86564+
86565+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
86566+{
86567+ struct gr_arg_wrapper_compat uwrapcompat;
86568+
86569+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
86570+ return -EFAULT;
86571+
86572+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
86573+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
86574+ return -EINVAL;
86575+
86576+ uwrap->arg = compat_ptr(uwrapcompat.arg);
86577+ uwrap->version = uwrapcompat.version;
86578+ uwrap->size = sizeof(struct gr_arg);
86579+
86580+ return 0;
86581+}
86582+
86583+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
86584+{
86585+ struct gr_arg_compat argcompat;
86586+
86587+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
86588+ return -EFAULT;
86589+
86590+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
86591+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
86592+ arg->role_db.num_roles = argcompat.role_db.num_roles;
86593+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
86594+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
86595+ arg->role_db.num_objects = argcompat.role_db.num_objects;
86596+
86597+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
86598+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
86599+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
86600+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
86601+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
86602+ arg->segv_device = argcompat.segv_device;
86603+ arg->segv_inode = argcompat.segv_inode;
86604+ arg->segv_uid = argcompat.segv_uid;
86605+ arg->num_sprole_pws = argcompat.num_sprole_pws;
86606+ arg->mode = argcompat.mode;
86607+
86608+ return 0;
86609+}
86610+
86611+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
86612+{
86613+ struct acl_object_label_compat objcompat;
86614+
86615+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
86616+ return -EFAULT;
86617+
86618+ obj->filename = compat_ptr(objcompat.filename);
86619+ obj->inode = objcompat.inode;
86620+ obj->device = objcompat.device;
86621+ obj->mode = objcompat.mode;
86622+
86623+ obj->nested = compat_ptr(objcompat.nested);
86624+ obj->globbed = compat_ptr(objcompat.globbed);
86625+
86626+ obj->prev = compat_ptr(objcompat.prev);
86627+ obj->next = compat_ptr(objcompat.next);
86628+
86629+ return 0;
86630+}
86631+
86632+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
86633+{
86634+ unsigned int i;
86635+ struct acl_subject_label_compat subjcompat;
86636+
86637+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
86638+ return -EFAULT;
86639+
86640+ subj->filename = compat_ptr(subjcompat.filename);
86641+ subj->inode = subjcompat.inode;
86642+ subj->device = subjcompat.device;
86643+ subj->mode = subjcompat.mode;
86644+ subj->cap_mask = subjcompat.cap_mask;
86645+ subj->cap_lower = subjcompat.cap_lower;
86646+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
86647+
86648+ for (i = 0; i < GR_NLIMITS; i++) {
86649+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
86650+ subj->res[i].rlim_cur = RLIM_INFINITY;
86651+ else
86652+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
86653+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
86654+ subj->res[i].rlim_max = RLIM_INFINITY;
86655+ else
86656+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
86657+ }
86658+ subj->resmask = subjcompat.resmask;
86659+
86660+ subj->user_trans_type = subjcompat.user_trans_type;
86661+ subj->group_trans_type = subjcompat.group_trans_type;
86662+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
86663+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
86664+ subj->user_trans_num = subjcompat.user_trans_num;
86665+ subj->group_trans_num = subjcompat.group_trans_num;
86666+
86667+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
86668+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
86669+ subj->ip_type = subjcompat.ip_type;
86670+ subj->ips = compat_ptr(subjcompat.ips);
86671+ subj->ip_num = subjcompat.ip_num;
86672+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
86673+
86674+ subj->crashes = subjcompat.crashes;
86675+ subj->expires = subjcompat.expires;
86676+
86677+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
86678+ subj->hash = compat_ptr(subjcompat.hash);
86679+ subj->prev = compat_ptr(subjcompat.prev);
86680+ subj->next = compat_ptr(subjcompat.next);
86681+
86682+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
86683+ subj->obj_hash_size = subjcompat.obj_hash_size;
86684+ subj->pax_flags = subjcompat.pax_flags;
86685+
86686+ return 0;
86687+}
86688+
86689+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
86690+{
86691+ struct acl_role_label_compat rolecompat;
86692+
86693+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
86694+ return -EFAULT;
86695+
86696+ role->rolename = compat_ptr(rolecompat.rolename);
86697+ role->uidgid = rolecompat.uidgid;
86698+ role->roletype = rolecompat.roletype;
86699+
86700+ role->auth_attempts = rolecompat.auth_attempts;
86701+ role->expires = rolecompat.expires;
86702+
86703+ role->root_label = compat_ptr(rolecompat.root_label);
86704+ role->hash = compat_ptr(rolecompat.hash);
86705+
86706+ role->prev = compat_ptr(rolecompat.prev);
86707+ role->next = compat_ptr(rolecompat.next);
86708+
86709+ role->transitions = compat_ptr(rolecompat.transitions);
86710+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
86711+ role->domain_children = compat_ptr(rolecompat.domain_children);
86712+ role->domain_child_num = rolecompat.domain_child_num;
86713+
86714+ role->umask = rolecompat.umask;
86715+
86716+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
86717+ role->subj_hash_size = rolecompat.subj_hash_size;
86718+
86719+ return 0;
86720+}
86721+
86722+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
86723+{
86724+ struct role_allowed_ip_compat roleip_compat;
86725+
86726+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
86727+ return -EFAULT;
86728+
86729+ roleip->addr = roleip_compat.addr;
86730+ roleip->netmask = roleip_compat.netmask;
86731+
86732+ roleip->prev = compat_ptr(roleip_compat.prev);
86733+ roleip->next = compat_ptr(roleip_compat.next);
86734+
86735+ return 0;
86736+}
86737+
86738+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
86739+{
86740+ struct role_transition_compat trans_compat;
86741+
86742+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
86743+ return -EFAULT;
86744+
86745+ trans->rolename = compat_ptr(trans_compat.rolename);
86746+
86747+ trans->prev = compat_ptr(trans_compat.prev);
86748+ trans->next = compat_ptr(trans_compat.next);
86749+
86750+ return 0;
86751+
86752+}
86753+
86754+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
86755+{
86756+ struct gr_hash_struct_compat hash_compat;
86757+
86758+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
86759+ return -EFAULT;
86760+
86761+ hash->table = compat_ptr(hash_compat.table);
86762+ hash->nametable = compat_ptr(hash_compat.nametable);
86763+ hash->first = compat_ptr(hash_compat.first);
86764+
86765+ hash->table_size = hash_compat.table_size;
86766+ hash->used_size = hash_compat.used_size;
86767+
86768+ hash->type = hash_compat.type;
86769+
86770+ return 0;
86771+}
86772+
86773+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
86774+{
86775+ compat_uptr_t ptrcompat;
86776+
86777+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
86778+ return -EFAULT;
86779+
86780+ *(void **)ptr = compat_ptr(ptrcompat);
86781+
86782+ return 0;
86783+}
86784+
86785+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
86786+{
86787+ struct acl_ip_label_compat ip_compat;
86788+
86789+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
86790+ return -EFAULT;
86791+
86792+ ip->iface = compat_ptr(ip_compat.iface);
86793+ ip->addr = ip_compat.addr;
86794+ ip->netmask = ip_compat.netmask;
86795+ ip->low = ip_compat.low;
86796+ ip->high = ip_compat.high;
86797+ ip->mode = ip_compat.mode;
86798+ ip->type = ip_compat.type;
86799+
86800+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
86801+
86802+ ip->prev = compat_ptr(ip_compat.prev);
86803+ ip->next = compat_ptr(ip_compat.next);
86804+
86805+ return 0;
86806+}
86807+
86808+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
86809+{
86810+ struct sprole_pw_compat pw_compat;
86811+
86812+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
86813+ return -EFAULT;
86814+
86815+ pw->rolename = compat_ptr(pw_compat.rolename);
86816+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
86817+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
86818+
86819+ return 0;
86820+}
86821+
86822+size_t get_gr_arg_wrapper_size_compat(void)
86823+{
86824+ return sizeof(struct gr_arg_wrapper_compat);
86825+}
86826+
86827diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
86828new file mode 100644
86829index 0000000..fce7f71
86830--- /dev/null
86831+++ b/grsecurity/gracl_fs.c
86832@@ -0,0 +1,448 @@
86833+#include <linux/kernel.h>
86834+#include <linux/sched.h>
86835+#include <linux/types.h>
86836+#include <linux/fs.h>
86837+#include <linux/file.h>
86838+#include <linux/stat.h>
86839+#include <linux/grsecurity.h>
86840+#include <linux/grinternal.h>
86841+#include <linux/gracl.h>
86842+
86843+umode_t
86844+gr_acl_umask(void)
86845+{
86846+ if (unlikely(!gr_acl_is_enabled()))
86847+ return 0;
86848+
86849+ return current->role->umask;
86850+}
86851+
86852+__u32
86853+gr_acl_handle_hidden_file(const struct dentry * dentry,
86854+ const struct vfsmount * mnt)
86855+{
86856+ __u32 mode;
86857+
86858+ if (unlikely(d_is_negative(dentry)))
86859+ return GR_FIND;
86860+
86861+ mode =
86862+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
86863+
86864+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
86865+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
86866+ return mode;
86867+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
86868+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
86869+ return 0;
86870+ } else if (unlikely(!(mode & GR_FIND)))
86871+ return 0;
86872+
86873+ return GR_FIND;
86874+}
86875+
86876+__u32
86877+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
86878+ int acc_mode)
86879+{
86880+ __u32 reqmode = GR_FIND;
86881+ __u32 mode;
86882+
86883+ if (unlikely(d_is_negative(dentry)))
86884+ return reqmode;
86885+
86886+ if (acc_mode & MAY_APPEND)
86887+ reqmode |= GR_APPEND;
86888+ else if (acc_mode & MAY_WRITE)
86889+ reqmode |= GR_WRITE;
86890+ if ((acc_mode & MAY_READ) && !d_is_dir(dentry))
86891+ reqmode |= GR_READ;
86892+
86893+ mode =
86894+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
86895+ mnt);
86896+
86897+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
86898+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
86899+ reqmode & GR_READ ? " reading" : "",
86900+ reqmode & GR_WRITE ? " writing" : reqmode &
86901+ GR_APPEND ? " appending" : "");
86902+ return reqmode;
86903+ } else
86904+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
86905+ {
86906+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
86907+ reqmode & GR_READ ? " reading" : "",
86908+ reqmode & GR_WRITE ? " writing" : reqmode &
86909+ GR_APPEND ? " appending" : "");
86910+ return 0;
86911+ } else if (unlikely((mode & reqmode) != reqmode))
86912+ return 0;
86913+
86914+ return reqmode;
86915+}
86916+
86917+__u32
86918+gr_acl_handle_creat(const struct dentry * dentry,
86919+ const struct dentry * p_dentry,
86920+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
86921+ const int imode)
86922+{
86923+ __u32 reqmode = GR_WRITE | GR_CREATE;
86924+ __u32 mode;
86925+
86926+ if (acc_mode & MAY_APPEND)
86927+ reqmode |= GR_APPEND;
86928+ // if a directory was required or the directory already exists, then
86929+ // don't count this open as a read
86930+ if ((acc_mode & MAY_READ) &&
86931+ !((open_flags & O_DIRECTORY) || d_is_dir(dentry)))
86932+ reqmode |= GR_READ;
86933+ if ((open_flags & O_CREAT) &&
86934+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
86935+ reqmode |= GR_SETID;
86936+
86937+ mode =
86938+ gr_check_create(dentry, p_dentry, p_mnt,
86939+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
86940+
86941+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
86942+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
86943+ reqmode & GR_READ ? " reading" : "",
86944+ reqmode & GR_WRITE ? " writing" : reqmode &
86945+ GR_APPEND ? " appending" : "");
86946+ return reqmode;
86947+ } else
86948+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
86949+ {
86950+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
86951+ reqmode & GR_READ ? " reading" : "",
86952+ reqmode & GR_WRITE ? " writing" : reqmode &
86953+ GR_APPEND ? " appending" : "");
86954+ return 0;
86955+ } else if (unlikely((mode & reqmode) != reqmode))
86956+ return 0;
86957+
86958+ return reqmode;
86959+}
86960+
86961+__u32
86962+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
86963+ const int fmode)
86964+{
86965+ __u32 mode, reqmode = GR_FIND;
86966+
86967+ if ((fmode & S_IXOTH) && !d_is_dir(dentry))
86968+ reqmode |= GR_EXEC;
86969+ if (fmode & S_IWOTH)
86970+ reqmode |= GR_WRITE;
86971+ if (fmode & S_IROTH)
86972+ reqmode |= GR_READ;
86973+
86974+ mode =
86975+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
86976+ mnt);
86977+
86978+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
86979+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
86980+ reqmode & GR_READ ? " reading" : "",
86981+ reqmode & GR_WRITE ? " writing" : "",
86982+ reqmode & GR_EXEC ? " executing" : "");
86983+ return reqmode;
86984+ } else
86985+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
86986+ {
86987+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
86988+ reqmode & GR_READ ? " reading" : "",
86989+ reqmode & GR_WRITE ? " writing" : "",
86990+ reqmode & GR_EXEC ? " executing" : "");
86991+ return 0;
86992+ } else if (unlikely((mode & reqmode) != reqmode))
86993+ return 0;
86994+
86995+ return reqmode;
86996+}
86997+
86998+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
86999+{
87000+ __u32 mode;
87001+
87002+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
87003+
87004+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87005+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
87006+ return mode;
87007+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87008+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
87009+ return 0;
87010+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87011+ return 0;
87012+
87013+ return (reqmode);
87014+}
87015+
87016+__u32
87017+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
87018+{
87019+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
87020+}
87021+
87022+__u32
87023+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
87024+{
87025+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
87026+}
87027+
87028+__u32
87029+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
87030+{
87031+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
87032+}
87033+
87034+__u32
87035+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
87036+{
87037+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
87038+}
87039+
87040+__u32
87041+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
87042+ umode_t *modeptr)
87043+{
87044+ umode_t mode;
87045+ struct inode *inode = d_backing_inode(dentry);
87046+
87047+ *modeptr &= ~gr_acl_umask();
87048+ mode = *modeptr;
87049+
87050+ if (unlikely(inode && S_ISSOCK(inode->i_mode)))
87051+ return 1;
87052+
87053+ if (unlikely(!d_is_dir(dentry) &&
87054+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
87055+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
87056+ GR_CHMOD_ACL_MSG);
87057+ } else {
87058+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
87059+ }
87060+}
87061+
87062+__u32
87063+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
87064+{
87065+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
87066+}
87067+
87068+__u32
87069+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
87070+{
87071+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
87072+}
87073+
87074+__u32
87075+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
87076+{
87077+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
87078+}
87079+
87080+__u32
87081+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
87082+{
87083+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
87084+}
87085+
87086+__u32
87087+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
87088+{
87089+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
87090+ GR_UNIXCONNECT_ACL_MSG);
87091+}
87092+
87093+/* hardlinks require at minimum create and link permission,
87094+ any additional privilege required is based on the
87095+ privilege of the file being linked to
87096+*/
87097+__u32
87098+gr_acl_handle_link(const struct dentry * new_dentry,
87099+ const struct dentry * parent_dentry,
87100+ const struct vfsmount * parent_mnt,
87101+ const struct dentry * old_dentry,
87102+ const struct vfsmount * old_mnt, const struct filename *to)
87103+{
87104+ __u32 mode;
87105+ __u32 needmode = GR_CREATE | GR_LINK;
87106+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
87107+
87108+ mode =
87109+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
87110+ old_mnt);
87111+
87112+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
87113+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87114+ return mode;
87115+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87116+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87117+ return 0;
87118+ } else if (unlikely((mode & needmode) != needmode))
87119+ return 0;
87120+
87121+ return 1;
87122+}
87123+
87124+__u32
87125+gr_acl_handle_symlink(const struct dentry * new_dentry,
87126+ const struct dentry * parent_dentry,
87127+ const struct vfsmount * parent_mnt, const struct filename *from)
87128+{
87129+ __u32 needmode = GR_WRITE | GR_CREATE;
87130+ __u32 mode;
87131+
87132+ mode =
87133+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
87134+ GR_CREATE | GR_AUDIT_CREATE |
87135+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
87136+
87137+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
87138+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87139+ return mode;
87140+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87141+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87142+ return 0;
87143+ } else if (unlikely((mode & needmode) != needmode))
87144+ return 0;
87145+
87146+ return (GR_WRITE | GR_CREATE);
87147+}
87148+
87149+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)
87150+{
87151+ __u32 mode;
87152+
87153+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87154+
87155+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87156+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
87157+ return mode;
87158+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87159+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
87160+ return 0;
87161+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87162+ return 0;
87163+
87164+ return (reqmode);
87165+}
87166+
87167+__u32
87168+gr_acl_handle_mknod(const struct dentry * new_dentry,
87169+ const struct dentry * parent_dentry,
87170+ const struct vfsmount * parent_mnt,
87171+ const int mode)
87172+{
87173+ __u32 reqmode = GR_WRITE | GR_CREATE;
87174+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87175+ reqmode |= GR_SETID;
87176+
87177+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87178+ reqmode, GR_MKNOD_ACL_MSG);
87179+}
87180+
87181+__u32
87182+gr_acl_handle_mkdir(const struct dentry *new_dentry,
87183+ const struct dentry *parent_dentry,
87184+ const struct vfsmount *parent_mnt)
87185+{
87186+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87187+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
87188+}
87189+
87190+#define RENAME_CHECK_SUCCESS(old, new) \
87191+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
87192+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
87193+
87194+int
87195+gr_acl_handle_rename(struct dentry *new_dentry,
87196+ struct dentry *parent_dentry,
87197+ const struct vfsmount *parent_mnt,
87198+ struct dentry *old_dentry,
87199+ struct inode *old_parent_inode,
87200+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
87201+{
87202+ __u32 comp1, comp2;
87203+ int error = 0;
87204+
87205+ if (unlikely(!gr_acl_is_enabled()))
87206+ return 0;
87207+
87208+ if (flags & RENAME_EXCHANGE) {
87209+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87210+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87211+ GR_SUPPRESS, parent_mnt);
87212+ comp2 =
87213+ gr_search_file(old_dentry,
87214+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87215+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87216+ } else if (d_is_negative(new_dentry)) {
87217+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
87218+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
87219+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
87220+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
87221+ GR_DELETE | GR_AUDIT_DELETE |
87222+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87223+ GR_SUPPRESS, old_mnt);
87224+ } else {
87225+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87226+ GR_CREATE | GR_DELETE |
87227+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
87228+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87229+ GR_SUPPRESS, parent_mnt);
87230+ comp2 =
87231+ gr_search_file(old_dentry,
87232+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87233+ GR_DELETE | GR_AUDIT_DELETE |
87234+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87235+ }
87236+
87237+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
87238+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
87239+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87240+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
87241+ && !(comp2 & GR_SUPPRESS)) {
87242+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87243+ error = -EACCES;
87244+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
87245+ error = -EACCES;
87246+
87247+ return error;
87248+}
87249+
87250+void
87251+gr_acl_handle_exit(void)
87252+{
87253+ u16 id;
87254+ char *rolename;
87255+
87256+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
87257+ !(current->role->roletype & GR_ROLE_PERSIST))) {
87258+ id = current->acl_role_id;
87259+ rolename = current->role->rolename;
87260+ gr_set_acls(1);
87261+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
87262+ }
87263+
87264+ gr_put_exec_file(current);
87265+ return;
87266+}
87267+
87268+int
87269+gr_acl_handle_procpidmem(const struct task_struct *task)
87270+{
87271+ if (unlikely(!gr_acl_is_enabled()))
87272+ return 0;
87273+
87274+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
87275+ !(current->acl->mode & GR_POVERRIDE) &&
87276+ !(current->role->roletype & GR_ROLE_GOD))
87277+ return -EACCES;
87278+
87279+ return 0;
87280+}
87281diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
87282new file mode 100644
87283index 0000000..ed6ee43
87284--- /dev/null
87285+++ b/grsecurity/gracl_ip.c
87286@@ -0,0 +1,386 @@
87287+#include <linux/kernel.h>
87288+#include <asm/uaccess.h>
87289+#include <asm/errno.h>
87290+#include <net/sock.h>
87291+#include <linux/file.h>
87292+#include <linux/fs.h>
87293+#include <linux/net.h>
87294+#include <linux/in.h>
87295+#include <linux/skbuff.h>
87296+#include <linux/ip.h>
87297+#include <linux/udp.h>
87298+#include <linux/types.h>
87299+#include <linux/sched.h>
87300+#include <linux/netdevice.h>
87301+#include <linux/inetdevice.h>
87302+#include <linux/gracl.h>
87303+#include <linux/grsecurity.h>
87304+#include <linux/grinternal.h>
87305+
87306+#define GR_BIND 0x01
87307+#define GR_CONNECT 0x02
87308+#define GR_INVERT 0x04
87309+#define GR_BINDOVERRIDE 0x08
87310+#define GR_CONNECTOVERRIDE 0x10
87311+#define GR_SOCK_FAMILY 0x20
87312+
87313+static const char * gr_protocols[IPPROTO_MAX] = {
87314+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
87315+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
87316+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
87317+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
87318+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
87319+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
87320+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
87321+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
87322+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
87323+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
87324+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
87325+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
87326+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
87327+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
87328+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
87329+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
87330+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
87331+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
87332+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
87333+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
87334+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
87335+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
87336+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
87337+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
87338+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
87339+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
87340+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
87341+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
87342+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
87343+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
87344+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
87345+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
87346+ };
87347+
87348+static const char * gr_socktypes[SOCK_MAX] = {
87349+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
87350+ "unknown:7", "unknown:8", "unknown:9", "packet"
87351+ };
87352+
87353+static const char * gr_sockfamilies[AF_MAX+1] = {
87354+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
87355+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
87356+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
87357+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf", "alg", "nfc", "vsock"
87358+ };
87359+
87360+const char *
87361+gr_proto_to_name(unsigned char proto)
87362+{
87363+ return gr_protocols[proto];
87364+}
87365+
87366+const char *
87367+gr_socktype_to_name(unsigned char type)
87368+{
87369+ return gr_socktypes[type];
87370+}
87371+
87372+const char *
87373+gr_sockfamily_to_name(unsigned char family)
87374+{
87375+ return gr_sockfamilies[family];
87376+}
87377+
87378+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
87379+
87380+int
87381+gr_search_socket(const int domain, const int type, const int protocol)
87382+{
87383+ struct acl_subject_label *curr;
87384+ const struct cred *cred = current_cred();
87385+
87386+ if (unlikely(!gr_acl_is_enabled()))
87387+ goto exit;
87388+
87389+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
87390+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
87391+ goto exit; // let the kernel handle it
87392+
87393+ curr = current->acl;
87394+
87395+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
87396+ /* the family is allowed, if this is PF_INET allow it only if
87397+ the extra sock type/protocol checks pass */
87398+ if (domain == PF_INET)
87399+ goto inet_check;
87400+ goto exit;
87401+ } else {
87402+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87403+ __u32 fakeip = 0;
87404+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87405+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87406+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87407+ gr_to_filename(current->exec_file->f_path.dentry,
87408+ current->exec_file->f_path.mnt) :
87409+ curr->filename, curr->filename,
87410+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
87411+ &current->signal->saved_ip);
87412+ goto exit;
87413+ }
87414+ goto exit_fail;
87415+ }
87416+
87417+inet_check:
87418+ /* the rest of this checking is for IPv4 only */
87419+ if (!curr->ips)
87420+ goto exit;
87421+
87422+ if ((curr->ip_type & (1U << type)) &&
87423+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
87424+ goto exit;
87425+
87426+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87427+ /* we don't place acls on raw sockets , and sometimes
87428+ dgram/ip sockets are opened for ioctl and not
87429+ bind/connect, so we'll fake a bind learn log */
87430+ if (type == SOCK_RAW || type == SOCK_PACKET) {
87431+ __u32 fakeip = 0;
87432+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87433+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87434+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87435+ gr_to_filename(current->exec_file->f_path.dentry,
87436+ current->exec_file->f_path.mnt) :
87437+ curr->filename, curr->filename,
87438+ &fakeip, 0, type,
87439+ protocol, GR_CONNECT, &current->signal->saved_ip);
87440+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
87441+ __u32 fakeip = 0;
87442+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87443+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87444+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87445+ gr_to_filename(current->exec_file->f_path.dentry,
87446+ current->exec_file->f_path.mnt) :
87447+ curr->filename, curr->filename,
87448+ &fakeip, 0, type,
87449+ protocol, GR_BIND, &current->signal->saved_ip);
87450+ }
87451+ /* we'll log when they use connect or bind */
87452+ goto exit;
87453+ }
87454+
87455+exit_fail:
87456+ if (domain == PF_INET)
87457+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
87458+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
87459+ else if (rcu_access_pointer(net_families[domain]) != NULL)
87460+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
87461+ gr_socktype_to_name(type), protocol);
87462+
87463+ return 0;
87464+exit:
87465+ return 1;
87466+}
87467+
87468+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)
87469+{
87470+ if ((ip->mode & mode) &&
87471+ (ip_port >= ip->low) &&
87472+ (ip_port <= ip->high) &&
87473+ ((ntohl(ip_addr) & our_netmask) ==
87474+ (ntohl(our_addr) & our_netmask))
87475+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
87476+ && (ip->type & (1U << type))) {
87477+ if (ip->mode & GR_INVERT)
87478+ return 2; // specifically denied
87479+ else
87480+ return 1; // allowed
87481+ }
87482+
87483+ return 0; // not specifically allowed, may continue parsing
87484+}
87485+
87486+static int
87487+gr_search_connectbind(const int full_mode, struct sock *sk,
87488+ struct sockaddr_in *addr, const int type)
87489+{
87490+ char iface[IFNAMSIZ] = {0};
87491+ struct acl_subject_label *curr;
87492+ struct acl_ip_label *ip;
87493+ struct inet_sock *isk;
87494+ struct net_device *dev;
87495+ struct in_device *idev;
87496+ unsigned long i;
87497+ int ret;
87498+ int mode = full_mode & (GR_BIND | GR_CONNECT);
87499+ __u32 ip_addr = 0;
87500+ __u32 our_addr;
87501+ __u32 our_netmask;
87502+ char *p;
87503+ __u16 ip_port = 0;
87504+ const struct cred *cred = current_cred();
87505+
87506+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
87507+ return 0;
87508+
87509+ curr = current->acl;
87510+ isk = inet_sk(sk);
87511+
87512+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
87513+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
87514+ addr->sin_addr.s_addr = curr->inaddr_any_override;
87515+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
87516+ struct sockaddr_in saddr;
87517+ int err;
87518+
87519+ saddr.sin_family = AF_INET;
87520+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
87521+ saddr.sin_port = isk->inet_sport;
87522+
87523+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87524+ if (err)
87525+ return err;
87526+
87527+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87528+ if (err)
87529+ return err;
87530+ }
87531+
87532+ if (!curr->ips)
87533+ return 0;
87534+
87535+ ip_addr = addr->sin_addr.s_addr;
87536+ ip_port = ntohs(addr->sin_port);
87537+
87538+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87539+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87540+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87541+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87542+ gr_to_filename(current->exec_file->f_path.dentry,
87543+ current->exec_file->f_path.mnt) :
87544+ curr->filename, curr->filename,
87545+ &ip_addr, ip_port, type,
87546+ sk->sk_protocol, mode, &current->signal->saved_ip);
87547+ return 0;
87548+ }
87549+
87550+ for (i = 0; i < curr->ip_num; i++) {
87551+ ip = *(curr->ips + i);
87552+ if (ip->iface != NULL) {
87553+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
87554+ p = strchr(iface, ':');
87555+ if (p != NULL)
87556+ *p = '\0';
87557+ dev = dev_get_by_name(sock_net(sk), iface);
87558+ if (dev == NULL)
87559+ continue;
87560+ idev = in_dev_get(dev);
87561+ if (idev == NULL) {
87562+ dev_put(dev);
87563+ continue;
87564+ }
87565+ rcu_read_lock();
87566+ for_ifa(idev) {
87567+ if (!strcmp(ip->iface, ifa->ifa_label)) {
87568+ our_addr = ifa->ifa_address;
87569+ our_netmask = 0xffffffff;
87570+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87571+ if (ret == 1) {
87572+ rcu_read_unlock();
87573+ in_dev_put(idev);
87574+ dev_put(dev);
87575+ return 0;
87576+ } else if (ret == 2) {
87577+ rcu_read_unlock();
87578+ in_dev_put(idev);
87579+ dev_put(dev);
87580+ goto denied;
87581+ }
87582+ }
87583+ } endfor_ifa(idev);
87584+ rcu_read_unlock();
87585+ in_dev_put(idev);
87586+ dev_put(dev);
87587+ } else {
87588+ our_addr = ip->addr;
87589+ our_netmask = ip->netmask;
87590+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87591+ if (ret == 1)
87592+ return 0;
87593+ else if (ret == 2)
87594+ goto denied;
87595+ }
87596+ }
87597+
87598+denied:
87599+ if (mode == GR_BIND)
87600+ 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));
87601+ else if (mode == GR_CONNECT)
87602+ 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));
87603+
87604+ return -EACCES;
87605+}
87606+
87607+int
87608+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
87609+{
87610+ /* always allow disconnection of dgram sockets with connect */
87611+ if (addr->sin_family == AF_UNSPEC)
87612+ return 0;
87613+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
87614+}
87615+
87616+int
87617+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
87618+{
87619+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
87620+}
87621+
87622+int gr_search_listen(struct socket *sock)
87623+{
87624+ struct sock *sk = sock->sk;
87625+ struct sockaddr_in addr;
87626+
87627+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87628+ addr.sin_port = inet_sk(sk)->inet_sport;
87629+
87630+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87631+}
87632+
87633+int gr_search_accept(struct socket *sock)
87634+{
87635+ struct sock *sk = sock->sk;
87636+ struct sockaddr_in addr;
87637+
87638+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87639+ addr.sin_port = inet_sk(sk)->inet_sport;
87640+
87641+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87642+}
87643+
87644+int
87645+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
87646+{
87647+ if (addr)
87648+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
87649+ else {
87650+ struct sockaddr_in sin;
87651+ const struct inet_sock *inet = inet_sk(sk);
87652+
87653+ sin.sin_addr.s_addr = inet->inet_daddr;
87654+ sin.sin_port = inet->inet_dport;
87655+
87656+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87657+ }
87658+}
87659+
87660+int
87661+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
87662+{
87663+ struct sockaddr_in sin;
87664+
87665+ if (unlikely(skb->len < sizeof (struct udphdr)))
87666+ return 0; // skip this packet
87667+
87668+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
87669+ sin.sin_port = udp_hdr(skb)->source;
87670+
87671+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87672+}
87673diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
87674new file mode 100644
87675index 0000000..25f54ef
87676--- /dev/null
87677+++ b/grsecurity/gracl_learn.c
87678@@ -0,0 +1,207 @@
87679+#include <linux/kernel.h>
87680+#include <linux/mm.h>
87681+#include <linux/sched.h>
87682+#include <linux/poll.h>
87683+#include <linux/string.h>
87684+#include <linux/file.h>
87685+#include <linux/types.h>
87686+#include <linux/vmalloc.h>
87687+#include <linux/grinternal.h>
87688+
87689+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
87690+ size_t count, loff_t *ppos);
87691+extern int gr_acl_is_enabled(void);
87692+
87693+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
87694+static int gr_learn_attached;
87695+
87696+/* use a 512k buffer */
87697+#define LEARN_BUFFER_SIZE (512 * 1024)
87698+
87699+static DEFINE_SPINLOCK(gr_learn_lock);
87700+static DEFINE_MUTEX(gr_learn_user_mutex);
87701+
87702+/* we need to maintain two buffers, so that the kernel context of grlearn
87703+ uses a semaphore around the userspace copying, and the other kernel contexts
87704+ use a spinlock when copying into the buffer, since they cannot sleep
87705+*/
87706+static char *learn_buffer;
87707+static char *learn_buffer_user;
87708+static int learn_buffer_len;
87709+static int learn_buffer_user_len;
87710+
87711+static ssize_t
87712+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
87713+{
87714+ DECLARE_WAITQUEUE(wait, current);
87715+ ssize_t retval = 0;
87716+
87717+ add_wait_queue(&learn_wait, &wait);
87718+ set_current_state(TASK_INTERRUPTIBLE);
87719+ do {
87720+ mutex_lock(&gr_learn_user_mutex);
87721+ spin_lock(&gr_learn_lock);
87722+ if (learn_buffer_len)
87723+ break;
87724+ spin_unlock(&gr_learn_lock);
87725+ mutex_unlock(&gr_learn_user_mutex);
87726+ if (file->f_flags & O_NONBLOCK) {
87727+ retval = -EAGAIN;
87728+ goto out;
87729+ }
87730+ if (signal_pending(current)) {
87731+ retval = -ERESTARTSYS;
87732+ goto out;
87733+ }
87734+
87735+ schedule();
87736+ } while (1);
87737+
87738+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
87739+ learn_buffer_user_len = learn_buffer_len;
87740+ retval = learn_buffer_len;
87741+ learn_buffer_len = 0;
87742+
87743+ spin_unlock(&gr_learn_lock);
87744+
87745+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
87746+ retval = -EFAULT;
87747+
87748+ mutex_unlock(&gr_learn_user_mutex);
87749+out:
87750+ set_current_state(TASK_RUNNING);
87751+ remove_wait_queue(&learn_wait, &wait);
87752+ return retval;
87753+}
87754+
87755+static unsigned int
87756+poll_learn(struct file * file, poll_table * wait)
87757+{
87758+ poll_wait(file, &learn_wait, wait);
87759+
87760+ if (learn_buffer_len)
87761+ return (POLLIN | POLLRDNORM);
87762+
87763+ return 0;
87764+}
87765+
87766+void
87767+gr_clear_learn_entries(void)
87768+{
87769+ char *tmp;
87770+
87771+ mutex_lock(&gr_learn_user_mutex);
87772+ spin_lock(&gr_learn_lock);
87773+ tmp = learn_buffer;
87774+ learn_buffer = NULL;
87775+ spin_unlock(&gr_learn_lock);
87776+ if (tmp)
87777+ vfree(tmp);
87778+ if (learn_buffer_user != NULL) {
87779+ vfree(learn_buffer_user);
87780+ learn_buffer_user = NULL;
87781+ }
87782+ learn_buffer_len = 0;
87783+ mutex_unlock(&gr_learn_user_mutex);
87784+
87785+ return;
87786+}
87787+
87788+void
87789+gr_add_learn_entry(const char *fmt, ...)
87790+{
87791+ va_list args;
87792+ unsigned int len;
87793+
87794+ if (!gr_learn_attached)
87795+ return;
87796+
87797+ spin_lock(&gr_learn_lock);
87798+
87799+ /* leave a gap at the end so we know when it's "full" but don't have to
87800+ compute the exact length of the string we're trying to append
87801+ */
87802+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
87803+ spin_unlock(&gr_learn_lock);
87804+ wake_up_interruptible(&learn_wait);
87805+ return;
87806+ }
87807+ if (learn_buffer == NULL) {
87808+ spin_unlock(&gr_learn_lock);
87809+ return;
87810+ }
87811+
87812+ va_start(args, fmt);
87813+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
87814+ va_end(args);
87815+
87816+ learn_buffer_len += len + 1;
87817+
87818+ spin_unlock(&gr_learn_lock);
87819+ wake_up_interruptible(&learn_wait);
87820+
87821+ return;
87822+}
87823+
87824+static int
87825+open_learn(struct inode *inode, struct file *file)
87826+{
87827+ if (file->f_mode & FMODE_READ && gr_learn_attached)
87828+ return -EBUSY;
87829+ if (file->f_mode & FMODE_READ) {
87830+ int retval = 0;
87831+ mutex_lock(&gr_learn_user_mutex);
87832+ if (learn_buffer == NULL)
87833+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
87834+ if (learn_buffer_user == NULL)
87835+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
87836+ if (learn_buffer == NULL) {
87837+ retval = -ENOMEM;
87838+ goto out_error;
87839+ }
87840+ if (learn_buffer_user == NULL) {
87841+ retval = -ENOMEM;
87842+ goto out_error;
87843+ }
87844+ learn_buffer_len = 0;
87845+ learn_buffer_user_len = 0;
87846+ gr_learn_attached = 1;
87847+out_error:
87848+ mutex_unlock(&gr_learn_user_mutex);
87849+ return retval;
87850+ }
87851+ return 0;
87852+}
87853+
87854+static int
87855+close_learn(struct inode *inode, struct file *file)
87856+{
87857+ if (file->f_mode & FMODE_READ) {
87858+ char *tmp = NULL;
87859+ mutex_lock(&gr_learn_user_mutex);
87860+ spin_lock(&gr_learn_lock);
87861+ tmp = learn_buffer;
87862+ learn_buffer = NULL;
87863+ spin_unlock(&gr_learn_lock);
87864+ if (tmp)
87865+ vfree(tmp);
87866+ if (learn_buffer_user != NULL) {
87867+ vfree(learn_buffer_user);
87868+ learn_buffer_user = NULL;
87869+ }
87870+ learn_buffer_len = 0;
87871+ learn_buffer_user_len = 0;
87872+ gr_learn_attached = 0;
87873+ mutex_unlock(&gr_learn_user_mutex);
87874+ }
87875+
87876+ return 0;
87877+}
87878+
87879+const struct file_operations grsec_fops = {
87880+ .read = read_learn,
87881+ .write = write_grsec_handler,
87882+ .open = open_learn,
87883+ .release = close_learn,
87884+ .poll = poll_learn,
87885+};
87886diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
87887new file mode 100644
87888index 0000000..0773423
87889--- /dev/null
87890+++ b/grsecurity/gracl_policy.c
87891@@ -0,0 +1,1786 @@
87892+#include <linux/kernel.h>
87893+#include <linux/module.h>
87894+#include <linux/sched.h>
87895+#include <linux/mm.h>
87896+#include <linux/file.h>
87897+#include <linux/fs.h>
87898+#include <linux/namei.h>
87899+#include <linux/mount.h>
87900+#include <linux/tty.h>
87901+#include <linux/proc_fs.h>
87902+#include <linux/lglock.h>
87903+#include <linux/slab.h>
87904+#include <linux/vmalloc.h>
87905+#include <linux/types.h>
87906+#include <linux/sysctl.h>
87907+#include <linux/netdevice.h>
87908+#include <linux/ptrace.h>
87909+#include <linux/gracl.h>
87910+#include <linux/gralloc.h>
87911+#include <linux/security.h>
87912+#include <linux/grinternal.h>
87913+#include <linux/pid_namespace.h>
87914+#include <linux/stop_machine.h>
87915+#include <linux/fdtable.h>
87916+#include <linux/percpu.h>
87917+#include <linux/lglock.h>
87918+#include <linux/hugetlb.h>
87919+#include <linux/posix-timers.h>
87920+#include "../fs/mount.h"
87921+
87922+#include <asm/uaccess.h>
87923+#include <asm/errno.h>
87924+#include <asm/mman.h>
87925+
87926+extern struct gr_policy_state *polstate;
87927+
87928+#define FOR_EACH_ROLE_START(role) \
87929+ role = polstate->role_list; \
87930+ while (role) {
87931+
87932+#define FOR_EACH_ROLE_END(role) \
87933+ role = role->prev; \
87934+ }
87935+
87936+struct path gr_real_root;
87937+
87938+extern struct gr_alloc_state *current_alloc_state;
87939+
87940+u16 acl_sp_role_value;
87941+
87942+static DEFINE_MUTEX(gr_dev_mutex);
87943+
87944+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
87945+extern void gr_clear_learn_entries(void);
87946+
87947+struct gr_arg *gr_usermode __read_only;
87948+unsigned char *gr_system_salt __read_only;
87949+unsigned char *gr_system_sum __read_only;
87950+
87951+static unsigned int gr_auth_attempts = 0;
87952+static unsigned long gr_auth_expires = 0UL;
87953+
87954+struct acl_object_label *fakefs_obj_rw;
87955+struct acl_object_label *fakefs_obj_rwx;
87956+
87957+extern int gr_init_uidset(void);
87958+extern void gr_free_uidset(void);
87959+extern void gr_remove_uid(uid_t uid);
87960+extern int gr_find_uid(uid_t uid);
87961+
87962+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);
87963+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
87964+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
87965+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
87966+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);
87967+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
87968+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
87969+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
87970+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
87971+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
87972+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
87973+extern void assign_special_role(const char *rolename);
87974+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
87975+extern int gr_rbac_disable(void *unused);
87976+extern void gr_enable_rbac_system(void);
87977+
87978+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
87979+{
87980+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
87981+ return -EFAULT;
87982+
87983+ return 0;
87984+}
87985+
87986+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
87987+{
87988+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
87989+ return -EFAULT;
87990+
87991+ return 0;
87992+}
87993+
87994+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
87995+{
87996+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
87997+ return -EFAULT;
87998+
87999+ return 0;
88000+}
88001+
88002+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
88003+{
88004+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
88005+ return -EFAULT;
88006+
88007+ return 0;
88008+}
88009+
88010+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
88011+{
88012+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
88013+ return -EFAULT;
88014+
88015+ return 0;
88016+}
88017+
88018+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
88019+{
88020+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
88021+ return -EFAULT;
88022+
88023+ return 0;
88024+}
88025+
88026+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
88027+{
88028+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
88029+ return -EFAULT;
88030+
88031+ return 0;
88032+}
88033+
88034+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
88035+{
88036+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
88037+ return -EFAULT;
88038+
88039+ return 0;
88040+}
88041+
88042+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
88043+{
88044+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
88045+ return -EFAULT;
88046+
88047+ return 0;
88048+}
88049+
88050+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
88051+{
88052+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
88053+ return -EFAULT;
88054+
88055+ if ((uwrap->version != GRSECURITY_VERSION) ||
88056+ (uwrap->size != sizeof(struct gr_arg)))
88057+ return -EINVAL;
88058+
88059+ return 0;
88060+}
88061+
88062+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
88063+{
88064+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
88065+ return -EFAULT;
88066+
88067+ return 0;
88068+}
88069+
88070+static size_t get_gr_arg_wrapper_size_normal(void)
88071+{
88072+ return sizeof(struct gr_arg_wrapper);
88073+}
88074+
88075+#ifdef CONFIG_COMPAT
88076+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
88077+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
88078+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
88079+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
88080+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
88081+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
88082+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
88083+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
88084+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
88085+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
88086+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
88087+extern size_t get_gr_arg_wrapper_size_compat(void);
88088+
88089+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
88090+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
88091+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
88092+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
88093+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
88094+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
88095+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
88096+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
88097+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
88098+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
88099+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
88100+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
88101+
88102+#else
88103+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
88104+#define copy_gr_arg copy_gr_arg_normal
88105+#define copy_gr_hash_struct copy_gr_hash_struct_normal
88106+#define copy_acl_object_label copy_acl_object_label_normal
88107+#define copy_acl_subject_label copy_acl_subject_label_normal
88108+#define copy_acl_role_label copy_acl_role_label_normal
88109+#define copy_acl_ip_label copy_acl_ip_label_normal
88110+#define copy_pointer_from_array copy_pointer_from_array_normal
88111+#define copy_sprole_pw copy_sprole_pw_normal
88112+#define copy_role_transition copy_role_transition_normal
88113+#define copy_role_allowed_ip copy_role_allowed_ip_normal
88114+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
88115+#endif
88116+
88117+static struct acl_subject_label *
88118+lookup_subject_map(const struct acl_subject_label *userp)
88119+{
88120+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
88121+ struct subject_map *match;
88122+
88123+ match = polstate->subj_map_set.s_hash[index];
88124+
88125+ while (match && match->user != userp)
88126+ match = match->next;
88127+
88128+ if (match != NULL)
88129+ return match->kernel;
88130+ else
88131+ return NULL;
88132+}
88133+
88134+static void
88135+insert_subj_map_entry(struct subject_map *subjmap)
88136+{
88137+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
88138+ struct subject_map **curr;
88139+
88140+ subjmap->prev = NULL;
88141+
88142+ curr = &polstate->subj_map_set.s_hash[index];
88143+ if (*curr != NULL)
88144+ (*curr)->prev = subjmap;
88145+
88146+ subjmap->next = *curr;
88147+ *curr = subjmap;
88148+
88149+ return;
88150+}
88151+
88152+static void
88153+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
88154+{
88155+ unsigned int index =
88156+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
88157+ struct acl_role_label **curr;
88158+ struct acl_role_label *tmp, *tmp2;
88159+
88160+ curr = &polstate->acl_role_set.r_hash[index];
88161+
88162+ /* simple case, slot is empty, just set it to our role */
88163+ if (*curr == NULL) {
88164+ *curr = role;
88165+ } else {
88166+ /* example:
88167+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
88168+ 2 -> 3
88169+ */
88170+ /* first check to see if we can already be reached via this slot */
88171+ tmp = *curr;
88172+ while (tmp && tmp != role)
88173+ tmp = tmp->next;
88174+ if (tmp == role) {
88175+ /* we don't need to add ourselves to this slot's chain */
88176+ return;
88177+ }
88178+ /* we need to add ourselves to this chain, two cases */
88179+ if (role->next == NULL) {
88180+ /* simple case, append the current chain to our role */
88181+ role->next = *curr;
88182+ *curr = role;
88183+ } else {
88184+ /* 1 -> 2 -> 3 -> 4
88185+ 2 -> 3 -> 4
88186+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
88187+ */
88188+ /* trickier case: walk our role's chain until we find
88189+ the role for the start of the current slot's chain */
88190+ tmp = role;
88191+ tmp2 = *curr;
88192+ while (tmp->next && tmp->next != tmp2)
88193+ tmp = tmp->next;
88194+ if (tmp->next == tmp2) {
88195+ /* from example above, we found 3, so just
88196+ replace this slot's chain with ours */
88197+ *curr = role;
88198+ } else {
88199+ /* we didn't find a subset of our role's chain
88200+ in the current slot's chain, so append their
88201+ chain to ours, and set us as the first role in
88202+ the slot's chain
88203+
88204+ we could fold this case with the case above,
88205+ but making it explicit for clarity
88206+ */
88207+ tmp->next = tmp2;
88208+ *curr = role;
88209+ }
88210+ }
88211+ }
88212+
88213+ return;
88214+}
88215+
88216+static void
88217+insert_acl_role_label(struct acl_role_label *role)
88218+{
88219+ int i;
88220+
88221+ if (polstate->role_list == NULL) {
88222+ polstate->role_list = role;
88223+ role->prev = NULL;
88224+ } else {
88225+ role->prev = polstate->role_list;
88226+ polstate->role_list = role;
88227+ }
88228+
88229+ /* used for hash chains */
88230+ role->next = NULL;
88231+
88232+ if (role->roletype & GR_ROLE_DOMAIN) {
88233+ for (i = 0; i < role->domain_child_num; i++)
88234+ __insert_acl_role_label(role, role->domain_children[i]);
88235+ } else
88236+ __insert_acl_role_label(role, role->uidgid);
88237+}
88238+
88239+static int
88240+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
88241+{
88242+ struct name_entry **curr, *nentry;
88243+ struct inodev_entry *ientry;
88244+ unsigned int len = strlen(name);
88245+ unsigned int key = full_name_hash(name, len);
88246+ unsigned int index = key % polstate->name_set.n_size;
88247+
88248+ curr = &polstate->name_set.n_hash[index];
88249+
88250+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
88251+ curr = &((*curr)->next);
88252+
88253+ if (*curr != NULL)
88254+ return 1;
88255+
88256+ nentry = acl_alloc(sizeof (struct name_entry));
88257+ if (nentry == NULL)
88258+ return 0;
88259+ ientry = acl_alloc(sizeof (struct inodev_entry));
88260+ if (ientry == NULL)
88261+ return 0;
88262+ ientry->nentry = nentry;
88263+
88264+ nentry->key = key;
88265+ nentry->name = name;
88266+ nentry->inode = inode;
88267+ nentry->device = device;
88268+ nentry->len = len;
88269+ nentry->deleted = deleted;
88270+
88271+ nentry->prev = NULL;
88272+ curr = &polstate->name_set.n_hash[index];
88273+ if (*curr != NULL)
88274+ (*curr)->prev = nentry;
88275+ nentry->next = *curr;
88276+ *curr = nentry;
88277+
88278+ /* insert us into the table searchable by inode/dev */
88279+ __insert_inodev_entry(polstate, ientry);
88280+
88281+ return 1;
88282+}
88283+
88284+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
88285+
88286+static void *
88287+create_table(__u32 * len, int elementsize)
88288+{
88289+ unsigned int table_sizes[] = {
88290+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
88291+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
88292+ 4194301, 8388593, 16777213, 33554393, 67108859
88293+ };
88294+ void *newtable = NULL;
88295+ unsigned int pwr = 0;
88296+
88297+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
88298+ table_sizes[pwr] <= *len)
88299+ pwr++;
88300+
88301+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
88302+ return newtable;
88303+
88304+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
88305+ newtable =
88306+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
88307+ else
88308+ newtable = vmalloc(table_sizes[pwr] * elementsize);
88309+
88310+ *len = table_sizes[pwr];
88311+
88312+ return newtable;
88313+}
88314+
88315+static int
88316+init_variables(const struct gr_arg *arg, bool reload)
88317+{
88318+ struct task_struct *reaper = init_pid_ns.child_reaper;
88319+ unsigned int stacksize;
88320+
88321+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
88322+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
88323+ polstate->name_set.n_size = arg->role_db.num_objects;
88324+ polstate->inodev_set.i_size = arg->role_db.num_objects;
88325+
88326+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
88327+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
88328+ return 1;
88329+
88330+ if (!reload) {
88331+ if (!gr_init_uidset())
88332+ return 1;
88333+ }
88334+
88335+ /* set up the stack that holds allocation info */
88336+
88337+ stacksize = arg->role_db.num_pointers + 5;
88338+
88339+ if (!acl_alloc_stack_init(stacksize))
88340+ return 1;
88341+
88342+ if (!reload) {
88343+ /* grab reference for the real root dentry and vfsmount */
88344+ get_fs_root(reaper->fs, &gr_real_root);
88345+
88346+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
88347+ 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));
88348+#endif
88349+
88350+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88351+ if (fakefs_obj_rw == NULL)
88352+ return 1;
88353+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
88354+
88355+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88356+ if (fakefs_obj_rwx == NULL)
88357+ return 1;
88358+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
88359+ }
88360+
88361+ polstate->subj_map_set.s_hash =
88362+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
88363+ polstate->acl_role_set.r_hash =
88364+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
88365+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
88366+ polstate->inodev_set.i_hash =
88367+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
88368+
88369+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
88370+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
88371+ return 1;
88372+
88373+ memset(polstate->subj_map_set.s_hash, 0,
88374+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
88375+ memset(polstate->acl_role_set.r_hash, 0,
88376+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
88377+ memset(polstate->name_set.n_hash, 0,
88378+ sizeof (struct name_entry *) * polstate->name_set.n_size);
88379+ memset(polstate->inodev_set.i_hash, 0,
88380+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
88381+
88382+ return 0;
88383+}
88384+
88385+/* free information not needed after startup
88386+ currently contains user->kernel pointer mappings for subjects
88387+*/
88388+
88389+static void
88390+free_init_variables(void)
88391+{
88392+ __u32 i;
88393+
88394+ if (polstate->subj_map_set.s_hash) {
88395+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
88396+ if (polstate->subj_map_set.s_hash[i]) {
88397+ kfree(polstate->subj_map_set.s_hash[i]);
88398+ polstate->subj_map_set.s_hash[i] = NULL;
88399+ }
88400+ }
88401+
88402+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
88403+ PAGE_SIZE)
88404+ kfree(polstate->subj_map_set.s_hash);
88405+ else
88406+ vfree(polstate->subj_map_set.s_hash);
88407+ }
88408+
88409+ return;
88410+}
88411+
88412+static void
88413+free_variables(bool reload)
88414+{
88415+ struct acl_subject_label *s;
88416+ struct acl_role_label *r;
88417+ struct task_struct *task, *task2;
88418+ unsigned int x;
88419+
88420+ if (!reload) {
88421+ gr_clear_learn_entries();
88422+
88423+ read_lock(&tasklist_lock);
88424+ do_each_thread(task2, task) {
88425+ task->acl_sp_role = 0;
88426+ task->acl_role_id = 0;
88427+ task->inherited = 0;
88428+ task->acl = NULL;
88429+ task->role = NULL;
88430+ } while_each_thread(task2, task);
88431+ read_unlock(&tasklist_lock);
88432+
88433+ kfree(fakefs_obj_rw);
88434+ fakefs_obj_rw = NULL;
88435+ kfree(fakefs_obj_rwx);
88436+ fakefs_obj_rwx = NULL;
88437+
88438+ /* release the reference to the real root dentry and vfsmount */
88439+ path_put(&gr_real_root);
88440+ memset(&gr_real_root, 0, sizeof(gr_real_root));
88441+ }
88442+
88443+ /* free all object hash tables */
88444+
88445+ FOR_EACH_ROLE_START(r)
88446+ if (r->subj_hash == NULL)
88447+ goto next_role;
88448+ FOR_EACH_SUBJECT_START(r, s, x)
88449+ if (s->obj_hash == NULL)
88450+ break;
88451+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88452+ kfree(s->obj_hash);
88453+ else
88454+ vfree(s->obj_hash);
88455+ FOR_EACH_SUBJECT_END(s, x)
88456+ FOR_EACH_NESTED_SUBJECT_START(r, s)
88457+ if (s->obj_hash == NULL)
88458+ break;
88459+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88460+ kfree(s->obj_hash);
88461+ else
88462+ vfree(s->obj_hash);
88463+ FOR_EACH_NESTED_SUBJECT_END(s)
88464+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
88465+ kfree(r->subj_hash);
88466+ else
88467+ vfree(r->subj_hash);
88468+ r->subj_hash = NULL;
88469+next_role:
88470+ FOR_EACH_ROLE_END(r)
88471+
88472+ acl_free_all();
88473+
88474+ if (polstate->acl_role_set.r_hash) {
88475+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
88476+ PAGE_SIZE)
88477+ kfree(polstate->acl_role_set.r_hash);
88478+ else
88479+ vfree(polstate->acl_role_set.r_hash);
88480+ }
88481+ if (polstate->name_set.n_hash) {
88482+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
88483+ PAGE_SIZE)
88484+ kfree(polstate->name_set.n_hash);
88485+ else
88486+ vfree(polstate->name_set.n_hash);
88487+ }
88488+
88489+ if (polstate->inodev_set.i_hash) {
88490+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
88491+ PAGE_SIZE)
88492+ kfree(polstate->inodev_set.i_hash);
88493+ else
88494+ vfree(polstate->inodev_set.i_hash);
88495+ }
88496+
88497+ if (!reload)
88498+ gr_free_uidset();
88499+
88500+ memset(&polstate->name_set, 0, sizeof (struct name_db));
88501+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
88502+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
88503+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
88504+
88505+ polstate->default_role = NULL;
88506+ polstate->kernel_role = NULL;
88507+ polstate->role_list = NULL;
88508+
88509+ return;
88510+}
88511+
88512+static struct acl_subject_label *
88513+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
88514+
88515+static int alloc_and_copy_string(char **name, unsigned int maxlen)
88516+{
88517+ unsigned int len = strnlen_user(*name, maxlen);
88518+ char *tmp;
88519+
88520+ if (!len || len >= maxlen)
88521+ return -EINVAL;
88522+
88523+ if ((tmp = (char *) acl_alloc(len)) == NULL)
88524+ return -ENOMEM;
88525+
88526+ if (copy_from_user(tmp, *name, len))
88527+ return -EFAULT;
88528+
88529+ tmp[len-1] = '\0';
88530+ *name = tmp;
88531+
88532+ return 0;
88533+}
88534+
88535+static int
88536+copy_user_glob(struct acl_object_label *obj)
88537+{
88538+ struct acl_object_label *g_tmp, **guser;
88539+ int error;
88540+
88541+ if (obj->globbed == NULL)
88542+ return 0;
88543+
88544+ guser = &obj->globbed;
88545+ while (*guser) {
88546+ g_tmp = (struct acl_object_label *)
88547+ acl_alloc(sizeof (struct acl_object_label));
88548+ if (g_tmp == NULL)
88549+ return -ENOMEM;
88550+
88551+ if (copy_acl_object_label(g_tmp, *guser))
88552+ return -EFAULT;
88553+
88554+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
88555+ if (error)
88556+ return error;
88557+
88558+ *guser = g_tmp;
88559+ guser = &(g_tmp->next);
88560+ }
88561+
88562+ return 0;
88563+}
88564+
88565+static int
88566+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
88567+ struct acl_role_label *role)
88568+{
88569+ struct acl_object_label *o_tmp;
88570+ int ret;
88571+
88572+ while (userp) {
88573+ if ((o_tmp = (struct acl_object_label *)
88574+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
88575+ return -ENOMEM;
88576+
88577+ if (copy_acl_object_label(o_tmp, userp))
88578+ return -EFAULT;
88579+
88580+ userp = o_tmp->prev;
88581+
88582+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
88583+ if (ret)
88584+ return ret;
88585+
88586+ insert_acl_obj_label(o_tmp, subj);
88587+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
88588+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
88589+ return -ENOMEM;
88590+
88591+ ret = copy_user_glob(o_tmp);
88592+ if (ret)
88593+ return ret;
88594+
88595+ if (o_tmp->nested) {
88596+ int already_copied;
88597+
88598+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
88599+ if (IS_ERR(o_tmp->nested))
88600+ return PTR_ERR(o_tmp->nested);
88601+
88602+ /* insert into nested subject list if we haven't copied this one yet
88603+ to prevent duplicate entries */
88604+ if (!already_copied) {
88605+ o_tmp->nested->next = role->hash->first;
88606+ role->hash->first = o_tmp->nested;
88607+ }
88608+ }
88609+ }
88610+
88611+ return 0;
88612+}
88613+
88614+static __u32
88615+count_user_subjs(struct acl_subject_label *userp)
88616+{
88617+ struct acl_subject_label s_tmp;
88618+ __u32 num = 0;
88619+
88620+ while (userp) {
88621+ if (copy_acl_subject_label(&s_tmp, userp))
88622+ break;
88623+
88624+ userp = s_tmp.prev;
88625+ }
88626+
88627+ return num;
88628+}
88629+
88630+static int
88631+copy_user_allowedips(struct acl_role_label *rolep)
88632+{
88633+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
88634+
88635+ ruserip = rolep->allowed_ips;
88636+
88637+ while (ruserip) {
88638+ rlast = rtmp;
88639+
88640+ if ((rtmp = (struct role_allowed_ip *)
88641+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
88642+ return -ENOMEM;
88643+
88644+ if (copy_role_allowed_ip(rtmp, ruserip))
88645+ return -EFAULT;
88646+
88647+ ruserip = rtmp->prev;
88648+
88649+ if (!rlast) {
88650+ rtmp->prev = NULL;
88651+ rolep->allowed_ips = rtmp;
88652+ } else {
88653+ rlast->next = rtmp;
88654+ rtmp->prev = rlast;
88655+ }
88656+
88657+ if (!ruserip)
88658+ rtmp->next = NULL;
88659+ }
88660+
88661+ return 0;
88662+}
88663+
88664+static int
88665+copy_user_transitions(struct acl_role_label *rolep)
88666+{
88667+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
88668+ int error;
88669+
88670+ rusertp = rolep->transitions;
88671+
88672+ while (rusertp) {
88673+ rlast = rtmp;
88674+
88675+ if ((rtmp = (struct role_transition *)
88676+ acl_alloc(sizeof (struct role_transition))) == NULL)
88677+ return -ENOMEM;
88678+
88679+ if (copy_role_transition(rtmp, rusertp))
88680+ return -EFAULT;
88681+
88682+ rusertp = rtmp->prev;
88683+
88684+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
88685+ if (error)
88686+ return error;
88687+
88688+ if (!rlast) {
88689+ rtmp->prev = NULL;
88690+ rolep->transitions = rtmp;
88691+ } else {
88692+ rlast->next = rtmp;
88693+ rtmp->prev = rlast;
88694+ }
88695+
88696+ if (!rusertp)
88697+ rtmp->next = NULL;
88698+ }
88699+
88700+ return 0;
88701+}
88702+
88703+static __u32 count_user_objs(const struct acl_object_label __user *userp)
88704+{
88705+ struct acl_object_label o_tmp;
88706+ __u32 num = 0;
88707+
88708+ while (userp) {
88709+ if (copy_acl_object_label(&o_tmp, userp))
88710+ break;
88711+
88712+ userp = o_tmp.prev;
88713+ num++;
88714+ }
88715+
88716+ return num;
88717+}
88718+
88719+static struct acl_subject_label *
88720+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
88721+{
88722+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
88723+ __u32 num_objs;
88724+ struct acl_ip_label **i_tmp, *i_utmp2;
88725+ struct gr_hash_struct ghash;
88726+ struct subject_map *subjmap;
88727+ unsigned int i_num;
88728+ int err;
88729+
88730+ if (already_copied != NULL)
88731+ *already_copied = 0;
88732+
88733+ s_tmp = lookup_subject_map(userp);
88734+
88735+ /* we've already copied this subject into the kernel, just return
88736+ the reference to it, and don't copy it over again
88737+ */
88738+ if (s_tmp) {
88739+ if (already_copied != NULL)
88740+ *already_copied = 1;
88741+ return(s_tmp);
88742+ }
88743+
88744+ if ((s_tmp = (struct acl_subject_label *)
88745+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
88746+ return ERR_PTR(-ENOMEM);
88747+
88748+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
88749+ if (subjmap == NULL)
88750+ return ERR_PTR(-ENOMEM);
88751+
88752+ subjmap->user = userp;
88753+ subjmap->kernel = s_tmp;
88754+ insert_subj_map_entry(subjmap);
88755+
88756+ if (copy_acl_subject_label(s_tmp, userp))
88757+ return ERR_PTR(-EFAULT);
88758+
88759+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
88760+ if (err)
88761+ return ERR_PTR(err);
88762+
88763+ if (!strcmp(s_tmp->filename, "/"))
88764+ role->root_label = s_tmp;
88765+
88766+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
88767+ return ERR_PTR(-EFAULT);
88768+
88769+ /* copy user and group transition tables */
88770+
88771+ if (s_tmp->user_trans_num) {
88772+ uid_t *uidlist;
88773+
88774+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
88775+ if (uidlist == NULL)
88776+ return ERR_PTR(-ENOMEM);
88777+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
88778+ return ERR_PTR(-EFAULT);
88779+
88780+ s_tmp->user_transitions = uidlist;
88781+ }
88782+
88783+ if (s_tmp->group_trans_num) {
88784+ gid_t *gidlist;
88785+
88786+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
88787+ if (gidlist == NULL)
88788+ return ERR_PTR(-ENOMEM);
88789+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
88790+ return ERR_PTR(-EFAULT);
88791+
88792+ s_tmp->group_transitions = gidlist;
88793+ }
88794+
88795+ /* set up object hash table */
88796+ num_objs = count_user_objs(ghash.first);
88797+
88798+ s_tmp->obj_hash_size = num_objs;
88799+ s_tmp->obj_hash =
88800+ (struct acl_object_label **)
88801+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
88802+
88803+ if (!s_tmp->obj_hash)
88804+ return ERR_PTR(-ENOMEM);
88805+
88806+ memset(s_tmp->obj_hash, 0,
88807+ s_tmp->obj_hash_size *
88808+ sizeof (struct acl_object_label *));
88809+
88810+ /* add in objects */
88811+ err = copy_user_objs(ghash.first, s_tmp, role);
88812+
88813+ if (err)
88814+ return ERR_PTR(err);
88815+
88816+ /* set pointer for parent subject */
88817+ if (s_tmp->parent_subject) {
88818+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
88819+
88820+ if (IS_ERR(s_tmp2))
88821+ return s_tmp2;
88822+
88823+ s_tmp->parent_subject = s_tmp2;
88824+ }
88825+
88826+ /* add in ip acls */
88827+
88828+ if (!s_tmp->ip_num) {
88829+ s_tmp->ips = NULL;
88830+ goto insert;
88831+ }
88832+
88833+ i_tmp =
88834+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
88835+ sizeof (struct acl_ip_label *));
88836+
88837+ if (!i_tmp)
88838+ return ERR_PTR(-ENOMEM);
88839+
88840+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
88841+ *(i_tmp + i_num) =
88842+ (struct acl_ip_label *)
88843+ acl_alloc(sizeof (struct acl_ip_label));
88844+ if (!*(i_tmp + i_num))
88845+ return ERR_PTR(-ENOMEM);
88846+
88847+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
88848+ return ERR_PTR(-EFAULT);
88849+
88850+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
88851+ return ERR_PTR(-EFAULT);
88852+
88853+ if ((*(i_tmp + i_num))->iface == NULL)
88854+ continue;
88855+
88856+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
88857+ if (err)
88858+ return ERR_PTR(err);
88859+ }
88860+
88861+ s_tmp->ips = i_tmp;
88862+
88863+insert:
88864+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
88865+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
88866+ return ERR_PTR(-ENOMEM);
88867+
88868+ return s_tmp;
88869+}
88870+
88871+static int
88872+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
88873+{
88874+ struct acl_subject_label s_pre;
88875+ struct acl_subject_label * ret;
88876+ int err;
88877+
88878+ while (userp) {
88879+ if (copy_acl_subject_label(&s_pre, userp))
88880+ return -EFAULT;
88881+
88882+ ret = do_copy_user_subj(userp, role, NULL);
88883+
88884+ err = PTR_ERR(ret);
88885+ if (IS_ERR(ret))
88886+ return err;
88887+
88888+ insert_acl_subj_label(ret, role);
88889+
88890+ userp = s_pre.prev;
88891+ }
88892+
88893+ return 0;
88894+}
88895+
88896+static int
88897+copy_user_acl(struct gr_arg *arg)
88898+{
88899+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
88900+ struct acl_subject_label *subj_list;
88901+ struct sprole_pw *sptmp;
88902+ struct gr_hash_struct *ghash;
88903+ uid_t *domainlist;
88904+ unsigned int r_num;
88905+ int err = 0;
88906+ __u16 i;
88907+ __u32 num_subjs;
88908+
88909+ /* we need a default and kernel role */
88910+ if (arg->role_db.num_roles < 2)
88911+ return -EINVAL;
88912+
88913+ /* copy special role authentication info from userspace */
88914+
88915+ polstate->num_sprole_pws = arg->num_sprole_pws;
88916+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
88917+
88918+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
88919+ return -ENOMEM;
88920+
88921+ for (i = 0; i < polstate->num_sprole_pws; i++) {
88922+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
88923+ if (!sptmp)
88924+ return -ENOMEM;
88925+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
88926+ return -EFAULT;
88927+
88928+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
88929+ if (err)
88930+ return err;
88931+
88932+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
88933+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
88934+#endif
88935+
88936+ polstate->acl_special_roles[i] = sptmp;
88937+ }
88938+
88939+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
88940+
88941+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
88942+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
88943+
88944+ if (!r_tmp)
88945+ return -ENOMEM;
88946+
88947+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
88948+ return -EFAULT;
88949+
88950+ if (copy_acl_role_label(r_tmp, r_utmp2))
88951+ return -EFAULT;
88952+
88953+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
88954+ if (err)
88955+ return err;
88956+
88957+ if (!strcmp(r_tmp->rolename, "default")
88958+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
88959+ polstate->default_role = r_tmp;
88960+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
88961+ polstate->kernel_role = r_tmp;
88962+ }
88963+
88964+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
88965+ return -ENOMEM;
88966+
88967+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
88968+ return -EFAULT;
88969+
88970+ r_tmp->hash = ghash;
88971+
88972+ num_subjs = count_user_subjs(r_tmp->hash->first);
88973+
88974+ r_tmp->subj_hash_size = num_subjs;
88975+ r_tmp->subj_hash =
88976+ (struct acl_subject_label **)
88977+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
88978+
88979+ if (!r_tmp->subj_hash)
88980+ return -ENOMEM;
88981+
88982+ err = copy_user_allowedips(r_tmp);
88983+ if (err)
88984+ return err;
88985+
88986+ /* copy domain info */
88987+ if (r_tmp->domain_children != NULL) {
88988+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
88989+ if (domainlist == NULL)
88990+ return -ENOMEM;
88991+
88992+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
88993+ return -EFAULT;
88994+
88995+ r_tmp->domain_children = domainlist;
88996+ }
88997+
88998+ err = copy_user_transitions(r_tmp);
88999+ if (err)
89000+ return err;
89001+
89002+ memset(r_tmp->subj_hash, 0,
89003+ r_tmp->subj_hash_size *
89004+ sizeof (struct acl_subject_label *));
89005+
89006+ /* acquire the list of subjects, then NULL out
89007+ the list prior to parsing the subjects for this role,
89008+ as during this parsing the list is replaced with a list
89009+ of *nested* subjects for the role
89010+ */
89011+ subj_list = r_tmp->hash->first;
89012+
89013+ /* set nested subject list to null */
89014+ r_tmp->hash->first = NULL;
89015+
89016+ err = copy_user_subjs(subj_list, r_tmp);
89017+
89018+ if (err)
89019+ return err;
89020+
89021+ insert_acl_role_label(r_tmp);
89022+ }
89023+
89024+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
89025+ return -EINVAL;
89026+
89027+ return err;
89028+}
89029+
89030+static int gracl_reload_apply_policies(void *reload)
89031+{
89032+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
89033+ struct task_struct *task, *task2;
89034+ struct acl_role_label *role, *rtmp;
89035+ struct acl_subject_label *subj;
89036+ const struct cred *cred;
89037+ int role_applied;
89038+ int ret = 0;
89039+
89040+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
89041+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
89042+
89043+ /* first make sure we'll be able to apply the new policy cleanly */
89044+ do_each_thread(task2, task) {
89045+ if (task->exec_file == NULL)
89046+ continue;
89047+ role_applied = 0;
89048+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89049+ /* preserve special roles */
89050+ FOR_EACH_ROLE_START(role)
89051+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89052+ rtmp = task->role;
89053+ task->role = role;
89054+ role_applied = 1;
89055+ break;
89056+ }
89057+ FOR_EACH_ROLE_END(role)
89058+ }
89059+ if (!role_applied) {
89060+ cred = __task_cred(task);
89061+ rtmp = task->role;
89062+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89063+ }
89064+ /* this handles non-nested inherited subjects, nested subjects will still
89065+ be dropped currently */
89066+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89067+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
89068+ /* change the role back so that we've made no modifications to the policy */
89069+ task->role = rtmp;
89070+
89071+ if (subj == NULL || task->tmpacl == NULL) {
89072+ ret = -EINVAL;
89073+ goto out;
89074+ }
89075+ } while_each_thread(task2, task);
89076+
89077+ /* now actually apply the policy */
89078+
89079+ do_each_thread(task2, task) {
89080+ if (task->exec_file) {
89081+ role_applied = 0;
89082+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89083+ /* preserve special roles */
89084+ FOR_EACH_ROLE_START(role)
89085+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89086+ task->role = role;
89087+ role_applied = 1;
89088+ break;
89089+ }
89090+ FOR_EACH_ROLE_END(role)
89091+ }
89092+ if (!role_applied) {
89093+ cred = __task_cred(task);
89094+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89095+ }
89096+ /* this handles non-nested inherited subjects, nested subjects will still
89097+ be dropped currently */
89098+ if (!reload_state->oldmode && task->inherited)
89099+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89100+ else {
89101+ /* looked up and tagged to the task previously */
89102+ subj = task->tmpacl;
89103+ }
89104+ /* subj will be non-null */
89105+ __gr_apply_subject_to_task(polstate, task, subj);
89106+ if (reload_state->oldmode) {
89107+ task->acl_role_id = 0;
89108+ task->acl_sp_role = 0;
89109+ task->inherited = 0;
89110+ }
89111+ } else {
89112+ // it's a kernel process
89113+ task->role = polstate->kernel_role;
89114+ task->acl = polstate->kernel_role->root_label;
89115+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89116+ task->acl->mode &= ~GR_PROCFIND;
89117+#endif
89118+ }
89119+ } while_each_thread(task2, task);
89120+
89121+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
89122+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
89123+
89124+out:
89125+
89126+ return ret;
89127+}
89128+
89129+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
89130+{
89131+ struct gr_reload_state new_reload_state = { };
89132+ int err;
89133+
89134+ new_reload_state.oldpolicy_ptr = polstate;
89135+ new_reload_state.oldalloc_ptr = current_alloc_state;
89136+ new_reload_state.oldmode = oldmode;
89137+
89138+ current_alloc_state = &new_reload_state.newalloc;
89139+ polstate = &new_reload_state.newpolicy;
89140+
89141+ /* everything relevant is now saved off, copy in the new policy */
89142+ if (init_variables(args, true)) {
89143+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89144+ err = -ENOMEM;
89145+ goto error;
89146+ }
89147+
89148+ err = copy_user_acl(args);
89149+ free_init_variables();
89150+ if (err)
89151+ goto error;
89152+ /* the new policy is copied in, with the old policy available via saved_state
89153+ first go through applying roles, making sure to preserve special roles
89154+ then apply new subjects, making sure to preserve inherited and nested subjects,
89155+ though currently only inherited subjects will be preserved
89156+ */
89157+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
89158+ if (err)
89159+ goto error;
89160+
89161+ /* we've now applied the new policy, so restore the old policy state to free it */
89162+ polstate = &new_reload_state.oldpolicy;
89163+ current_alloc_state = &new_reload_state.oldalloc;
89164+ free_variables(true);
89165+
89166+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
89167+ to running_polstate/current_alloc_state inside stop_machine
89168+ */
89169+ err = 0;
89170+ goto out;
89171+error:
89172+ /* on error of loading the new policy, we'll just keep the previous
89173+ policy set around
89174+ */
89175+ free_variables(true);
89176+
89177+ /* doesn't affect runtime, but maintains consistent state */
89178+out:
89179+ polstate = new_reload_state.oldpolicy_ptr;
89180+ current_alloc_state = new_reload_state.oldalloc_ptr;
89181+
89182+ return err;
89183+}
89184+
89185+static int
89186+gracl_init(struct gr_arg *args)
89187+{
89188+ int error = 0;
89189+
89190+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
89191+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
89192+
89193+ if (init_variables(args, false)) {
89194+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89195+ error = -ENOMEM;
89196+ goto out;
89197+ }
89198+
89199+ error = copy_user_acl(args);
89200+ free_init_variables();
89201+ if (error)
89202+ goto out;
89203+
89204+ error = gr_set_acls(0);
89205+ if (error)
89206+ goto out;
89207+
89208+ gr_enable_rbac_system();
89209+
89210+ return 0;
89211+
89212+out:
89213+ free_variables(false);
89214+ return error;
89215+}
89216+
89217+static int
89218+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
89219+ unsigned char **sum)
89220+{
89221+ struct acl_role_label *r;
89222+ struct role_allowed_ip *ipp;
89223+ struct role_transition *trans;
89224+ unsigned int i;
89225+ int found = 0;
89226+ u32 curr_ip = current->signal->curr_ip;
89227+
89228+ current->signal->saved_ip = curr_ip;
89229+
89230+ /* check transition table */
89231+
89232+ for (trans = current->role->transitions; trans; trans = trans->next) {
89233+ if (!strcmp(rolename, trans->rolename)) {
89234+ found = 1;
89235+ break;
89236+ }
89237+ }
89238+
89239+ if (!found)
89240+ return 0;
89241+
89242+ /* handle special roles that do not require authentication
89243+ and check ip */
89244+
89245+ FOR_EACH_ROLE_START(r)
89246+ if (!strcmp(rolename, r->rolename) &&
89247+ (r->roletype & GR_ROLE_SPECIAL)) {
89248+ found = 0;
89249+ if (r->allowed_ips != NULL) {
89250+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
89251+ if ((ntohl(curr_ip) & ipp->netmask) ==
89252+ (ntohl(ipp->addr) & ipp->netmask))
89253+ found = 1;
89254+ }
89255+ } else
89256+ found = 2;
89257+ if (!found)
89258+ return 0;
89259+
89260+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
89261+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
89262+ *salt = NULL;
89263+ *sum = NULL;
89264+ return 1;
89265+ }
89266+ }
89267+ FOR_EACH_ROLE_END(r)
89268+
89269+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89270+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
89271+ *salt = polstate->acl_special_roles[i]->salt;
89272+ *sum = polstate->acl_special_roles[i]->sum;
89273+ return 1;
89274+ }
89275+ }
89276+
89277+ return 0;
89278+}
89279+
89280+int gr_check_secure_terminal(struct task_struct *task)
89281+{
89282+ struct task_struct *p, *p2, *p3;
89283+ struct files_struct *files;
89284+ struct fdtable *fdt;
89285+ struct file *our_file = NULL, *file;
89286+ struct inode *our_inode = NULL;
89287+ int i;
89288+
89289+ if (task->signal->tty == NULL)
89290+ return 1;
89291+
89292+ files = get_files_struct(task);
89293+ if (files != NULL) {
89294+ rcu_read_lock();
89295+ fdt = files_fdtable(files);
89296+ for (i=0; i < fdt->max_fds; i++) {
89297+ file = fcheck_files(files, i);
89298+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
89299+ get_file(file);
89300+ our_file = file;
89301+ }
89302+ }
89303+ rcu_read_unlock();
89304+ put_files_struct(files);
89305+ }
89306+
89307+ if (our_file == NULL)
89308+ return 1;
89309+
89310+ our_inode = d_backing_inode(our_file->f_path.dentry);
89311+
89312+ read_lock(&tasklist_lock);
89313+ do_each_thread(p2, p) {
89314+ files = get_files_struct(p);
89315+ if (files == NULL ||
89316+ (p->signal && p->signal->tty == task->signal->tty)) {
89317+ if (files != NULL)
89318+ put_files_struct(files);
89319+ continue;
89320+ }
89321+ rcu_read_lock();
89322+ fdt = files_fdtable(files);
89323+ for (i=0; i < fdt->max_fds; i++) {
89324+ struct inode *inode = NULL;
89325+ file = fcheck_files(files, i);
89326+ if (file)
89327+ inode = d_backing_inode(file->f_path.dentry);
89328+ if (inode && S_ISCHR(inode->i_mode) && inode->i_rdev == our_inode->i_rdev) {
89329+ p3 = task;
89330+ while (task_pid_nr(p3) > 0) {
89331+ if (p3 == p)
89332+ break;
89333+ p3 = p3->real_parent;
89334+ }
89335+ if (p3 == p)
89336+ break;
89337+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
89338+ gr_handle_alertkill(p);
89339+ rcu_read_unlock();
89340+ put_files_struct(files);
89341+ read_unlock(&tasklist_lock);
89342+ fput(our_file);
89343+ return 0;
89344+ }
89345+ }
89346+ rcu_read_unlock();
89347+ put_files_struct(files);
89348+ } while_each_thread(p2, p);
89349+ read_unlock(&tasklist_lock);
89350+
89351+ fput(our_file);
89352+ return 1;
89353+}
89354+
89355+ssize_t
89356+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
89357+{
89358+ struct gr_arg_wrapper uwrap;
89359+ unsigned char *sprole_salt = NULL;
89360+ unsigned char *sprole_sum = NULL;
89361+ int error = 0;
89362+ int error2 = 0;
89363+ size_t req_count = 0;
89364+ unsigned char oldmode = 0;
89365+
89366+ mutex_lock(&gr_dev_mutex);
89367+
89368+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
89369+ error = -EPERM;
89370+ goto out;
89371+ }
89372+
89373+#ifdef CONFIG_COMPAT
89374+ pax_open_kernel();
89375+ if (is_compat_task()) {
89376+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
89377+ copy_gr_arg = &copy_gr_arg_compat;
89378+ copy_acl_object_label = &copy_acl_object_label_compat;
89379+ copy_acl_subject_label = &copy_acl_subject_label_compat;
89380+ copy_acl_role_label = &copy_acl_role_label_compat;
89381+ copy_acl_ip_label = &copy_acl_ip_label_compat;
89382+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
89383+ copy_role_transition = &copy_role_transition_compat;
89384+ copy_sprole_pw = &copy_sprole_pw_compat;
89385+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
89386+ copy_pointer_from_array = &copy_pointer_from_array_compat;
89387+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
89388+ } else {
89389+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
89390+ copy_gr_arg = &copy_gr_arg_normal;
89391+ copy_acl_object_label = &copy_acl_object_label_normal;
89392+ copy_acl_subject_label = &copy_acl_subject_label_normal;
89393+ copy_acl_role_label = &copy_acl_role_label_normal;
89394+ copy_acl_ip_label = &copy_acl_ip_label_normal;
89395+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
89396+ copy_role_transition = &copy_role_transition_normal;
89397+ copy_sprole_pw = &copy_sprole_pw_normal;
89398+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
89399+ copy_pointer_from_array = &copy_pointer_from_array_normal;
89400+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
89401+ }
89402+ pax_close_kernel();
89403+#endif
89404+
89405+ req_count = get_gr_arg_wrapper_size();
89406+
89407+ if (count != req_count) {
89408+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
89409+ error = -EINVAL;
89410+ goto out;
89411+ }
89412+
89413+
89414+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
89415+ gr_auth_expires = 0;
89416+ gr_auth_attempts = 0;
89417+ }
89418+
89419+ error = copy_gr_arg_wrapper(buf, &uwrap);
89420+ if (error)
89421+ goto out;
89422+
89423+ error = copy_gr_arg(uwrap.arg, gr_usermode);
89424+ if (error)
89425+ goto out;
89426+
89427+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89428+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89429+ time_after(gr_auth_expires, get_seconds())) {
89430+ error = -EBUSY;
89431+ goto out;
89432+ }
89433+
89434+ /* if non-root trying to do anything other than use a special role,
89435+ do not attempt authentication, do not count towards authentication
89436+ locking
89437+ */
89438+
89439+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
89440+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89441+ gr_is_global_nonroot(current_uid())) {
89442+ error = -EPERM;
89443+ goto out;
89444+ }
89445+
89446+ /* ensure pw and special role name are null terminated */
89447+
89448+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
89449+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
89450+
89451+ /* Okay.
89452+ * We have our enough of the argument structure..(we have yet
89453+ * to copy_from_user the tables themselves) . Copy the tables
89454+ * only if we need them, i.e. for loading operations. */
89455+
89456+ switch (gr_usermode->mode) {
89457+ case GR_STATUS:
89458+ if (gr_acl_is_enabled()) {
89459+ error = 1;
89460+ if (!gr_check_secure_terminal(current))
89461+ error = 3;
89462+ } else
89463+ error = 2;
89464+ goto out;
89465+ case GR_SHUTDOWN:
89466+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89467+ stop_machine(gr_rbac_disable, NULL, NULL);
89468+ free_variables(false);
89469+ memset(gr_usermode, 0, sizeof(struct gr_arg));
89470+ memset(gr_system_salt, 0, GR_SALT_LEN);
89471+ memset(gr_system_sum, 0, GR_SHA_LEN);
89472+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
89473+ } else if (gr_acl_is_enabled()) {
89474+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
89475+ error = -EPERM;
89476+ } else {
89477+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
89478+ error = -EAGAIN;
89479+ }
89480+ break;
89481+ case GR_ENABLE:
89482+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
89483+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
89484+ else {
89485+ if (gr_acl_is_enabled())
89486+ error = -EAGAIN;
89487+ else
89488+ error = error2;
89489+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
89490+ }
89491+ break;
89492+ case GR_OLDRELOAD:
89493+ oldmode = 1;
89494+ case GR_RELOAD:
89495+ if (!gr_acl_is_enabled()) {
89496+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
89497+ error = -EAGAIN;
89498+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89499+ error2 = gracl_reload(gr_usermode, oldmode);
89500+ if (!error2)
89501+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
89502+ else {
89503+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89504+ error = error2;
89505+ }
89506+ } else {
89507+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89508+ error = -EPERM;
89509+ }
89510+ break;
89511+ case GR_SEGVMOD:
89512+ if (unlikely(!gr_acl_is_enabled())) {
89513+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
89514+ error = -EAGAIN;
89515+ break;
89516+ }
89517+
89518+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89519+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
89520+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
89521+ struct acl_subject_label *segvacl;
89522+ segvacl =
89523+ lookup_acl_subj_label(gr_usermode->segv_inode,
89524+ gr_usermode->segv_device,
89525+ current->role);
89526+ if (segvacl) {
89527+ segvacl->crashes = 0;
89528+ segvacl->expires = 0;
89529+ }
89530+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
89531+ gr_remove_uid(gr_usermode->segv_uid);
89532+ }
89533+ } else {
89534+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
89535+ error = -EPERM;
89536+ }
89537+ break;
89538+ case GR_SPROLE:
89539+ case GR_SPROLEPAM:
89540+ if (unlikely(!gr_acl_is_enabled())) {
89541+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
89542+ error = -EAGAIN;
89543+ break;
89544+ }
89545+
89546+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
89547+ current->role->expires = 0;
89548+ current->role->auth_attempts = 0;
89549+ }
89550+
89551+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89552+ time_after(current->role->expires, get_seconds())) {
89553+ error = -EBUSY;
89554+ goto out;
89555+ }
89556+
89557+ if (lookup_special_role_auth
89558+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
89559+ && ((!sprole_salt && !sprole_sum)
89560+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
89561+ char *p = "";
89562+ assign_special_role(gr_usermode->sp_role);
89563+ read_lock(&tasklist_lock);
89564+ if (current->real_parent)
89565+ p = current->real_parent->role->rolename;
89566+ read_unlock(&tasklist_lock);
89567+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
89568+ p, acl_sp_role_value);
89569+ } else {
89570+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
89571+ error = -EPERM;
89572+ if(!(current->role->auth_attempts++))
89573+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89574+
89575+ goto out;
89576+ }
89577+ break;
89578+ case GR_UNSPROLE:
89579+ if (unlikely(!gr_acl_is_enabled())) {
89580+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
89581+ error = -EAGAIN;
89582+ break;
89583+ }
89584+
89585+ if (current->role->roletype & GR_ROLE_SPECIAL) {
89586+ char *p = "";
89587+ int i = 0;
89588+
89589+ read_lock(&tasklist_lock);
89590+ if (current->real_parent) {
89591+ p = current->real_parent->role->rolename;
89592+ i = current->real_parent->acl_role_id;
89593+ }
89594+ read_unlock(&tasklist_lock);
89595+
89596+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
89597+ gr_set_acls(1);
89598+ } else {
89599+ error = -EPERM;
89600+ goto out;
89601+ }
89602+ break;
89603+ default:
89604+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
89605+ error = -EINVAL;
89606+ break;
89607+ }
89608+
89609+ if (error != -EPERM)
89610+ goto out;
89611+
89612+ if(!(gr_auth_attempts++))
89613+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89614+
89615+ out:
89616+ mutex_unlock(&gr_dev_mutex);
89617+
89618+ if (!error)
89619+ error = req_count;
89620+
89621+ return error;
89622+}
89623+
89624+int
89625+gr_set_acls(const int type)
89626+{
89627+ struct task_struct *task, *task2;
89628+ struct acl_role_label *role = current->role;
89629+ struct acl_subject_label *subj;
89630+ __u16 acl_role_id = current->acl_role_id;
89631+ const struct cred *cred;
89632+ int ret;
89633+
89634+ rcu_read_lock();
89635+ read_lock(&tasklist_lock);
89636+ read_lock(&grsec_exec_file_lock);
89637+ do_each_thread(task2, task) {
89638+ /* check to see if we're called from the exit handler,
89639+ if so, only replace ACLs that have inherited the admin
89640+ ACL */
89641+
89642+ if (type && (task->role != role ||
89643+ task->acl_role_id != acl_role_id))
89644+ continue;
89645+
89646+ task->acl_role_id = 0;
89647+ task->acl_sp_role = 0;
89648+ task->inherited = 0;
89649+
89650+ if (task->exec_file) {
89651+ cred = __task_cred(task);
89652+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89653+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
89654+ if (subj == NULL) {
89655+ ret = -EINVAL;
89656+ read_unlock(&grsec_exec_file_lock);
89657+ read_unlock(&tasklist_lock);
89658+ rcu_read_unlock();
89659+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
89660+ return ret;
89661+ }
89662+ __gr_apply_subject_to_task(polstate, task, subj);
89663+ } else {
89664+ // it's a kernel process
89665+ task->role = polstate->kernel_role;
89666+ task->acl = polstate->kernel_role->root_label;
89667+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89668+ task->acl->mode &= ~GR_PROCFIND;
89669+#endif
89670+ }
89671+ } while_each_thread(task2, task);
89672+ read_unlock(&grsec_exec_file_lock);
89673+ read_unlock(&tasklist_lock);
89674+ rcu_read_unlock();
89675+
89676+ return 0;
89677+}
89678diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
89679new file mode 100644
89680index 0000000..39645c9
89681--- /dev/null
89682+++ b/grsecurity/gracl_res.c
89683@@ -0,0 +1,68 @@
89684+#include <linux/kernel.h>
89685+#include <linux/sched.h>
89686+#include <linux/gracl.h>
89687+#include <linux/grinternal.h>
89688+
89689+static const char *restab_log[] = {
89690+ [RLIMIT_CPU] = "RLIMIT_CPU",
89691+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
89692+ [RLIMIT_DATA] = "RLIMIT_DATA",
89693+ [RLIMIT_STACK] = "RLIMIT_STACK",
89694+ [RLIMIT_CORE] = "RLIMIT_CORE",
89695+ [RLIMIT_RSS] = "RLIMIT_RSS",
89696+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
89697+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
89698+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
89699+ [RLIMIT_AS] = "RLIMIT_AS",
89700+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
89701+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
89702+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
89703+ [RLIMIT_NICE] = "RLIMIT_NICE",
89704+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
89705+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
89706+ [GR_CRASH_RES] = "RLIMIT_CRASH"
89707+};
89708+
89709+void
89710+gr_log_resource(const struct task_struct *task,
89711+ const int res, const unsigned long wanted, const int gt)
89712+{
89713+ const struct cred *cred;
89714+ unsigned long rlim;
89715+
89716+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
89717+ return;
89718+
89719+ // not yet supported resource
89720+ if (unlikely(!restab_log[res]))
89721+ return;
89722+
89723+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
89724+ rlim = task_rlimit_max(task, res);
89725+ else
89726+ rlim = task_rlimit(task, res);
89727+
89728+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
89729+ return;
89730+
89731+ rcu_read_lock();
89732+ cred = __task_cred(task);
89733+
89734+ if (res == RLIMIT_NPROC &&
89735+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
89736+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
89737+ goto out_rcu_unlock;
89738+ else if (res == RLIMIT_MEMLOCK &&
89739+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
89740+ goto out_rcu_unlock;
89741+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
89742+ goto out_rcu_unlock;
89743+ rcu_read_unlock();
89744+
89745+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
89746+
89747+ return;
89748+out_rcu_unlock:
89749+ rcu_read_unlock();
89750+ return;
89751+}
89752diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
89753new file mode 100644
89754index 0000000..21646aa
89755--- /dev/null
89756+++ b/grsecurity/gracl_segv.c
89757@@ -0,0 +1,304 @@
89758+#include <linux/kernel.h>
89759+#include <linux/mm.h>
89760+#include <asm/uaccess.h>
89761+#include <asm/errno.h>
89762+#include <asm/mman.h>
89763+#include <net/sock.h>
89764+#include <linux/file.h>
89765+#include <linux/fs.h>
89766+#include <linux/net.h>
89767+#include <linux/in.h>
89768+#include <linux/slab.h>
89769+#include <linux/types.h>
89770+#include <linux/sched.h>
89771+#include <linux/timer.h>
89772+#include <linux/gracl.h>
89773+#include <linux/grsecurity.h>
89774+#include <linux/grinternal.h>
89775+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
89776+#include <linux/magic.h>
89777+#include <linux/pagemap.h>
89778+#include "../fs/btrfs/async-thread.h"
89779+#include "../fs/btrfs/ctree.h"
89780+#include "../fs/btrfs/btrfs_inode.h"
89781+#endif
89782+
89783+static struct crash_uid *uid_set;
89784+static unsigned short uid_used;
89785+static DEFINE_SPINLOCK(gr_uid_lock);
89786+extern rwlock_t gr_inode_lock;
89787+extern struct acl_subject_label *
89788+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
89789+ struct acl_role_label *role);
89790+
89791+int
89792+gr_init_uidset(void)
89793+{
89794+ uid_set =
89795+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
89796+ uid_used = 0;
89797+
89798+ return uid_set ? 1 : 0;
89799+}
89800+
89801+void
89802+gr_free_uidset(void)
89803+{
89804+ if (uid_set) {
89805+ struct crash_uid *tmpset;
89806+ spin_lock(&gr_uid_lock);
89807+ tmpset = uid_set;
89808+ uid_set = NULL;
89809+ uid_used = 0;
89810+ spin_unlock(&gr_uid_lock);
89811+ if (tmpset)
89812+ kfree(tmpset);
89813+ }
89814+
89815+ return;
89816+}
89817+
89818+int
89819+gr_find_uid(const uid_t uid)
89820+{
89821+ struct crash_uid *tmp = uid_set;
89822+ uid_t buid;
89823+ int low = 0, high = uid_used - 1, mid;
89824+
89825+ while (high >= low) {
89826+ mid = (low + high) >> 1;
89827+ buid = tmp[mid].uid;
89828+ if (buid == uid)
89829+ return mid;
89830+ if (buid > uid)
89831+ high = mid - 1;
89832+ if (buid < uid)
89833+ low = mid + 1;
89834+ }
89835+
89836+ return -1;
89837+}
89838+
89839+static void
89840+gr_insertsort(void)
89841+{
89842+ unsigned short i, j;
89843+ struct crash_uid index;
89844+
89845+ for (i = 1; i < uid_used; i++) {
89846+ index = uid_set[i];
89847+ j = i;
89848+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
89849+ uid_set[j] = uid_set[j - 1];
89850+ j--;
89851+ }
89852+ uid_set[j] = index;
89853+ }
89854+
89855+ return;
89856+}
89857+
89858+static void
89859+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
89860+{
89861+ int loc;
89862+ uid_t uid = GR_GLOBAL_UID(kuid);
89863+
89864+ if (uid_used == GR_UIDTABLE_MAX)
89865+ return;
89866+
89867+ loc = gr_find_uid(uid);
89868+
89869+ if (loc >= 0) {
89870+ uid_set[loc].expires = expires;
89871+ return;
89872+ }
89873+
89874+ uid_set[uid_used].uid = uid;
89875+ uid_set[uid_used].expires = expires;
89876+ uid_used++;
89877+
89878+ gr_insertsort();
89879+
89880+ return;
89881+}
89882+
89883+void
89884+gr_remove_uid(const unsigned short loc)
89885+{
89886+ unsigned short i;
89887+
89888+ for (i = loc + 1; i < uid_used; i++)
89889+ uid_set[i - 1] = uid_set[i];
89890+
89891+ uid_used--;
89892+
89893+ return;
89894+}
89895+
89896+int
89897+gr_check_crash_uid(const kuid_t kuid)
89898+{
89899+ int loc;
89900+ int ret = 0;
89901+ uid_t uid;
89902+
89903+ if (unlikely(!gr_acl_is_enabled()))
89904+ return 0;
89905+
89906+ uid = GR_GLOBAL_UID(kuid);
89907+
89908+ spin_lock(&gr_uid_lock);
89909+ loc = gr_find_uid(uid);
89910+
89911+ if (loc < 0)
89912+ goto out_unlock;
89913+
89914+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
89915+ gr_remove_uid(loc);
89916+ else
89917+ ret = 1;
89918+
89919+out_unlock:
89920+ spin_unlock(&gr_uid_lock);
89921+ return ret;
89922+}
89923+
89924+static int
89925+proc_is_setxid(const struct cred *cred)
89926+{
89927+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
89928+ !uid_eq(cred->uid, cred->fsuid))
89929+ return 1;
89930+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
89931+ !gid_eq(cred->gid, cred->fsgid))
89932+ return 1;
89933+
89934+ return 0;
89935+}
89936+
89937+extern int gr_fake_force_sig(int sig, struct task_struct *t);
89938+
89939+void
89940+gr_handle_crash(struct task_struct *task, const int sig)
89941+{
89942+ struct acl_subject_label *curr;
89943+ struct task_struct *tsk, *tsk2;
89944+ const struct cred *cred;
89945+ const struct cred *cred2;
89946+
89947+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
89948+ return;
89949+
89950+ if (unlikely(!gr_acl_is_enabled()))
89951+ return;
89952+
89953+ curr = task->acl;
89954+
89955+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
89956+ return;
89957+
89958+ if (time_before_eq(curr->expires, get_seconds())) {
89959+ curr->expires = 0;
89960+ curr->crashes = 0;
89961+ }
89962+
89963+ curr->crashes++;
89964+
89965+ if (!curr->expires)
89966+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
89967+
89968+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
89969+ time_after(curr->expires, get_seconds())) {
89970+ rcu_read_lock();
89971+ cred = __task_cred(task);
89972+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
89973+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
89974+ spin_lock(&gr_uid_lock);
89975+ gr_insert_uid(cred->uid, curr->expires);
89976+ spin_unlock(&gr_uid_lock);
89977+ curr->expires = 0;
89978+ curr->crashes = 0;
89979+ read_lock(&tasklist_lock);
89980+ do_each_thread(tsk2, tsk) {
89981+ cred2 = __task_cred(tsk);
89982+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
89983+ gr_fake_force_sig(SIGKILL, tsk);
89984+ } while_each_thread(tsk2, tsk);
89985+ read_unlock(&tasklist_lock);
89986+ } else {
89987+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
89988+ read_lock(&tasklist_lock);
89989+ read_lock(&grsec_exec_file_lock);
89990+ do_each_thread(tsk2, tsk) {
89991+ if (likely(tsk != task)) {
89992+ // if this thread has the same subject as the one that triggered
89993+ // RES_CRASH and it's the same binary, kill it
89994+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
89995+ gr_fake_force_sig(SIGKILL, tsk);
89996+ }
89997+ } while_each_thread(tsk2, tsk);
89998+ read_unlock(&grsec_exec_file_lock);
89999+ read_unlock(&tasklist_lock);
90000+ }
90001+ rcu_read_unlock();
90002+ }
90003+
90004+ return;
90005+}
90006+
90007+int
90008+gr_check_crash_exec(const struct file *filp)
90009+{
90010+ struct acl_subject_label *curr;
90011+ struct dentry *dentry;
90012+
90013+ if (unlikely(!gr_acl_is_enabled()))
90014+ return 0;
90015+
90016+ read_lock(&gr_inode_lock);
90017+ dentry = filp->f_path.dentry;
90018+ curr = lookup_acl_subj_label(gr_get_ino_from_dentry(dentry), gr_get_dev_from_dentry(dentry),
90019+ current->role);
90020+ read_unlock(&gr_inode_lock);
90021+
90022+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
90023+ (!curr->crashes && !curr->expires))
90024+ return 0;
90025+
90026+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90027+ time_after(curr->expires, get_seconds()))
90028+ return 1;
90029+ else if (time_before_eq(curr->expires, get_seconds())) {
90030+ curr->crashes = 0;
90031+ curr->expires = 0;
90032+ }
90033+
90034+ return 0;
90035+}
90036+
90037+void
90038+gr_handle_alertkill(struct task_struct *task)
90039+{
90040+ struct acl_subject_label *curracl;
90041+ __u32 curr_ip;
90042+ struct task_struct *p, *p2;
90043+
90044+ if (unlikely(!gr_acl_is_enabled()))
90045+ return;
90046+
90047+ curracl = task->acl;
90048+ curr_ip = task->signal->curr_ip;
90049+
90050+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
90051+ read_lock(&tasklist_lock);
90052+ do_each_thread(p2, p) {
90053+ if (p->signal->curr_ip == curr_ip)
90054+ gr_fake_force_sig(SIGKILL, p);
90055+ } while_each_thread(p2, p);
90056+ read_unlock(&tasklist_lock);
90057+ } else if (curracl->mode & GR_KILLPROC)
90058+ gr_fake_force_sig(SIGKILL, task);
90059+
90060+ return;
90061+}
90062diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
90063new file mode 100644
90064index 0000000..6b0c9cc
90065--- /dev/null
90066+++ b/grsecurity/gracl_shm.c
90067@@ -0,0 +1,40 @@
90068+#include <linux/kernel.h>
90069+#include <linux/mm.h>
90070+#include <linux/sched.h>
90071+#include <linux/file.h>
90072+#include <linux/ipc.h>
90073+#include <linux/gracl.h>
90074+#include <linux/grsecurity.h>
90075+#include <linux/grinternal.h>
90076+
90077+int
90078+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90079+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
90080+{
90081+ struct task_struct *task;
90082+
90083+ if (!gr_acl_is_enabled())
90084+ return 1;
90085+
90086+ rcu_read_lock();
90087+ read_lock(&tasklist_lock);
90088+
90089+ task = find_task_by_vpid(shm_cprid);
90090+
90091+ if (unlikely(!task))
90092+ task = find_task_by_vpid(shm_lapid);
90093+
90094+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
90095+ (task_pid_nr(task) == shm_lapid)) &&
90096+ (task->acl->mode & GR_PROTSHM) &&
90097+ (task->acl != current->acl))) {
90098+ read_unlock(&tasklist_lock);
90099+ rcu_read_unlock();
90100+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
90101+ return 0;
90102+ }
90103+ read_unlock(&tasklist_lock);
90104+ rcu_read_unlock();
90105+
90106+ return 1;
90107+}
90108diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
90109new file mode 100644
90110index 0000000..bc0be01
90111--- /dev/null
90112+++ b/grsecurity/grsec_chdir.c
90113@@ -0,0 +1,19 @@
90114+#include <linux/kernel.h>
90115+#include <linux/sched.h>
90116+#include <linux/fs.h>
90117+#include <linux/file.h>
90118+#include <linux/grsecurity.h>
90119+#include <linux/grinternal.h>
90120+
90121+void
90122+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
90123+{
90124+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
90125+ if ((grsec_enable_chdir && grsec_enable_group &&
90126+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
90127+ !grsec_enable_group)) {
90128+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
90129+ }
90130+#endif
90131+ return;
90132+}
90133diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
90134new file mode 100644
90135index 0000000..652ab45
90136--- /dev/null
90137+++ b/grsecurity/grsec_chroot.c
90138@@ -0,0 +1,467 @@
90139+#include <linux/kernel.h>
90140+#include <linux/module.h>
90141+#include <linux/sched.h>
90142+#include <linux/file.h>
90143+#include <linux/fs.h>
90144+#include <linux/mount.h>
90145+#include <linux/types.h>
90146+#include "../fs/mount.h"
90147+#include <linux/grsecurity.h>
90148+#include <linux/grinternal.h>
90149+
90150+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90151+int gr_init_ran;
90152+#endif
90153+
90154+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90155+{
90156+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90157+ struct dentry *tmpd = dentry;
90158+
90159+ read_seqlock_excl(&mount_lock);
90160+ write_seqlock(&rename_lock);
90161+
90162+ while (tmpd != mnt->mnt_root) {
90163+ atomic_inc(&tmpd->chroot_refcnt);
90164+ tmpd = tmpd->d_parent;
90165+ }
90166+ atomic_inc(&tmpd->chroot_refcnt);
90167+
90168+ write_sequnlock(&rename_lock);
90169+ read_sequnlock_excl(&mount_lock);
90170+#endif
90171+}
90172+
90173+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90174+{
90175+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90176+ struct dentry *tmpd = dentry;
90177+
90178+ read_seqlock_excl(&mount_lock);
90179+ write_seqlock(&rename_lock);
90180+
90181+ while (tmpd != mnt->mnt_root) {
90182+ atomic_dec(&tmpd->chroot_refcnt);
90183+ tmpd = tmpd->d_parent;
90184+ }
90185+ atomic_dec(&tmpd->chroot_refcnt);
90186+
90187+ write_sequnlock(&rename_lock);
90188+ read_sequnlock_excl(&mount_lock);
90189+#endif
90190+}
90191+
90192+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90193+static struct dentry *get_closest_chroot(struct dentry *dentry)
90194+{
90195+ write_seqlock(&rename_lock);
90196+ do {
90197+ if (atomic_read(&dentry->chroot_refcnt)) {
90198+ write_sequnlock(&rename_lock);
90199+ return dentry;
90200+ }
90201+ dentry = dentry->d_parent;
90202+ } while (!IS_ROOT(dentry));
90203+ write_sequnlock(&rename_lock);
90204+ return NULL;
90205+}
90206+#endif
90207+
90208+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90209+ struct dentry *newdentry, struct vfsmount *newmnt)
90210+{
90211+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90212+ struct dentry *chroot;
90213+
90214+ if (unlikely(!grsec_enable_chroot_rename))
90215+ return 0;
90216+
90217+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
90218+ return 0;
90219+
90220+ chroot = get_closest_chroot(olddentry);
90221+
90222+ if (chroot == NULL)
90223+ return 0;
90224+
90225+ if (is_subdir(newdentry, chroot))
90226+ return 0;
90227+
90228+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
90229+
90230+ return 1;
90231+#else
90232+ return 0;
90233+#endif
90234+}
90235+
90236+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
90237+{
90238+#ifdef CONFIG_GRKERNSEC
90239+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
90240+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
90241+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90242+ && gr_init_ran
90243+#endif
90244+ )
90245+ task->gr_is_chrooted = 1;
90246+ else {
90247+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90248+ if (task_pid_nr(task) == 1 && !gr_init_ran)
90249+ gr_init_ran = 1;
90250+#endif
90251+ task->gr_is_chrooted = 0;
90252+ }
90253+
90254+ task->gr_chroot_dentry = path->dentry;
90255+#endif
90256+ return;
90257+}
90258+
90259+void gr_clear_chroot_entries(struct task_struct *task)
90260+{
90261+#ifdef CONFIG_GRKERNSEC
90262+ task->gr_is_chrooted = 0;
90263+ task->gr_chroot_dentry = NULL;
90264+#endif
90265+ return;
90266+}
90267+
90268+int
90269+gr_handle_chroot_unix(const pid_t pid)
90270+{
90271+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
90272+ struct task_struct *p;
90273+
90274+ if (unlikely(!grsec_enable_chroot_unix))
90275+ return 1;
90276+
90277+ if (likely(!proc_is_chrooted(current)))
90278+ return 1;
90279+
90280+ rcu_read_lock();
90281+ read_lock(&tasklist_lock);
90282+ p = find_task_by_vpid_unrestricted(pid);
90283+ if (unlikely(p && !have_same_root(current, p))) {
90284+ read_unlock(&tasklist_lock);
90285+ rcu_read_unlock();
90286+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
90287+ return 0;
90288+ }
90289+ read_unlock(&tasklist_lock);
90290+ rcu_read_unlock();
90291+#endif
90292+ return 1;
90293+}
90294+
90295+int
90296+gr_handle_chroot_nice(void)
90297+{
90298+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90299+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
90300+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
90301+ return -EPERM;
90302+ }
90303+#endif
90304+ return 0;
90305+}
90306+
90307+int
90308+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
90309+{
90310+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90311+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
90312+ && proc_is_chrooted(current)) {
90313+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
90314+ return -EACCES;
90315+ }
90316+#endif
90317+ return 0;
90318+}
90319+
90320+int
90321+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
90322+{
90323+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90324+ struct task_struct *p;
90325+ int ret = 0;
90326+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
90327+ return ret;
90328+
90329+ read_lock(&tasklist_lock);
90330+ do_each_pid_task(pid, type, p) {
90331+ if (!have_same_root(current, p)) {
90332+ ret = 1;
90333+ goto out;
90334+ }
90335+ } while_each_pid_task(pid, type, p);
90336+out:
90337+ read_unlock(&tasklist_lock);
90338+ return ret;
90339+#endif
90340+ return 0;
90341+}
90342+
90343+int
90344+gr_pid_is_chrooted(struct task_struct *p)
90345+{
90346+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90347+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
90348+ return 0;
90349+
90350+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
90351+ !have_same_root(current, p)) {
90352+ return 1;
90353+ }
90354+#endif
90355+ return 0;
90356+}
90357+
90358+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
90359+
90360+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
90361+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
90362+{
90363+ struct path path, currentroot;
90364+ int ret = 0;
90365+
90366+ path.dentry = (struct dentry *)u_dentry;
90367+ path.mnt = (struct vfsmount *)u_mnt;
90368+ get_fs_root(current->fs, &currentroot);
90369+ if (path_is_under(&path, &currentroot))
90370+ ret = 1;
90371+ path_put(&currentroot);
90372+
90373+ return ret;
90374+}
90375+#endif
90376+
90377+int
90378+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
90379+{
90380+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90381+ if (!grsec_enable_chroot_fchdir)
90382+ return 1;
90383+
90384+ if (!proc_is_chrooted(current))
90385+ return 1;
90386+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
90387+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
90388+ return 0;
90389+ }
90390+#endif
90391+ return 1;
90392+}
90393+
90394+int
90395+gr_chroot_fhandle(void)
90396+{
90397+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90398+ if (!grsec_enable_chroot_fchdir)
90399+ return 1;
90400+
90401+ if (!proc_is_chrooted(current))
90402+ return 1;
90403+ else {
90404+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
90405+ return 0;
90406+ }
90407+#endif
90408+ return 1;
90409+}
90410+
90411+int
90412+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90413+ const u64 shm_createtime)
90414+{
90415+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
90416+ struct task_struct *p;
90417+
90418+ if (unlikely(!grsec_enable_chroot_shmat))
90419+ return 1;
90420+
90421+ if (likely(!proc_is_chrooted(current)))
90422+ return 1;
90423+
90424+ rcu_read_lock();
90425+ read_lock(&tasklist_lock);
90426+
90427+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
90428+ if (time_before_eq64(p->start_time, shm_createtime)) {
90429+ if (have_same_root(current, p)) {
90430+ goto allow;
90431+ } else {
90432+ read_unlock(&tasklist_lock);
90433+ rcu_read_unlock();
90434+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90435+ return 0;
90436+ }
90437+ }
90438+ /* creator exited, pid reuse, fall through to next check */
90439+ }
90440+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
90441+ if (unlikely(!have_same_root(current, p))) {
90442+ read_unlock(&tasklist_lock);
90443+ rcu_read_unlock();
90444+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90445+ return 0;
90446+ }
90447+ }
90448+
90449+allow:
90450+ read_unlock(&tasklist_lock);
90451+ rcu_read_unlock();
90452+#endif
90453+ return 1;
90454+}
90455+
90456+void
90457+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
90458+{
90459+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
90460+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
90461+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
90462+#endif
90463+ return;
90464+}
90465+
90466+int
90467+gr_handle_chroot_mknod(const struct dentry *dentry,
90468+ const struct vfsmount *mnt, const int mode)
90469+{
90470+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
90471+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
90472+ proc_is_chrooted(current)) {
90473+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
90474+ return -EPERM;
90475+ }
90476+#endif
90477+ return 0;
90478+}
90479+
90480+int
90481+gr_handle_chroot_mount(const struct dentry *dentry,
90482+ const struct vfsmount *mnt, const char *dev_name)
90483+{
90484+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
90485+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
90486+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
90487+ return -EPERM;
90488+ }
90489+#endif
90490+ return 0;
90491+}
90492+
90493+int
90494+gr_handle_chroot_pivot(void)
90495+{
90496+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
90497+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
90498+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
90499+ return -EPERM;
90500+ }
90501+#endif
90502+ return 0;
90503+}
90504+
90505+int
90506+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
90507+{
90508+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
90509+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
90510+ !gr_is_outside_chroot(dentry, mnt)) {
90511+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
90512+ return -EPERM;
90513+ }
90514+#endif
90515+ return 0;
90516+}
90517+
90518+extern const char *captab_log[];
90519+extern int captab_log_entries;
90520+
90521+int
90522+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
90523+{
90524+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90525+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90526+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90527+ if (cap_raised(chroot_caps, cap)) {
90528+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
90529+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
90530+ }
90531+ return 0;
90532+ }
90533+ }
90534+#endif
90535+ return 1;
90536+}
90537+
90538+int
90539+gr_chroot_is_capable(const int cap)
90540+{
90541+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90542+ return gr_task_chroot_is_capable(current, current_cred(), cap);
90543+#endif
90544+ return 1;
90545+}
90546+
90547+int
90548+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
90549+{
90550+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90551+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90552+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90553+ if (cap_raised(chroot_caps, cap)) {
90554+ return 0;
90555+ }
90556+ }
90557+#endif
90558+ return 1;
90559+}
90560+
90561+int
90562+gr_chroot_is_capable_nolog(const int cap)
90563+{
90564+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90565+ return gr_task_chroot_is_capable_nolog(current, cap);
90566+#endif
90567+ return 1;
90568+}
90569+
90570+int
90571+gr_handle_chroot_sysctl(const int op)
90572+{
90573+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
90574+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
90575+ proc_is_chrooted(current))
90576+ return -EACCES;
90577+#endif
90578+ return 0;
90579+}
90580+
90581+void
90582+gr_handle_chroot_chdir(const struct path *path)
90583+{
90584+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
90585+ if (grsec_enable_chroot_chdir)
90586+ set_fs_pwd(current->fs, path);
90587+#endif
90588+ return;
90589+}
90590+
90591+int
90592+gr_handle_chroot_chmod(const struct dentry *dentry,
90593+ const struct vfsmount *mnt, const int mode)
90594+{
90595+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
90596+ /* allow chmod +s on directories, but not files */
90597+ if (grsec_enable_chroot_chmod && !d_is_dir(dentry) &&
90598+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
90599+ proc_is_chrooted(current)) {
90600+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
90601+ return -EPERM;
90602+ }
90603+#endif
90604+ return 0;
90605+}
90606diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
90607new file mode 100644
90608index 0000000..e723c08
90609--- /dev/null
90610+++ b/grsecurity/grsec_disabled.c
90611@@ -0,0 +1,445 @@
90612+#include <linux/kernel.h>
90613+#include <linux/module.h>
90614+#include <linux/sched.h>
90615+#include <linux/file.h>
90616+#include <linux/fs.h>
90617+#include <linux/kdev_t.h>
90618+#include <linux/net.h>
90619+#include <linux/in.h>
90620+#include <linux/ip.h>
90621+#include <linux/skbuff.h>
90622+#include <linux/sysctl.h>
90623+
90624+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
90625+void
90626+pax_set_initial_flags(struct linux_binprm *bprm)
90627+{
90628+ return;
90629+}
90630+#endif
90631+
90632+#ifdef CONFIG_SYSCTL
90633+__u32
90634+gr_handle_sysctl(const struct ctl_table * table, const int op)
90635+{
90636+ return 0;
90637+}
90638+#endif
90639+
90640+#ifdef CONFIG_TASKSTATS
90641+int gr_is_taskstats_denied(int pid)
90642+{
90643+ return 0;
90644+}
90645+#endif
90646+
90647+int
90648+gr_acl_is_enabled(void)
90649+{
90650+ return 0;
90651+}
90652+
90653+int
90654+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
90655+{
90656+ return 0;
90657+}
90658+
90659+void
90660+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
90661+{
90662+ return;
90663+}
90664+
90665+int
90666+gr_handle_rawio(const struct inode *inode)
90667+{
90668+ return 0;
90669+}
90670+
90671+void
90672+gr_acl_handle_psacct(struct task_struct *task, const long code)
90673+{
90674+ return;
90675+}
90676+
90677+int
90678+gr_handle_ptrace(struct task_struct *task, const long request)
90679+{
90680+ return 0;
90681+}
90682+
90683+int
90684+gr_handle_proc_ptrace(struct task_struct *task)
90685+{
90686+ return 0;
90687+}
90688+
90689+int
90690+gr_set_acls(const int type)
90691+{
90692+ return 0;
90693+}
90694+
90695+int
90696+gr_check_hidden_task(const struct task_struct *tsk)
90697+{
90698+ return 0;
90699+}
90700+
90701+int
90702+gr_check_protected_task(const struct task_struct *task)
90703+{
90704+ return 0;
90705+}
90706+
90707+int
90708+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
90709+{
90710+ return 0;
90711+}
90712+
90713+void
90714+gr_copy_label(struct task_struct *tsk)
90715+{
90716+ return;
90717+}
90718+
90719+void
90720+gr_set_pax_flags(struct task_struct *task)
90721+{
90722+ return;
90723+}
90724+
90725+int
90726+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
90727+ const int unsafe_share)
90728+{
90729+ return 0;
90730+}
90731+
90732+void
90733+gr_handle_delete(const u64 ino, const dev_t dev)
90734+{
90735+ return;
90736+}
90737+
90738+void
90739+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
90740+{
90741+ return;
90742+}
90743+
90744+void
90745+gr_handle_crash(struct task_struct *task, const int sig)
90746+{
90747+ return;
90748+}
90749+
90750+int
90751+gr_check_crash_exec(const struct file *filp)
90752+{
90753+ return 0;
90754+}
90755+
90756+int
90757+gr_check_crash_uid(const kuid_t uid)
90758+{
90759+ return 0;
90760+}
90761+
90762+void
90763+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
90764+ struct dentry *old_dentry,
90765+ struct dentry *new_dentry,
90766+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
90767+{
90768+ return;
90769+}
90770+
90771+int
90772+gr_search_socket(const int family, const int type, const int protocol)
90773+{
90774+ return 1;
90775+}
90776+
90777+int
90778+gr_search_connectbind(const int mode, const struct socket *sock,
90779+ const struct sockaddr_in *addr)
90780+{
90781+ return 0;
90782+}
90783+
90784+void
90785+gr_handle_alertkill(struct task_struct *task)
90786+{
90787+ return;
90788+}
90789+
90790+__u32
90791+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
90792+{
90793+ return 1;
90794+}
90795+
90796+__u32
90797+gr_acl_handle_hidden_file(const struct dentry * dentry,
90798+ const struct vfsmount * mnt)
90799+{
90800+ return 1;
90801+}
90802+
90803+__u32
90804+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
90805+ int acc_mode)
90806+{
90807+ return 1;
90808+}
90809+
90810+__u32
90811+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
90812+{
90813+ return 1;
90814+}
90815+
90816+__u32
90817+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
90818+{
90819+ return 1;
90820+}
90821+
90822+int
90823+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
90824+ unsigned int *vm_flags)
90825+{
90826+ return 1;
90827+}
90828+
90829+__u32
90830+gr_acl_handle_truncate(const struct dentry * dentry,
90831+ const struct vfsmount * mnt)
90832+{
90833+ return 1;
90834+}
90835+
90836+__u32
90837+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
90838+{
90839+ return 1;
90840+}
90841+
90842+__u32
90843+gr_acl_handle_access(const struct dentry * dentry,
90844+ const struct vfsmount * mnt, const int fmode)
90845+{
90846+ return 1;
90847+}
90848+
90849+__u32
90850+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
90851+ umode_t *mode)
90852+{
90853+ return 1;
90854+}
90855+
90856+__u32
90857+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
90858+{
90859+ return 1;
90860+}
90861+
90862+__u32
90863+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
90864+{
90865+ return 1;
90866+}
90867+
90868+__u32
90869+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
90870+{
90871+ return 1;
90872+}
90873+
90874+void
90875+grsecurity_init(void)
90876+{
90877+ return;
90878+}
90879+
90880+umode_t gr_acl_umask(void)
90881+{
90882+ return 0;
90883+}
90884+
90885+__u32
90886+gr_acl_handle_mknod(const struct dentry * new_dentry,
90887+ const struct dentry * parent_dentry,
90888+ const struct vfsmount * parent_mnt,
90889+ const int mode)
90890+{
90891+ return 1;
90892+}
90893+
90894+__u32
90895+gr_acl_handle_mkdir(const struct dentry * new_dentry,
90896+ const struct dentry * parent_dentry,
90897+ const struct vfsmount * parent_mnt)
90898+{
90899+ return 1;
90900+}
90901+
90902+__u32
90903+gr_acl_handle_symlink(const struct dentry * new_dentry,
90904+ const struct dentry * parent_dentry,
90905+ const struct vfsmount * parent_mnt, const struct filename *from)
90906+{
90907+ return 1;
90908+}
90909+
90910+__u32
90911+gr_acl_handle_link(const struct dentry * new_dentry,
90912+ const struct dentry * parent_dentry,
90913+ const struct vfsmount * parent_mnt,
90914+ const struct dentry * old_dentry,
90915+ const struct vfsmount * old_mnt, const struct filename *to)
90916+{
90917+ return 1;
90918+}
90919+
90920+int
90921+gr_acl_handle_rename(const struct dentry *new_dentry,
90922+ const struct dentry *parent_dentry,
90923+ const struct vfsmount *parent_mnt,
90924+ const struct dentry *old_dentry,
90925+ const struct inode *old_parent_inode,
90926+ const struct vfsmount *old_mnt, const struct filename *newname,
90927+ unsigned int flags)
90928+{
90929+ return 0;
90930+}
90931+
90932+int
90933+gr_acl_handle_filldir(const struct file *file, const char *name,
90934+ const int namelen, const u64 ino)
90935+{
90936+ return 1;
90937+}
90938+
90939+int
90940+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90941+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
90942+{
90943+ return 1;
90944+}
90945+
90946+int
90947+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
90948+{
90949+ return 0;
90950+}
90951+
90952+int
90953+gr_search_accept(const struct socket *sock)
90954+{
90955+ return 0;
90956+}
90957+
90958+int
90959+gr_search_listen(const struct socket *sock)
90960+{
90961+ return 0;
90962+}
90963+
90964+int
90965+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
90966+{
90967+ return 0;
90968+}
90969+
90970+__u32
90971+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
90972+{
90973+ return 1;
90974+}
90975+
90976+__u32
90977+gr_acl_handle_creat(const struct dentry * dentry,
90978+ const struct dentry * p_dentry,
90979+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
90980+ const int imode)
90981+{
90982+ return 1;
90983+}
90984+
90985+void
90986+gr_acl_handle_exit(void)
90987+{
90988+ return;
90989+}
90990+
90991+int
90992+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
90993+{
90994+ return 1;
90995+}
90996+
90997+void
90998+gr_set_role_label(const kuid_t uid, const kgid_t gid)
90999+{
91000+ return;
91001+}
91002+
91003+int
91004+gr_acl_handle_procpidmem(const struct task_struct *task)
91005+{
91006+ return 0;
91007+}
91008+
91009+int
91010+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
91011+{
91012+ return 0;
91013+}
91014+
91015+int
91016+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
91017+{
91018+ return 0;
91019+}
91020+
91021+int
91022+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
91023+{
91024+ return 0;
91025+}
91026+
91027+int
91028+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
91029+{
91030+ return 0;
91031+}
91032+
91033+int gr_acl_enable_at_secure(void)
91034+{
91035+ return 0;
91036+}
91037+
91038+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
91039+{
91040+ return d_backing_inode(dentry)->i_sb->s_dev;
91041+}
91042+
91043+u64 gr_get_ino_from_dentry(struct dentry *dentry)
91044+{
91045+ return d_backing_inode(dentry)->i_ino;
91046+}
91047+
91048+void gr_put_exec_file(struct task_struct *task)
91049+{
91050+ return;
91051+}
91052+
91053+#ifdef CONFIG_SECURITY
91054+EXPORT_SYMBOL_GPL(gr_check_user_change);
91055+EXPORT_SYMBOL_GPL(gr_check_group_change);
91056+#endif
91057diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
91058new file mode 100644
91059index 0000000..fb7531e
91060--- /dev/null
91061+++ b/grsecurity/grsec_exec.c
91062@@ -0,0 +1,189 @@
91063+#include <linux/kernel.h>
91064+#include <linux/sched.h>
91065+#include <linux/file.h>
91066+#include <linux/binfmts.h>
91067+#include <linux/fs.h>
91068+#include <linux/types.h>
91069+#include <linux/grdefs.h>
91070+#include <linux/grsecurity.h>
91071+#include <linux/grinternal.h>
91072+#include <linux/capability.h>
91073+#include <linux/module.h>
91074+#include <linux/compat.h>
91075+
91076+#include <asm/uaccess.h>
91077+
91078+#ifdef CONFIG_GRKERNSEC_EXECLOG
91079+static char gr_exec_arg_buf[132];
91080+static DEFINE_MUTEX(gr_exec_arg_mutex);
91081+#endif
91082+
91083+struct user_arg_ptr {
91084+#ifdef CONFIG_COMPAT
91085+ bool is_compat;
91086+#endif
91087+ union {
91088+ const char __user *const __user *native;
91089+#ifdef CONFIG_COMPAT
91090+ const compat_uptr_t __user *compat;
91091+#endif
91092+ } ptr;
91093+};
91094+
91095+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
91096+
91097+void
91098+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
91099+{
91100+#ifdef CONFIG_GRKERNSEC_EXECLOG
91101+ char *grarg = gr_exec_arg_buf;
91102+ unsigned int i, x, execlen = 0;
91103+ char c;
91104+
91105+ if (!((grsec_enable_execlog && grsec_enable_group &&
91106+ in_group_p(grsec_audit_gid))
91107+ || (grsec_enable_execlog && !grsec_enable_group)))
91108+ return;
91109+
91110+ mutex_lock(&gr_exec_arg_mutex);
91111+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
91112+
91113+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
91114+ const char __user *p;
91115+ unsigned int len;
91116+
91117+ p = get_user_arg_ptr(argv, i);
91118+ if (IS_ERR(p))
91119+ goto log;
91120+
91121+ len = strnlen_user(p, 128 - execlen);
91122+ if (len > 128 - execlen)
91123+ len = 128 - execlen;
91124+ else if (len > 0)
91125+ len--;
91126+ if (copy_from_user(grarg + execlen, p, len))
91127+ goto log;
91128+
91129+ /* rewrite unprintable characters */
91130+ for (x = 0; x < len; x++) {
91131+ c = *(grarg + execlen + x);
91132+ if (c < 32 || c > 126)
91133+ *(grarg + execlen + x) = ' ';
91134+ }
91135+
91136+ execlen += len;
91137+ *(grarg + execlen) = ' ';
91138+ *(grarg + execlen + 1) = '\0';
91139+ execlen++;
91140+ }
91141+
91142+ log:
91143+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
91144+ bprm->file->f_path.mnt, grarg);
91145+ mutex_unlock(&gr_exec_arg_mutex);
91146+#endif
91147+ return;
91148+}
91149+
91150+#ifdef CONFIG_GRKERNSEC
91151+extern int gr_acl_is_capable(const int cap);
91152+extern int gr_acl_is_capable_nolog(const int cap);
91153+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91154+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
91155+extern int gr_chroot_is_capable(const int cap);
91156+extern int gr_chroot_is_capable_nolog(const int cap);
91157+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91158+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
91159+#endif
91160+
91161+const char *captab_log[] = {
91162+ "CAP_CHOWN",
91163+ "CAP_DAC_OVERRIDE",
91164+ "CAP_DAC_READ_SEARCH",
91165+ "CAP_FOWNER",
91166+ "CAP_FSETID",
91167+ "CAP_KILL",
91168+ "CAP_SETGID",
91169+ "CAP_SETUID",
91170+ "CAP_SETPCAP",
91171+ "CAP_LINUX_IMMUTABLE",
91172+ "CAP_NET_BIND_SERVICE",
91173+ "CAP_NET_BROADCAST",
91174+ "CAP_NET_ADMIN",
91175+ "CAP_NET_RAW",
91176+ "CAP_IPC_LOCK",
91177+ "CAP_IPC_OWNER",
91178+ "CAP_SYS_MODULE",
91179+ "CAP_SYS_RAWIO",
91180+ "CAP_SYS_CHROOT",
91181+ "CAP_SYS_PTRACE",
91182+ "CAP_SYS_PACCT",
91183+ "CAP_SYS_ADMIN",
91184+ "CAP_SYS_BOOT",
91185+ "CAP_SYS_NICE",
91186+ "CAP_SYS_RESOURCE",
91187+ "CAP_SYS_TIME",
91188+ "CAP_SYS_TTY_CONFIG",
91189+ "CAP_MKNOD",
91190+ "CAP_LEASE",
91191+ "CAP_AUDIT_WRITE",
91192+ "CAP_AUDIT_CONTROL",
91193+ "CAP_SETFCAP",
91194+ "CAP_MAC_OVERRIDE",
91195+ "CAP_MAC_ADMIN",
91196+ "CAP_SYSLOG",
91197+ "CAP_WAKE_ALARM",
91198+ "CAP_BLOCK_SUSPEND",
91199+ "CAP_AUDIT_READ"
91200+};
91201+
91202+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
91203+
91204+int gr_is_capable(const int cap)
91205+{
91206+#ifdef CONFIG_GRKERNSEC
91207+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
91208+ return 1;
91209+ return 0;
91210+#else
91211+ return 1;
91212+#endif
91213+}
91214+
91215+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
91216+{
91217+#ifdef CONFIG_GRKERNSEC
91218+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
91219+ return 1;
91220+ return 0;
91221+#else
91222+ return 1;
91223+#endif
91224+}
91225+
91226+int gr_is_capable_nolog(const int cap)
91227+{
91228+#ifdef CONFIG_GRKERNSEC
91229+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
91230+ return 1;
91231+ return 0;
91232+#else
91233+ return 1;
91234+#endif
91235+}
91236+
91237+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
91238+{
91239+#ifdef CONFIG_GRKERNSEC
91240+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
91241+ return 1;
91242+ return 0;
91243+#else
91244+ return 1;
91245+#endif
91246+}
91247+
91248+EXPORT_SYMBOL_GPL(gr_is_capable);
91249+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
91250+EXPORT_SYMBOL_GPL(gr_task_is_capable);
91251+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
91252diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
91253new file mode 100644
91254index 0000000..cdec49b
91255--- /dev/null
91256+++ b/grsecurity/grsec_fifo.c
91257@@ -0,0 +1,26 @@
91258+#include <linux/kernel.h>
91259+#include <linux/sched.h>
91260+#include <linux/fs.h>
91261+#include <linux/file.h>
91262+#include <linux/grinternal.h>
91263+
91264+int
91265+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
91266+ const struct dentry *dir, const int flag, const int acc_mode)
91267+{
91268+#ifdef CONFIG_GRKERNSEC_FIFO
91269+ const struct cred *cred = current_cred();
91270+ struct inode *inode = d_backing_inode(dentry);
91271+ struct inode *dir_inode = d_backing_inode(dir);
91272+
91273+ if (grsec_enable_fifo && S_ISFIFO(inode->i_mode) &&
91274+ !(flag & O_EXCL) && (dir_inode->i_mode & S_ISVTX) &&
91275+ !uid_eq(inode->i_uid, dir_inode->i_uid) &&
91276+ !uid_eq(cred->fsuid, inode->i_uid)) {
91277+ if (!inode_permission(inode, acc_mode))
91278+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(inode->i_uid), GR_GLOBAL_GID(inode->i_gid));
91279+ return -EACCES;
91280+ }
91281+#endif
91282+ return 0;
91283+}
91284diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
91285new file mode 100644
91286index 0000000..8ca18bf
91287--- /dev/null
91288+++ b/grsecurity/grsec_fork.c
91289@@ -0,0 +1,23 @@
91290+#include <linux/kernel.h>
91291+#include <linux/sched.h>
91292+#include <linux/grsecurity.h>
91293+#include <linux/grinternal.h>
91294+#include <linux/errno.h>
91295+
91296+void
91297+gr_log_forkfail(const int retval)
91298+{
91299+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91300+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
91301+ switch (retval) {
91302+ case -EAGAIN:
91303+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
91304+ break;
91305+ case -ENOMEM:
91306+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
91307+ break;
91308+ }
91309+ }
91310+#endif
91311+ return;
91312+}
91313diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
91314new file mode 100644
91315index 0000000..a364c58
91316--- /dev/null
91317+++ b/grsecurity/grsec_init.c
91318@@ -0,0 +1,290 @@
91319+#include <linux/kernel.h>
91320+#include <linux/sched.h>
91321+#include <linux/mm.h>
91322+#include <linux/gracl.h>
91323+#include <linux/slab.h>
91324+#include <linux/vmalloc.h>
91325+#include <linux/percpu.h>
91326+#include <linux/module.h>
91327+
91328+int grsec_enable_ptrace_readexec __read_only;
91329+int grsec_enable_setxid __read_only;
91330+int grsec_enable_symlinkown __read_only;
91331+kgid_t grsec_symlinkown_gid __read_only;
91332+int grsec_enable_brute __read_only;
91333+int grsec_enable_link __read_only;
91334+int grsec_enable_dmesg __read_only;
91335+int grsec_enable_harden_ptrace __read_only;
91336+int grsec_enable_harden_ipc __read_only;
91337+int grsec_enable_fifo __read_only;
91338+int grsec_enable_execlog __read_only;
91339+int grsec_enable_signal __read_only;
91340+int grsec_enable_forkfail __read_only;
91341+int grsec_enable_audit_ptrace __read_only;
91342+int grsec_enable_time __read_only;
91343+int grsec_enable_group __read_only;
91344+kgid_t grsec_audit_gid __read_only;
91345+int grsec_enable_chdir __read_only;
91346+int grsec_enable_mount __read_only;
91347+int grsec_enable_rofs __read_only;
91348+int grsec_deny_new_usb __read_only;
91349+int grsec_enable_chroot_findtask __read_only;
91350+int grsec_enable_chroot_mount __read_only;
91351+int grsec_enable_chroot_shmat __read_only;
91352+int grsec_enable_chroot_fchdir __read_only;
91353+int grsec_enable_chroot_double __read_only;
91354+int grsec_enable_chroot_pivot __read_only;
91355+int grsec_enable_chroot_chdir __read_only;
91356+int grsec_enable_chroot_chmod __read_only;
91357+int grsec_enable_chroot_mknod __read_only;
91358+int grsec_enable_chroot_nice __read_only;
91359+int grsec_enable_chroot_execlog __read_only;
91360+int grsec_enable_chroot_caps __read_only;
91361+int grsec_enable_chroot_rename __read_only;
91362+int grsec_enable_chroot_sysctl __read_only;
91363+int grsec_enable_chroot_unix __read_only;
91364+int grsec_enable_tpe __read_only;
91365+kgid_t grsec_tpe_gid __read_only;
91366+int grsec_enable_blackhole __read_only;
91367+#ifdef CONFIG_IPV6_MODULE
91368+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
91369+#endif
91370+int grsec_lastack_retries __read_only;
91371+int grsec_enable_tpe_all __read_only;
91372+int grsec_enable_tpe_invert __read_only;
91373+int grsec_enable_socket_all __read_only;
91374+kgid_t grsec_socket_all_gid __read_only;
91375+int grsec_enable_socket_client __read_only;
91376+kgid_t grsec_socket_client_gid __read_only;
91377+int grsec_enable_socket_server __read_only;
91378+kgid_t grsec_socket_server_gid __read_only;
91379+int grsec_resource_logging __read_only;
91380+int grsec_disable_privio __read_only;
91381+int grsec_enable_log_rwxmaps __read_only;
91382+int grsec_lock __read_only;
91383+
91384+DEFINE_SPINLOCK(grsec_alert_lock);
91385+unsigned long grsec_alert_wtime = 0;
91386+unsigned long grsec_alert_fyet = 0;
91387+
91388+DEFINE_SPINLOCK(grsec_audit_lock);
91389+
91390+DEFINE_RWLOCK(grsec_exec_file_lock);
91391+
91392+char *gr_shared_page[4];
91393+
91394+char *gr_alert_log_fmt;
91395+char *gr_audit_log_fmt;
91396+char *gr_alert_log_buf;
91397+char *gr_audit_log_buf;
91398+
91399+extern struct gr_arg *gr_usermode;
91400+extern unsigned char *gr_system_salt;
91401+extern unsigned char *gr_system_sum;
91402+
91403+void __init
91404+grsecurity_init(void)
91405+{
91406+ int j;
91407+ /* create the per-cpu shared pages */
91408+
91409+#ifdef CONFIG_X86
91410+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
91411+#endif
91412+
91413+ for (j = 0; j < 4; j++) {
91414+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
91415+ if (gr_shared_page[j] == NULL) {
91416+ panic("Unable to allocate grsecurity shared page");
91417+ return;
91418+ }
91419+ }
91420+
91421+ /* allocate log buffers */
91422+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
91423+ if (!gr_alert_log_fmt) {
91424+ panic("Unable to allocate grsecurity alert log format buffer");
91425+ return;
91426+ }
91427+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
91428+ if (!gr_audit_log_fmt) {
91429+ panic("Unable to allocate grsecurity audit log format buffer");
91430+ return;
91431+ }
91432+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91433+ if (!gr_alert_log_buf) {
91434+ panic("Unable to allocate grsecurity alert log buffer");
91435+ return;
91436+ }
91437+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91438+ if (!gr_audit_log_buf) {
91439+ panic("Unable to allocate grsecurity audit log buffer");
91440+ return;
91441+ }
91442+
91443+ /* allocate memory for authentication structure */
91444+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
91445+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
91446+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
91447+
91448+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
91449+ panic("Unable to allocate grsecurity authentication structure");
91450+ return;
91451+ }
91452+
91453+#ifdef CONFIG_GRKERNSEC_IO
91454+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
91455+ grsec_disable_privio = 1;
91456+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91457+ grsec_disable_privio = 1;
91458+#else
91459+ grsec_disable_privio = 0;
91460+#endif
91461+#endif
91462+
91463+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
91464+ /* for backward compatibility, tpe_invert always defaults to on if
91465+ enabled in the kernel
91466+ */
91467+ grsec_enable_tpe_invert = 1;
91468+#endif
91469+
91470+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91471+#ifndef CONFIG_GRKERNSEC_SYSCTL
91472+ grsec_lock = 1;
91473+#endif
91474+
91475+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
91476+ grsec_enable_log_rwxmaps = 1;
91477+#endif
91478+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
91479+ grsec_enable_group = 1;
91480+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
91481+#endif
91482+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
91483+ grsec_enable_ptrace_readexec = 1;
91484+#endif
91485+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
91486+ grsec_enable_chdir = 1;
91487+#endif
91488+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
91489+ grsec_enable_harden_ptrace = 1;
91490+#endif
91491+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91492+ grsec_enable_harden_ipc = 1;
91493+#endif
91494+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
91495+ grsec_enable_mount = 1;
91496+#endif
91497+#ifdef CONFIG_GRKERNSEC_LINK
91498+ grsec_enable_link = 1;
91499+#endif
91500+#ifdef CONFIG_GRKERNSEC_BRUTE
91501+ grsec_enable_brute = 1;
91502+#endif
91503+#ifdef CONFIG_GRKERNSEC_DMESG
91504+ grsec_enable_dmesg = 1;
91505+#endif
91506+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91507+ grsec_enable_blackhole = 1;
91508+ grsec_lastack_retries = 4;
91509+#endif
91510+#ifdef CONFIG_GRKERNSEC_FIFO
91511+ grsec_enable_fifo = 1;
91512+#endif
91513+#ifdef CONFIG_GRKERNSEC_EXECLOG
91514+ grsec_enable_execlog = 1;
91515+#endif
91516+#ifdef CONFIG_GRKERNSEC_SETXID
91517+ grsec_enable_setxid = 1;
91518+#endif
91519+#ifdef CONFIG_GRKERNSEC_SIGNAL
91520+ grsec_enable_signal = 1;
91521+#endif
91522+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91523+ grsec_enable_forkfail = 1;
91524+#endif
91525+#ifdef CONFIG_GRKERNSEC_TIME
91526+ grsec_enable_time = 1;
91527+#endif
91528+#ifdef CONFIG_GRKERNSEC_RESLOG
91529+ grsec_resource_logging = 1;
91530+#endif
91531+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91532+ grsec_enable_chroot_findtask = 1;
91533+#endif
91534+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
91535+ grsec_enable_chroot_unix = 1;
91536+#endif
91537+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
91538+ grsec_enable_chroot_mount = 1;
91539+#endif
91540+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
91541+ grsec_enable_chroot_fchdir = 1;
91542+#endif
91543+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
91544+ grsec_enable_chroot_shmat = 1;
91545+#endif
91546+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
91547+ grsec_enable_audit_ptrace = 1;
91548+#endif
91549+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
91550+ grsec_enable_chroot_double = 1;
91551+#endif
91552+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
91553+ grsec_enable_chroot_pivot = 1;
91554+#endif
91555+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
91556+ grsec_enable_chroot_chdir = 1;
91557+#endif
91558+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
91559+ grsec_enable_chroot_chmod = 1;
91560+#endif
91561+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
91562+ grsec_enable_chroot_mknod = 1;
91563+#endif
91564+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
91565+ grsec_enable_chroot_nice = 1;
91566+#endif
91567+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
91568+ grsec_enable_chroot_execlog = 1;
91569+#endif
91570+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
91571+ grsec_enable_chroot_caps = 1;
91572+#endif
91573+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
91574+ grsec_enable_chroot_rename = 1;
91575+#endif
91576+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
91577+ grsec_enable_chroot_sysctl = 1;
91578+#endif
91579+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91580+ grsec_enable_symlinkown = 1;
91581+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
91582+#endif
91583+#ifdef CONFIG_GRKERNSEC_TPE
91584+ grsec_enable_tpe = 1;
91585+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
91586+#ifdef CONFIG_GRKERNSEC_TPE_ALL
91587+ grsec_enable_tpe_all = 1;
91588+#endif
91589+#endif
91590+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
91591+ grsec_enable_socket_all = 1;
91592+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
91593+#endif
91594+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
91595+ grsec_enable_socket_client = 1;
91596+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
91597+#endif
91598+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
91599+ grsec_enable_socket_server = 1;
91600+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
91601+#endif
91602+#endif
91603+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
91604+ grsec_deny_new_usb = 1;
91605+#endif
91606+
91607+ return;
91608+}
91609diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
91610new file mode 100644
91611index 0000000..1773300
91612--- /dev/null
91613+++ b/grsecurity/grsec_ipc.c
91614@@ -0,0 +1,48 @@
91615+#include <linux/kernel.h>
91616+#include <linux/mm.h>
91617+#include <linux/sched.h>
91618+#include <linux/file.h>
91619+#include <linux/ipc.h>
91620+#include <linux/ipc_namespace.h>
91621+#include <linux/grsecurity.h>
91622+#include <linux/grinternal.h>
91623+
91624+int
91625+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
91626+{
91627+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91628+ int write;
91629+ int orig_granted_mode;
91630+ kuid_t euid;
91631+ kgid_t egid;
91632+
91633+ if (!grsec_enable_harden_ipc)
91634+ return 1;
91635+
91636+ euid = current_euid();
91637+ egid = current_egid();
91638+
91639+ write = requested_mode & 00002;
91640+ orig_granted_mode = ipcp->mode;
91641+
91642+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
91643+ orig_granted_mode >>= 6;
91644+ else {
91645+ /* if likely wrong permissions, lock to user */
91646+ if (orig_granted_mode & 0007)
91647+ orig_granted_mode = 0;
91648+ /* otherwise do a egid-only check */
91649+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
91650+ orig_granted_mode >>= 3;
91651+ /* otherwise, no access */
91652+ else
91653+ orig_granted_mode = 0;
91654+ }
91655+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
91656+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
91657+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
91658+ return 0;
91659+ }
91660+#endif
91661+ return 1;
91662+}
91663diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
91664new file mode 100644
91665index 0000000..8ef2b75
91666--- /dev/null
91667+++ b/grsecurity/grsec_link.c
91668@@ -0,0 +1,59 @@
91669+#include <linux/kernel.h>
91670+#include <linux/sched.h>
91671+#include <linux/fs.h>
91672+#include <linux/file.h>
91673+#include <linux/grinternal.h>
91674+
91675+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
91676+{
91677+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91678+ const struct inode *link_inode = d_backing_inode(link->dentry);
91679+
91680+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
91681+ /* ignore root-owned links, e.g. /proc/self */
91682+ gr_is_global_nonroot(link_inode->i_uid) && target &&
91683+ !uid_eq(link_inode->i_uid, target->i_uid)) {
91684+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
91685+ return 1;
91686+ }
91687+#endif
91688+ return 0;
91689+}
91690+
91691+int
91692+gr_handle_follow_link(const struct dentry *dentry, const struct vfsmount *mnt)
91693+{
91694+#ifdef CONFIG_GRKERNSEC_LINK
91695+ struct inode *inode = d_backing_inode(dentry);
91696+ struct inode *parent = d_backing_inode(dentry->d_parent);
91697+ const struct cred *cred = current_cred();
91698+
91699+ if (grsec_enable_link && d_is_symlink(dentry) &&
91700+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
91701+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
91702+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
91703+ return -EACCES;
91704+ }
91705+#endif
91706+ return 0;
91707+}
91708+
91709+int
91710+gr_handle_hardlink(const struct dentry *dentry,
91711+ const struct vfsmount *mnt,
91712+ const struct filename *to)
91713+{
91714+#ifdef CONFIG_GRKERNSEC_LINK
91715+ struct inode *inode = d_backing_inode(dentry);
91716+ const struct cred *cred = current_cred();
91717+
91718+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
91719+ (!d_is_reg(dentry) || is_privileged_binary(dentry) ||
91720+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
91721+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
91722+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
91723+ return -EPERM;
91724+ }
91725+#endif
91726+ return 0;
91727+}
91728diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
91729new file mode 100644
91730index 0000000..dbe0a6b
91731--- /dev/null
91732+++ b/grsecurity/grsec_log.c
91733@@ -0,0 +1,341 @@
91734+#include <linux/kernel.h>
91735+#include <linux/sched.h>
91736+#include <linux/file.h>
91737+#include <linux/tty.h>
91738+#include <linux/fs.h>
91739+#include <linux/mm.h>
91740+#include <linux/grinternal.h>
91741+
91742+#ifdef CONFIG_TREE_PREEMPT_RCU
91743+#define DISABLE_PREEMPT() preempt_disable()
91744+#define ENABLE_PREEMPT() preempt_enable()
91745+#else
91746+#define DISABLE_PREEMPT()
91747+#define ENABLE_PREEMPT()
91748+#endif
91749+
91750+#define BEGIN_LOCKS(x) \
91751+ DISABLE_PREEMPT(); \
91752+ rcu_read_lock(); \
91753+ read_lock(&tasklist_lock); \
91754+ read_lock(&grsec_exec_file_lock); \
91755+ if (x != GR_DO_AUDIT) \
91756+ spin_lock(&grsec_alert_lock); \
91757+ else \
91758+ spin_lock(&grsec_audit_lock)
91759+
91760+#define END_LOCKS(x) \
91761+ if (x != GR_DO_AUDIT) \
91762+ spin_unlock(&grsec_alert_lock); \
91763+ else \
91764+ spin_unlock(&grsec_audit_lock); \
91765+ read_unlock(&grsec_exec_file_lock); \
91766+ read_unlock(&tasklist_lock); \
91767+ rcu_read_unlock(); \
91768+ ENABLE_PREEMPT(); \
91769+ if (x == GR_DONT_AUDIT) \
91770+ gr_handle_alertkill(current)
91771+
91772+enum {
91773+ FLOODING,
91774+ NO_FLOODING
91775+};
91776+
91777+extern char *gr_alert_log_fmt;
91778+extern char *gr_audit_log_fmt;
91779+extern char *gr_alert_log_buf;
91780+extern char *gr_audit_log_buf;
91781+
91782+static int gr_log_start(int audit)
91783+{
91784+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
91785+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
91786+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91787+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
91788+ unsigned long curr_secs = get_seconds();
91789+
91790+ if (audit == GR_DO_AUDIT)
91791+ goto set_fmt;
91792+
91793+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
91794+ grsec_alert_wtime = curr_secs;
91795+ grsec_alert_fyet = 0;
91796+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
91797+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
91798+ grsec_alert_fyet++;
91799+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
91800+ grsec_alert_wtime = curr_secs;
91801+ grsec_alert_fyet++;
91802+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
91803+ return FLOODING;
91804+ }
91805+ else return FLOODING;
91806+
91807+set_fmt:
91808+#endif
91809+ memset(buf, 0, PAGE_SIZE);
91810+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
91811+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
91812+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
91813+ } else if (current->signal->curr_ip) {
91814+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
91815+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
91816+ } else if (gr_acl_is_enabled()) {
91817+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
91818+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
91819+ } else {
91820+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
91821+ strcpy(buf, fmt);
91822+ }
91823+
91824+ return NO_FLOODING;
91825+}
91826+
91827+static void gr_log_middle(int audit, const char *msg, va_list ap)
91828+ __attribute__ ((format (printf, 2, 0)));
91829+
91830+static void gr_log_middle(int audit, const char *msg, va_list ap)
91831+{
91832+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91833+ unsigned int len = strlen(buf);
91834+
91835+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
91836+
91837+ return;
91838+}
91839+
91840+static void gr_log_middle_varargs(int audit, const char *msg, ...)
91841+ __attribute__ ((format (printf, 2, 3)));
91842+
91843+static void gr_log_middle_varargs(int audit, const char *msg, ...)
91844+{
91845+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91846+ unsigned int len = strlen(buf);
91847+ va_list ap;
91848+
91849+ va_start(ap, msg);
91850+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
91851+ va_end(ap);
91852+
91853+ return;
91854+}
91855+
91856+static void gr_log_end(int audit, int append_default)
91857+{
91858+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91859+ if (append_default) {
91860+ struct task_struct *task = current;
91861+ struct task_struct *parent = task->real_parent;
91862+ const struct cred *cred = __task_cred(task);
91863+ const struct cred *pcred = __task_cred(parent);
91864+ unsigned int len = strlen(buf);
91865+
91866+ 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));
91867+ }
91868+
91869+ printk("%s\n", buf);
91870+
91871+ return;
91872+}
91873+
91874+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
91875+{
91876+ int logtype;
91877+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
91878+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
91879+ void *voidptr = NULL;
91880+ int num1 = 0, num2 = 0;
91881+ unsigned long ulong1 = 0, ulong2 = 0;
91882+ struct dentry *dentry = NULL;
91883+ struct vfsmount *mnt = NULL;
91884+ struct file *file = NULL;
91885+ struct task_struct *task = NULL;
91886+ struct vm_area_struct *vma = NULL;
91887+ const struct cred *cred, *pcred;
91888+ va_list ap;
91889+
91890+ BEGIN_LOCKS(audit);
91891+ logtype = gr_log_start(audit);
91892+ if (logtype == FLOODING) {
91893+ END_LOCKS(audit);
91894+ return;
91895+ }
91896+ va_start(ap, argtypes);
91897+ switch (argtypes) {
91898+ case GR_TTYSNIFF:
91899+ task = va_arg(ap, struct task_struct *);
91900+ 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));
91901+ break;
91902+ case GR_SYSCTL_HIDDEN:
91903+ str1 = va_arg(ap, char *);
91904+ gr_log_middle_varargs(audit, msg, result, str1);
91905+ break;
91906+ case GR_RBAC:
91907+ dentry = va_arg(ap, struct dentry *);
91908+ mnt = va_arg(ap, struct vfsmount *);
91909+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
91910+ break;
91911+ case GR_RBAC_STR:
91912+ dentry = va_arg(ap, struct dentry *);
91913+ mnt = va_arg(ap, struct vfsmount *);
91914+ str1 = va_arg(ap, char *);
91915+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
91916+ break;
91917+ case GR_STR_RBAC:
91918+ str1 = va_arg(ap, char *);
91919+ dentry = va_arg(ap, struct dentry *);
91920+ mnt = va_arg(ap, struct vfsmount *);
91921+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
91922+ break;
91923+ case GR_RBAC_MODE2:
91924+ dentry = va_arg(ap, struct dentry *);
91925+ mnt = va_arg(ap, struct vfsmount *);
91926+ str1 = va_arg(ap, char *);
91927+ str2 = va_arg(ap, char *);
91928+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
91929+ break;
91930+ case GR_RBAC_MODE3:
91931+ dentry = va_arg(ap, struct dentry *);
91932+ mnt = va_arg(ap, struct vfsmount *);
91933+ str1 = va_arg(ap, char *);
91934+ str2 = va_arg(ap, char *);
91935+ str3 = va_arg(ap, char *);
91936+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
91937+ break;
91938+ case GR_FILENAME:
91939+ dentry = va_arg(ap, struct dentry *);
91940+ mnt = va_arg(ap, struct vfsmount *);
91941+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
91942+ break;
91943+ case GR_STR_FILENAME:
91944+ str1 = va_arg(ap, char *);
91945+ dentry = va_arg(ap, struct dentry *);
91946+ mnt = va_arg(ap, struct vfsmount *);
91947+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
91948+ break;
91949+ case GR_FILENAME_STR:
91950+ dentry = va_arg(ap, struct dentry *);
91951+ mnt = va_arg(ap, struct vfsmount *);
91952+ str1 = va_arg(ap, char *);
91953+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
91954+ break;
91955+ case GR_FILENAME_TWO_INT:
91956+ dentry = va_arg(ap, struct dentry *);
91957+ mnt = va_arg(ap, struct vfsmount *);
91958+ num1 = va_arg(ap, int);
91959+ num2 = va_arg(ap, int);
91960+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
91961+ break;
91962+ case GR_FILENAME_TWO_INT_STR:
91963+ dentry = va_arg(ap, struct dentry *);
91964+ mnt = va_arg(ap, struct vfsmount *);
91965+ num1 = va_arg(ap, int);
91966+ num2 = va_arg(ap, int);
91967+ str1 = va_arg(ap, char *);
91968+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
91969+ break;
91970+ case GR_TEXTREL:
91971+ file = va_arg(ap, struct file *);
91972+ ulong1 = va_arg(ap, unsigned long);
91973+ ulong2 = va_arg(ap, unsigned long);
91974+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
91975+ break;
91976+ case GR_PTRACE:
91977+ task = va_arg(ap, struct task_struct *);
91978+ 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));
91979+ break;
91980+ case GR_RESOURCE:
91981+ task = va_arg(ap, struct task_struct *);
91982+ cred = __task_cred(task);
91983+ pcred = __task_cred(task->real_parent);
91984+ ulong1 = va_arg(ap, unsigned long);
91985+ str1 = va_arg(ap, char *);
91986+ ulong2 = va_arg(ap, unsigned long);
91987+ 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));
91988+ break;
91989+ case GR_CAP:
91990+ task = va_arg(ap, struct task_struct *);
91991+ cred = __task_cred(task);
91992+ pcred = __task_cred(task->real_parent);
91993+ str1 = va_arg(ap, char *);
91994+ 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));
91995+ break;
91996+ case GR_SIG:
91997+ str1 = va_arg(ap, char *);
91998+ voidptr = va_arg(ap, void *);
91999+ gr_log_middle_varargs(audit, msg, str1, voidptr);
92000+ break;
92001+ case GR_SIG2:
92002+ task = va_arg(ap, struct task_struct *);
92003+ cred = __task_cred(task);
92004+ pcred = __task_cred(task->real_parent);
92005+ num1 = va_arg(ap, int);
92006+ 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));
92007+ break;
92008+ case GR_CRASH1:
92009+ task = va_arg(ap, struct task_struct *);
92010+ cred = __task_cred(task);
92011+ pcred = __task_cred(task->real_parent);
92012+ ulong1 = va_arg(ap, unsigned long);
92013+ 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);
92014+ break;
92015+ case GR_CRASH2:
92016+ task = va_arg(ap, struct task_struct *);
92017+ cred = __task_cred(task);
92018+ pcred = __task_cred(task->real_parent);
92019+ ulong1 = va_arg(ap, unsigned long);
92020+ 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);
92021+ break;
92022+ case GR_RWXMAP:
92023+ file = va_arg(ap, struct file *);
92024+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
92025+ break;
92026+ case GR_RWXMAPVMA:
92027+ vma = va_arg(ap, struct vm_area_struct *);
92028+ if (vma->vm_file)
92029+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
92030+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
92031+ str1 = "<stack>";
92032+ else if (vma->vm_start <= current->mm->brk &&
92033+ vma->vm_end >= current->mm->start_brk)
92034+ str1 = "<heap>";
92035+ else
92036+ str1 = "<anonymous mapping>";
92037+ gr_log_middle_varargs(audit, msg, str1);
92038+ break;
92039+ case GR_PSACCT:
92040+ {
92041+ unsigned int wday, cday;
92042+ __u8 whr, chr;
92043+ __u8 wmin, cmin;
92044+ __u8 wsec, csec;
92045+ char cur_tty[64] = { 0 };
92046+ char parent_tty[64] = { 0 };
92047+
92048+ task = va_arg(ap, struct task_struct *);
92049+ wday = va_arg(ap, unsigned int);
92050+ cday = va_arg(ap, unsigned int);
92051+ whr = va_arg(ap, int);
92052+ chr = va_arg(ap, int);
92053+ wmin = va_arg(ap, int);
92054+ cmin = va_arg(ap, int);
92055+ wsec = va_arg(ap, int);
92056+ csec = va_arg(ap, int);
92057+ ulong1 = va_arg(ap, unsigned long);
92058+ cred = __task_cred(task);
92059+ pcred = __task_cred(task->real_parent);
92060+
92061+ 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));
92062+ }
92063+ break;
92064+ default:
92065+ gr_log_middle(audit, msg, ap);
92066+ }
92067+ va_end(ap);
92068+ // these don't need DEFAULTSECARGS printed on the end
92069+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
92070+ gr_log_end(audit, 0);
92071+ else
92072+ gr_log_end(audit, 1);
92073+ END_LOCKS(audit);
92074+}
92075diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
92076new file mode 100644
92077index 0000000..0e39d8c7
92078--- /dev/null
92079+++ b/grsecurity/grsec_mem.c
92080@@ -0,0 +1,48 @@
92081+#include <linux/kernel.h>
92082+#include <linux/sched.h>
92083+#include <linux/mm.h>
92084+#include <linux/mman.h>
92085+#include <linux/module.h>
92086+#include <linux/grinternal.h>
92087+
92088+void gr_handle_msr_write(void)
92089+{
92090+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
92091+ return;
92092+}
92093+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
92094+
92095+void
92096+gr_handle_ioperm(void)
92097+{
92098+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
92099+ return;
92100+}
92101+
92102+void
92103+gr_handle_iopl(void)
92104+{
92105+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
92106+ return;
92107+}
92108+
92109+void
92110+gr_handle_mem_readwrite(u64 from, u64 to)
92111+{
92112+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
92113+ return;
92114+}
92115+
92116+void
92117+gr_handle_vm86(void)
92118+{
92119+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
92120+ return;
92121+}
92122+
92123+void
92124+gr_log_badprocpid(const char *entry)
92125+{
92126+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
92127+ return;
92128+}
92129diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
92130new file mode 100644
92131index 0000000..fe02bf4
92132--- /dev/null
92133+++ b/grsecurity/grsec_mount.c
92134@@ -0,0 +1,65 @@
92135+#include <linux/kernel.h>
92136+#include <linux/sched.h>
92137+#include <linux/mount.h>
92138+#include <linux/major.h>
92139+#include <linux/grsecurity.h>
92140+#include <linux/grinternal.h>
92141+
92142+void
92143+gr_log_remount(const char *devname, const int retval)
92144+{
92145+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92146+ if (grsec_enable_mount && (retval >= 0))
92147+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
92148+#endif
92149+ return;
92150+}
92151+
92152+void
92153+gr_log_unmount(const char *devname, const int retval)
92154+{
92155+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92156+ if (grsec_enable_mount && (retval >= 0))
92157+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
92158+#endif
92159+ return;
92160+}
92161+
92162+void
92163+gr_log_mount(const char *from, struct path *to, const int retval)
92164+{
92165+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92166+ if (grsec_enable_mount && (retval >= 0))
92167+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
92168+#endif
92169+ return;
92170+}
92171+
92172+int
92173+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
92174+{
92175+#ifdef CONFIG_GRKERNSEC_ROFS
92176+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
92177+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
92178+ return -EPERM;
92179+ } else
92180+ return 0;
92181+#endif
92182+ return 0;
92183+}
92184+
92185+int
92186+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
92187+{
92188+#ifdef CONFIG_GRKERNSEC_ROFS
92189+ struct inode *inode = d_backing_inode(dentry);
92190+
92191+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
92192+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
92193+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
92194+ return -EPERM;
92195+ } else
92196+ return 0;
92197+#endif
92198+ return 0;
92199+}
92200diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
92201new file mode 100644
92202index 0000000..6ee9d50
92203--- /dev/null
92204+++ b/grsecurity/grsec_pax.c
92205@@ -0,0 +1,45 @@
92206+#include <linux/kernel.h>
92207+#include <linux/sched.h>
92208+#include <linux/mm.h>
92209+#include <linux/file.h>
92210+#include <linux/grinternal.h>
92211+#include <linux/grsecurity.h>
92212+
92213+void
92214+gr_log_textrel(struct vm_area_struct * vma)
92215+{
92216+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92217+ if (grsec_enable_log_rwxmaps)
92218+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
92219+#endif
92220+ return;
92221+}
92222+
92223+void gr_log_ptgnustack(struct file *file)
92224+{
92225+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92226+ if (grsec_enable_log_rwxmaps)
92227+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
92228+#endif
92229+ return;
92230+}
92231+
92232+void
92233+gr_log_rwxmmap(struct file *file)
92234+{
92235+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92236+ if (grsec_enable_log_rwxmaps)
92237+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
92238+#endif
92239+ return;
92240+}
92241+
92242+void
92243+gr_log_rwxmprotect(struct vm_area_struct *vma)
92244+{
92245+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92246+ if (grsec_enable_log_rwxmaps)
92247+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
92248+#endif
92249+ return;
92250+}
92251diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
92252new file mode 100644
92253index 0000000..2005a3a
92254--- /dev/null
92255+++ b/grsecurity/grsec_proc.c
92256@@ -0,0 +1,20 @@
92257+#include <linux/kernel.h>
92258+#include <linux/sched.h>
92259+#include <linux/grsecurity.h>
92260+#include <linux/grinternal.h>
92261+
92262+int gr_proc_is_restricted(void)
92263+{
92264+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92265+ const struct cred *cred = current_cred();
92266+#endif
92267+
92268+#ifdef CONFIG_GRKERNSEC_PROC_USER
92269+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
92270+ return -EACCES;
92271+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92272+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
92273+ return -EACCES;
92274+#endif
92275+ return 0;
92276+}
92277diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
92278new file mode 100644
92279index 0000000..304c518
92280--- /dev/null
92281+++ b/grsecurity/grsec_ptrace.c
92282@@ -0,0 +1,30 @@
92283+#include <linux/kernel.h>
92284+#include <linux/sched.h>
92285+#include <linux/grinternal.h>
92286+#include <linux/security.h>
92287+
92288+void
92289+gr_audit_ptrace(struct task_struct *task)
92290+{
92291+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
92292+ if (grsec_enable_audit_ptrace)
92293+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
92294+#endif
92295+ return;
92296+}
92297+
92298+int
92299+gr_ptrace_readexec(struct file *file, int unsafe_flags)
92300+{
92301+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
92302+ const struct dentry *dentry = file->f_path.dentry;
92303+ const struct vfsmount *mnt = file->f_path.mnt;
92304+
92305+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
92306+ (inode_permission(d_backing_inode(dentry), MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
92307+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
92308+ return -EACCES;
92309+ }
92310+#endif
92311+ return 0;
92312+}
92313diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
92314new file mode 100644
92315index 0000000..3860c7e
92316--- /dev/null
92317+++ b/grsecurity/grsec_sig.c
92318@@ -0,0 +1,236 @@
92319+#include <linux/kernel.h>
92320+#include <linux/sched.h>
92321+#include <linux/fs.h>
92322+#include <linux/delay.h>
92323+#include <linux/grsecurity.h>
92324+#include <linux/grinternal.h>
92325+#include <linux/hardirq.h>
92326+
92327+char *signames[] = {
92328+ [SIGSEGV] = "Segmentation fault",
92329+ [SIGILL] = "Illegal instruction",
92330+ [SIGABRT] = "Abort",
92331+ [SIGBUS] = "Invalid alignment/Bus error"
92332+};
92333+
92334+void
92335+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
92336+{
92337+#ifdef CONFIG_GRKERNSEC_SIGNAL
92338+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
92339+ (sig == SIGABRT) || (sig == SIGBUS))) {
92340+ if (task_pid_nr(t) == task_pid_nr(current)) {
92341+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
92342+ } else {
92343+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
92344+ }
92345+ }
92346+#endif
92347+ return;
92348+}
92349+
92350+int
92351+gr_handle_signal(const struct task_struct *p, const int sig)
92352+{
92353+#ifdef CONFIG_GRKERNSEC
92354+ /* ignore the 0 signal for protected task checks */
92355+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
92356+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
92357+ return -EPERM;
92358+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
92359+ return -EPERM;
92360+ }
92361+#endif
92362+ return 0;
92363+}
92364+
92365+#ifdef CONFIG_GRKERNSEC
92366+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
92367+
92368+int gr_fake_force_sig(int sig, struct task_struct *t)
92369+{
92370+ unsigned long int flags;
92371+ int ret, blocked, ignored;
92372+ struct k_sigaction *action;
92373+
92374+ spin_lock_irqsave(&t->sighand->siglock, flags);
92375+ action = &t->sighand->action[sig-1];
92376+ ignored = action->sa.sa_handler == SIG_IGN;
92377+ blocked = sigismember(&t->blocked, sig);
92378+ if (blocked || ignored) {
92379+ action->sa.sa_handler = SIG_DFL;
92380+ if (blocked) {
92381+ sigdelset(&t->blocked, sig);
92382+ recalc_sigpending_and_wake(t);
92383+ }
92384+ }
92385+ if (action->sa.sa_handler == SIG_DFL)
92386+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
92387+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
92388+
92389+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
92390+
92391+ return ret;
92392+}
92393+#endif
92394+
92395+#define GR_USER_BAN_TIME (15 * 60)
92396+#define GR_DAEMON_BRUTE_TIME (30 * 60)
92397+
92398+void gr_handle_brute_attach(int dumpable)
92399+{
92400+#ifdef CONFIG_GRKERNSEC_BRUTE
92401+ struct task_struct *p = current;
92402+ kuid_t uid = GLOBAL_ROOT_UID;
92403+ int daemon = 0;
92404+
92405+ if (!grsec_enable_brute)
92406+ return;
92407+
92408+ rcu_read_lock();
92409+ read_lock(&tasklist_lock);
92410+ read_lock(&grsec_exec_file_lock);
92411+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
92412+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
92413+ p->real_parent->brute = 1;
92414+ daemon = 1;
92415+ } else {
92416+ const struct cred *cred = __task_cred(p), *cred2;
92417+ struct task_struct *tsk, *tsk2;
92418+
92419+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
92420+ struct user_struct *user;
92421+
92422+ uid = cred->uid;
92423+
92424+ /* this is put upon execution past expiration */
92425+ user = find_user(uid);
92426+ if (user == NULL)
92427+ goto unlock;
92428+ user->suid_banned = 1;
92429+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
92430+ if (user->suid_ban_expires == ~0UL)
92431+ user->suid_ban_expires--;
92432+
92433+ /* only kill other threads of the same binary, from the same user */
92434+ do_each_thread(tsk2, tsk) {
92435+ cred2 = __task_cred(tsk);
92436+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
92437+ gr_fake_force_sig(SIGKILL, tsk);
92438+ } while_each_thread(tsk2, tsk);
92439+ }
92440+ }
92441+unlock:
92442+ read_unlock(&grsec_exec_file_lock);
92443+ read_unlock(&tasklist_lock);
92444+ rcu_read_unlock();
92445+
92446+ if (gr_is_global_nonroot(uid))
92447+ 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);
92448+ else if (daemon)
92449+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
92450+
92451+#endif
92452+ return;
92453+}
92454+
92455+void gr_handle_brute_check(void)
92456+{
92457+#ifdef CONFIG_GRKERNSEC_BRUTE
92458+ struct task_struct *p = current;
92459+
92460+ if (unlikely(p->brute)) {
92461+ if (!grsec_enable_brute)
92462+ p->brute = 0;
92463+ else if (time_before(get_seconds(), p->brute_expires))
92464+ msleep(30 * 1000);
92465+ }
92466+#endif
92467+ return;
92468+}
92469+
92470+void gr_handle_kernel_exploit(void)
92471+{
92472+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92473+ const struct cred *cred;
92474+ struct task_struct *tsk, *tsk2;
92475+ struct user_struct *user;
92476+ kuid_t uid;
92477+
92478+ if (in_irq() || in_serving_softirq() || in_nmi())
92479+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
92480+
92481+ uid = current_uid();
92482+
92483+ if (gr_is_global_root(uid))
92484+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
92485+ else {
92486+ /* kill all the processes of this user, hold a reference
92487+ to their creds struct, and prevent them from creating
92488+ another process until system reset
92489+ */
92490+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
92491+ GR_GLOBAL_UID(uid));
92492+ /* we intentionally leak this ref */
92493+ user = get_uid(current->cred->user);
92494+ if (user)
92495+ user->kernel_banned = 1;
92496+
92497+ /* kill all processes of this user */
92498+ read_lock(&tasklist_lock);
92499+ do_each_thread(tsk2, tsk) {
92500+ cred = __task_cred(tsk);
92501+ if (uid_eq(cred->uid, uid))
92502+ gr_fake_force_sig(SIGKILL, tsk);
92503+ } while_each_thread(tsk2, tsk);
92504+ read_unlock(&tasklist_lock);
92505+ }
92506+#endif
92507+}
92508+
92509+#ifdef CONFIG_GRKERNSEC_BRUTE
92510+static bool suid_ban_expired(struct user_struct *user)
92511+{
92512+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
92513+ user->suid_banned = 0;
92514+ user->suid_ban_expires = 0;
92515+ free_uid(user);
92516+ return true;
92517+ }
92518+
92519+ return false;
92520+}
92521+#endif
92522+
92523+int gr_process_kernel_exec_ban(void)
92524+{
92525+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92526+ if (unlikely(current->cred->user->kernel_banned))
92527+ return -EPERM;
92528+#endif
92529+ return 0;
92530+}
92531+
92532+int gr_process_kernel_setuid_ban(struct user_struct *user)
92533+{
92534+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92535+ if (unlikely(user->kernel_banned))
92536+ gr_fake_force_sig(SIGKILL, current);
92537+#endif
92538+ return 0;
92539+}
92540+
92541+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
92542+{
92543+#ifdef CONFIG_GRKERNSEC_BRUTE
92544+ struct user_struct *user = current->cred->user;
92545+ if (unlikely(user->suid_banned)) {
92546+ if (suid_ban_expired(user))
92547+ return 0;
92548+ /* disallow execution of suid binaries only */
92549+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
92550+ return -EPERM;
92551+ }
92552+#endif
92553+ return 0;
92554+}
92555diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
92556new file mode 100644
92557index 0000000..a523bd2
92558--- /dev/null
92559+++ b/grsecurity/grsec_sock.c
92560@@ -0,0 +1,244 @@
92561+#include <linux/kernel.h>
92562+#include <linux/module.h>
92563+#include <linux/sched.h>
92564+#include <linux/file.h>
92565+#include <linux/net.h>
92566+#include <linux/in.h>
92567+#include <linux/ip.h>
92568+#include <net/sock.h>
92569+#include <net/inet_sock.h>
92570+#include <linux/grsecurity.h>
92571+#include <linux/grinternal.h>
92572+#include <linux/gracl.h>
92573+
92574+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
92575+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
92576+
92577+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
92578+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
92579+
92580+#ifdef CONFIG_UNIX_MODULE
92581+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
92582+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
92583+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
92584+EXPORT_SYMBOL_GPL(gr_handle_create);
92585+#endif
92586+
92587+#ifdef CONFIG_GRKERNSEC
92588+#define gr_conn_table_size 32749
92589+struct conn_table_entry {
92590+ struct conn_table_entry *next;
92591+ struct signal_struct *sig;
92592+};
92593+
92594+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
92595+DEFINE_SPINLOCK(gr_conn_table_lock);
92596+
92597+extern const char * gr_socktype_to_name(unsigned char type);
92598+extern const char * gr_proto_to_name(unsigned char proto);
92599+extern const char * gr_sockfamily_to_name(unsigned char family);
92600+
92601+static int
92602+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
92603+{
92604+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
92605+}
92606+
92607+static int
92608+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
92609+ __u16 sport, __u16 dport)
92610+{
92611+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
92612+ sig->gr_sport == sport && sig->gr_dport == dport))
92613+ return 1;
92614+ else
92615+ return 0;
92616+}
92617+
92618+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
92619+{
92620+ struct conn_table_entry **match;
92621+ unsigned int index;
92622+
92623+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92624+ sig->gr_sport, sig->gr_dport,
92625+ gr_conn_table_size);
92626+
92627+ newent->sig = sig;
92628+
92629+ match = &gr_conn_table[index];
92630+ newent->next = *match;
92631+ *match = newent;
92632+
92633+ return;
92634+}
92635+
92636+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
92637+{
92638+ struct conn_table_entry *match, *last = NULL;
92639+ unsigned int index;
92640+
92641+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92642+ sig->gr_sport, sig->gr_dport,
92643+ gr_conn_table_size);
92644+
92645+ match = gr_conn_table[index];
92646+ while (match && !conn_match(match->sig,
92647+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
92648+ sig->gr_dport)) {
92649+ last = match;
92650+ match = match->next;
92651+ }
92652+
92653+ if (match) {
92654+ if (last)
92655+ last->next = match->next;
92656+ else
92657+ gr_conn_table[index] = NULL;
92658+ kfree(match);
92659+ }
92660+
92661+ return;
92662+}
92663+
92664+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
92665+ __u16 sport, __u16 dport)
92666+{
92667+ struct conn_table_entry *match;
92668+ unsigned int index;
92669+
92670+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
92671+
92672+ match = gr_conn_table[index];
92673+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
92674+ match = match->next;
92675+
92676+ if (match)
92677+ return match->sig;
92678+ else
92679+ return NULL;
92680+}
92681+
92682+#endif
92683+
92684+void gr_update_task_in_ip_table(const struct inet_sock *inet)
92685+{
92686+#ifdef CONFIG_GRKERNSEC
92687+ struct signal_struct *sig = current->signal;
92688+ struct conn_table_entry *newent;
92689+
92690+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
92691+ if (newent == NULL)
92692+ return;
92693+ /* no bh lock needed since we are called with bh disabled */
92694+ spin_lock(&gr_conn_table_lock);
92695+ gr_del_task_from_ip_table_nolock(sig);
92696+ sig->gr_saddr = inet->inet_rcv_saddr;
92697+ sig->gr_daddr = inet->inet_daddr;
92698+ sig->gr_sport = inet->inet_sport;
92699+ sig->gr_dport = inet->inet_dport;
92700+ gr_add_to_task_ip_table_nolock(sig, newent);
92701+ spin_unlock(&gr_conn_table_lock);
92702+#endif
92703+ return;
92704+}
92705+
92706+void gr_del_task_from_ip_table(struct task_struct *task)
92707+{
92708+#ifdef CONFIG_GRKERNSEC
92709+ spin_lock_bh(&gr_conn_table_lock);
92710+ gr_del_task_from_ip_table_nolock(task->signal);
92711+ spin_unlock_bh(&gr_conn_table_lock);
92712+#endif
92713+ return;
92714+}
92715+
92716+void
92717+gr_attach_curr_ip(const struct sock *sk)
92718+{
92719+#ifdef CONFIG_GRKERNSEC
92720+ struct signal_struct *p, *set;
92721+ const struct inet_sock *inet = inet_sk(sk);
92722+
92723+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
92724+ return;
92725+
92726+ set = current->signal;
92727+
92728+ spin_lock_bh(&gr_conn_table_lock);
92729+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
92730+ inet->inet_dport, inet->inet_sport);
92731+ if (unlikely(p != NULL)) {
92732+ set->curr_ip = p->curr_ip;
92733+ set->used_accept = 1;
92734+ gr_del_task_from_ip_table_nolock(p);
92735+ spin_unlock_bh(&gr_conn_table_lock);
92736+ return;
92737+ }
92738+ spin_unlock_bh(&gr_conn_table_lock);
92739+
92740+ set->curr_ip = inet->inet_daddr;
92741+ set->used_accept = 1;
92742+#endif
92743+ return;
92744+}
92745+
92746+int
92747+gr_handle_sock_all(const int family, const int type, const int protocol)
92748+{
92749+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
92750+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
92751+ (family != AF_UNIX)) {
92752+ if (family == AF_INET)
92753+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
92754+ else
92755+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
92756+ return -EACCES;
92757+ }
92758+#endif
92759+ return 0;
92760+}
92761+
92762+int
92763+gr_handle_sock_server(const struct sockaddr *sck)
92764+{
92765+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
92766+ if (grsec_enable_socket_server &&
92767+ in_group_p(grsec_socket_server_gid) &&
92768+ sck && (sck->sa_family != AF_UNIX) &&
92769+ (sck->sa_family != AF_LOCAL)) {
92770+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
92771+ return -EACCES;
92772+ }
92773+#endif
92774+ return 0;
92775+}
92776+
92777+int
92778+gr_handle_sock_server_other(const struct sock *sck)
92779+{
92780+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
92781+ if (grsec_enable_socket_server &&
92782+ in_group_p(grsec_socket_server_gid) &&
92783+ sck && (sck->sk_family != AF_UNIX) &&
92784+ (sck->sk_family != AF_LOCAL)) {
92785+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
92786+ return -EACCES;
92787+ }
92788+#endif
92789+ return 0;
92790+}
92791+
92792+int
92793+gr_handle_sock_client(const struct sockaddr *sck)
92794+{
92795+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
92796+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
92797+ sck && (sck->sa_family != AF_UNIX) &&
92798+ (sck->sa_family != AF_LOCAL)) {
92799+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
92800+ return -EACCES;
92801+ }
92802+#endif
92803+ return 0;
92804+}
92805diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
92806new file mode 100644
92807index 0000000..aaec43c
92808--- /dev/null
92809+++ b/grsecurity/grsec_sysctl.c
92810@@ -0,0 +1,488 @@
92811+#include <linux/kernel.h>
92812+#include <linux/sched.h>
92813+#include <linux/sysctl.h>
92814+#include <linux/grsecurity.h>
92815+#include <linux/grinternal.h>
92816+
92817+int
92818+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
92819+{
92820+#ifdef CONFIG_GRKERNSEC_SYSCTL
92821+ if (dirname == NULL || name == NULL)
92822+ return 0;
92823+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
92824+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
92825+ return -EACCES;
92826+ }
92827+#endif
92828+ return 0;
92829+}
92830+
92831+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
92832+static int __maybe_unused __read_only one = 1;
92833+#endif
92834+
92835+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
92836+ defined(CONFIG_GRKERNSEC_DENYUSB)
92837+struct ctl_table grsecurity_table[] = {
92838+#ifdef CONFIG_GRKERNSEC_SYSCTL
92839+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
92840+#ifdef CONFIG_GRKERNSEC_IO
92841+ {
92842+ .procname = "disable_priv_io",
92843+ .data = &grsec_disable_privio,
92844+ .maxlen = sizeof(int),
92845+ .mode = 0600,
92846+ .proc_handler = &proc_dointvec_secure,
92847+ },
92848+#endif
92849+#endif
92850+#ifdef CONFIG_GRKERNSEC_LINK
92851+ {
92852+ .procname = "linking_restrictions",
92853+ .data = &grsec_enable_link,
92854+ .maxlen = sizeof(int),
92855+ .mode = 0600,
92856+ .proc_handler = &proc_dointvec_secure,
92857+ },
92858+#endif
92859+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
92860+ {
92861+ .procname = "enforce_symlinksifowner",
92862+ .data = &grsec_enable_symlinkown,
92863+ .maxlen = sizeof(int),
92864+ .mode = 0600,
92865+ .proc_handler = &proc_dointvec_secure,
92866+ },
92867+ {
92868+ .procname = "symlinkown_gid",
92869+ .data = &grsec_symlinkown_gid,
92870+ .maxlen = sizeof(int),
92871+ .mode = 0600,
92872+ .proc_handler = &proc_dointvec_secure,
92873+ },
92874+#endif
92875+#ifdef CONFIG_GRKERNSEC_BRUTE
92876+ {
92877+ .procname = "deter_bruteforce",
92878+ .data = &grsec_enable_brute,
92879+ .maxlen = sizeof(int),
92880+ .mode = 0600,
92881+ .proc_handler = &proc_dointvec_secure,
92882+ },
92883+#endif
92884+#ifdef CONFIG_GRKERNSEC_FIFO
92885+ {
92886+ .procname = "fifo_restrictions",
92887+ .data = &grsec_enable_fifo,
92888+ .maxlen = sizeof(int),
92889+ .mode = 0600,
92890+ .proc_handler = &proc_dointvec_secure,
92891+ },
92892+#endif
92893+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
92894+ {
92895+ .procname = "ptrace_readexec",
92896+ .data = &grsec_enable_ptrace_readexec,
92897+ .maxlen = sizeof(int),
92898+ .mode = 0600,
92899+ .proc_handler = &proc_dointvec_secure,
92900+ },
92901+#endif
92902+#ifdef CONFIG_GRKERNSEC_SETXID
92903+ {
92904+ .procname = "consistent_setxid",
92905+ .data = &grsec_enable_setxid,
92906+ .maxlen = sizeof(int),
92907+ .mode = 0600,
92908+ .proc_handler = &proc_dointvec_secure,
92909+ },
92910+#endif
92911+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92912+ {
92913+ .procname = "ip_blackhole",
92914+ .data = &grsec_enable_blackhole,
92915+ .maxlen = sizeof(int),
92916+ .mode = 0600,
92917+ .proc_handler = &proc_dointvec_secure,
92918+ },
92919+ {
92920+ .procname = "lastack_retries",
92921+ .data = &grsec_lastack_retries,
92922+ .maxlen = sizeof(int),
92923+ .mode = 0600,
92924+ .proc_handler = &proc_dointvec_secure,
92925+ },
92926+#endif
92927+#ifdef CONFIG_GRKERNSEC_EXECLOG
92928+ {
92929+ .procname = "exec_logging",
92930+ .data = &grsec_enable_execlog,
92931+ .maxlen = sizeof(int),
92932+ .mode = 0600,
92933+ .proc_handler = &proc_dointvec_secure,
92934+ },
92935+#endif
92936+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92937+ {
92938+ .procname = "rwxmap_logging",
92939+ .data = &grsec_enable_log_rwxmaps,
92940+ .maxlen = sizeof(int),
92941+ .mode = 0600,
92942+ .proc_handler = &proc_dointvec_secure,
92943+ },
92944+#endif
92945+#ifdef CONFIG_GRKERNSEC_SIGNAL
92946+ {
92947+ .procname = "signal_logging",
92948+ .data = &grsec_enable_signal,
92949+ .maxlen = sizeof(int),
92950+ .mode = 0600,
92951+ .proc_handler = &proc_dointvec_secure,
92952+ },
92953+#endif
92954+#ifdef CONFIG_GRKERNSEC_FORKFAIL
92955+ {
92956+ .procname = "forkfail_logging",
92957+ .data = &grsec_enable_forkfail,
92958+ .maxlen = sizeof(int),
92959+ .mode = 0600,
92960+ .proc_handler = &proc_dointvec_secure,
92961+ },
92962+#endif
92963+#ifdef CONFIG_GRKERNSEC_TIME
92964+ {
92965+ .procname = "timechange_logging",
92966+ .data = &grsec_enable_time,
92967+ .maxlen = sizeof(int),
92968+ .mode = 0600,
92969+ .proc_handler = &proc_dointvec_secure,
92970+ },
92971+#endif
92972+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
92973+ {
92974+ .procname = "chroot_deny_shmat",
92975+ .data = &grsec_enable_chroot_shmat,
92976+ .maxlen = sizeof(int),
92977+ .mode = 0600,
92978+ .proc_handler = &proc_dointvec_secure,
92979+ },
92980+#endif
92981+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
92982+ {
92983+ .procname = "chroot_deny_unix",
92984+ .data = &grsec_enable_chroot_unix,
92985+ .maxlen = sizeof(int),
92986+ .mode = 0600,
92987+ .proc_handler = &proc_dointvec_secure,
92988+ },
92989+#endif
92990+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
92991+ {
92992+ .procname = "chroot_deny_mount",
92993+ .data = &grsec_enable_chroot_mount,
92994+ .maxlen = sizeof(int),
92995+ .mode = 0600,
92996+ .proc_handler = &proc_dointvec_secure,
92997+ },
92998+#endif
92999+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
93000+ {
93001+ .procname = "chroot_deny_fchdir",
93002+ .data = &grsec_enable_chroot_fchdir,
93003+ .maxlen = sizeof(int),
93004+ .mode = 0600,
93005+ .proc_handler = &proc_dointvec_secure,
93006+ },
93007+#endif
93008+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
93009+ {
93010+ .procname = "chroot_deny_chroot",
93011+ .data = &grsec_enable_chroot_double,
93012+ .maxlen = sizeof(int),
93013+ .mode = 0600,
93014+ .proc_handler = &proc_dointvec_secure,
93015+ },
93016+#endif
93017+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
93018+ {
93019+ .procname = "chroot_deny_pivot",
93020+ .data = &grsec_enable_chroot_pivot,
93021+ .maxlen = sizeof(int),
93022+ .mode = 0600,
93023+ .proc_handler = &proc_dointvec_secure,
93024+ },
93025+#endif
93026+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
93027+ {
93028+ .procname = "chroot_enforce_chdir",
93029+ .data = &grsec_enable_chroot_chdir,
93030+ .maxlen = sizeof(int),
93031+ .mode = 0600,
93032+ .proc_handler = &proc_dointvec_secure,
93033+ },
93034+#endif
93035+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
93036+ {
93037+ .procname = "chroot_deny_chmod",
93038+ .data = &grsec_enable_chroot_chmod,
93039+ .maxlen = sizeof(int),
93040+ .mode = 0600,
93041+ .proc_handler = &proc_dointvec_secure,
93042+ },
93043+#endif
93044+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
93045+ {
93046+ .procname = "chroot_deny_mknod",
93047+ .data = &grsec_enable_chroot_mknod,
93048+ .maxlen = sizeof(int),
93049+ .mode = 0600,
93050+ .proc_handler = &proc_dointvec_secure,
93051+ },
93052+#endif
93053+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
93054+ {
93055+ .procname = "chroot_restrict_nice",
93056+ .data = &grsec_enable_chroot_nice,
93057+ .maxlen = sizeof(int),
93058+ .mode = 0600,
93059+ .proc_handler = &proc_dointvec_secure,
93060+ },
93061+#endif
93062+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
93063+ {
93064+ .procname = "chroot_execlog",
93065+ .data = &grsec_enable_chroot_execlog,
93066+ .maxlen = sizeof(int),
93067+ .mode = 0600,
93068+ .proc_handler = &proc_dointvec_secure,
93069+ },
93070+#endif
93071+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
93072+ {
93073+ .procname = "chroot_caps",
93074+ .data = &grsec_enable_chroot_caps,
93075+ .maxlen = sizeof(int),
93076+ .mode = 0600,
93077+ .proc_handler = &proc_dointvec_secure,
93078+ },
93079+#endif
93080+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
93081+ {
93082+ .procname = "chroot_deny_bad_rename",
93083+ .data = &grsec_enable_chroot_rename,
93084+ .maxlen = sizeof(int),
93085+ .mode = 0600,
93086+ .proc_handler = &proc_dointvec_secure,
93087+ },
93088+#endif
93089+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
93090+ {
93091+ .procname = "chroot_deny_sysctl",
93092+ .data = &grsec_enable_chroot_sysctl,
93093+ .maxlen = sizeof(int),
93094+ .mode = 0600,
93095+ .proc_handler = &proc_dointvec_secure,
93096+ },
93097+#endif
93098+#ifdef CONFIG_GRKERNSEC_TPE
93099+ {
93100+ .procname = "tpe",
93101+ .data = &grsec_enable_tpe,
93102+ .maxlen = sizeof(int),
93103+ .mode = 0600,
93104+ .proc_handler = &proc_dointvec_secure,
93105+ },
93106+ {
93107+ .procname = "tpe_gid",
93108+ .data = &grsec_tpe_gid,
93109+ .maxlen = sizeof(int),
93110+ .mode = 0600,
93111+ .proc_handler = &proc_dointvec_secure,
93112+ },
93113+#endif
93114+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93115+ {
93116+ .procname = "tpe_invert",
93117+ .data = &grsec_enable_tpe_invert,
93118+ .maxlen = sizeof(int),
93119+ .mode = 0600,
93120+ .proc_handler = &proc_dointvec_secure,
93121+ },
93122+#endif
93123+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93124+ {
93125+ .procname = "tpe_restrict_all",
93126+ .data = &grsec_enable_tpe_all,
93127+ .maxlen = sizeof(int),
93128+ .mode = 0600,
93129+ .proc_handler = &proc_dointvec_secure,
93130+ },
93131+#endif
93132+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
93133+ {
93134+ .procname = "socket_all",
93135+ .data = &grsec_enable_socket_all,
93136+ .maxlen = sizeof(int),
93137+ .mode = 0600,
93138+ .proc_handler = &proc_dointvec_secure,
93139+ },
93140+ {
93141+ .procname = "socket_all_gid",
93142+ .data = &grsec_socket_all_gid,
93143+ .maxlen = sizeof(int),
93144+ .mode = 0600,
93145+ .proc_handler = &proc_dointvec_secure,
93146+ },
93147+#endif
93148+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
93149+ {
93150+ .procname = "socket_client",
93151+ .data = &grsec_enable_socket_client,
93152+ .maxlen = sizeof(int),
93153+ .mode = 0600,
93154+ .proc_handler = &proc_dointvec_secure,
93155+ },
93156+ {
93157+ .procname = "socket_client_gid",
93158+ .data = &grsec_socket_client_gid,
93159+ .maxlen = sizeof(int),
93160+ .mode = 0600,
93161+ .proc_handler = &proc_dointvec_secure,
93162+ },
93163+#endif
93164+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93165+ {
93166+ .procname = "socket_server",
93167+ .data = &grsec_enable_socket_server,
93168+ .maxlen = sizeof(int),
93169+ .mode = 0600,
93170+ .proc_handler = &proc_dointvec_secure,
93171+ },
93172+ {
93173+ .procname = "socket_server_gid",
93174+ .data = &grsec_socket_server_gid,
93175+ .maxlen = sizeof(int),
93176+ .mode = 0600,
93177+ .proc_handler = &proc_dointvec_secure,
93178+ },
93179+#endif
93180+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
93181+ {
93182+ .procname = "audit_group",
93183+ .data = &grsec_enable_group,
93184+ .maxlen = sizeof(int),
93185+ .mode = 0600,
93186+ .proc_handler = &proc_dointvec_secure,
93187+ },
93188+ {
93189+ .procname = "audit_gid",
93190+ .data = &grsec_audit_gid,
93191+ .maxlen = sizeof(int),
93192+ .mode = 0600,
93193+ .proc_handler = &proc_dointvec_secure,
93194+ },
93195+#endif
93196+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
93197+ {
93198+ .procname = "audit_chdir",
93199+ .data = &grsec_enable_chdir,
93200+ .maxlen = sizeof(int),
93201+ .mode = 0600,
93202+ .proc_handler = &proc_dointvec_secure,
93203+ },
93204+#endif
93205+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
93206+ {
93207+ .procname = "audit_mount",
93208+ .data = &grsec_enable_mount,
93209+ .maxlen = sizeof(int),
93210+ .mode = 0600,
93211+ .proc_handler = &proc_dointvec_secure,
93212+ },
93213+#endif
93214+#ifdef CONFIG_GRKERNSEC_DMESG
93215+ {
93216+ .procname = "dmesg",
93217+ .data = &grsec_enable_dmesg,
93218+ .maxlen = sizeof(int),
93219+ .mode = 0600,
93220+ .proc_handler = &proc_dointvec_secure,
93221+ },
93222+#endif
93223+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
93224+ {
93225+ .procname = "chroot_findtask",
93226+ .data = &grsec_enable_chroot_findtask,
93227+ .maxlen = sizeof(int),
93228+ .mode = 0600,
93229+ .proc_handler = &proc_dointvec_secure,
93230+ },
93231+#endif
93232+#ifdef CONFIG_GRKERNSEC_RESLOG
93233+ {
93234+ .procname = "resource_logging",
93235+ .data = &grsec_resource_logging,
93236+ .maxlen = sizeof(int),
93237+ .mode = 0600,
93238+ .proc_handler = &proc_dointvec_secure,
93239+ },
93240+#endif
93241+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
93242+ {
93243+ .procname = "audit_ptrace",
93244+ .data = &grsec_enable_audit_ptrace,
93245+ .maxlen = sizeof(int),
93246+ .mode = 0600,
93247+ .proc_handler = &proc_dointvec_secure,
93248+ },
93249+#endif
93250+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
93251+ {
93252+ .procname = "harden_ptrace",
93253+ .data = &grsec_enable_harden_ptrace,
93254+ .maxlen = sizeof(int),
93255+ .mode = 0600,
93256+ .proc_handler = &proc_dointvec_secure,
93257+ },
93258+#endif
93259+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
93260+ {
93261+ .procname = "harden_ipc",
93262+ .data = &grsec_enable_harden_ipc,
93263+ .maxlen = sizeof(int),
93264+ .mode = 0600,
93265+ .proc_handler = &proc_dointvec_secure,
93266+ },
93267+#endif
93268+ {
93269+ .procname = "grsec_lock",
93270+ .data = &grsec_lock,
93271+ .maxlen = sizeof(int),
93272+ .mode = 0600,
93273+ .proc_handler = &proc_dointvec_secure,
93274+ },
93275+#endif
93276+#ifdef CONFIG_GRKERNSEC_ROFS
93277+ {
93278+ .procname = "romount_protect",
93279+ .data = &grsec_enable_rofs,
93280+ .maxlen = sizeof(int),
93281+ .mode = 0600,
93282+ .proc_handler = &proc_dointvec_minmax_secure,
93283+ .extra1 = &one,
93284+ .extra2 = &one,
93285+ },
93286+#endif
93287+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
93288+ {
93289+ .procname = "deny_new_usb",
93290+ .data = &grsec_deny_new_usb,
93291+ .maxlen = sizeof(int),
93292+ .mode = 0600,
93293+ .proc_handler = &proc_dointvec_secure,
93294+ },
93295+#endif
93296+ { }
93297+};
93298+#endif
93299diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
93300new file mode 100644
93301index 0000000..61b514e
93302--- /dev/null
93303+++ b/grsecurity/grsec_time.c
93304@@ -0,0 +1,16 @@
93305+#include <linux/kernel.h>
93306+#include <linux/sched.h>
93307+#include <linux/grinternal.h>
93308+#include <linux/module.h>
93309+
93310+void
93311+gr_log_timechange(void)
93312+{
93313+#ifdef CONFIG_GRKERNSEC_TIME
93314+ if (grsec_enable_time)
93315+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
93316+#endif
93317+ return;
93318+}
93319+
93320+EXPORT_SYMBOL_GPL(gr_log_timechange);
93321diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
93322new file mode 100644
93323index 0000000..9786671
93324--- /dev/null
93325+++ b/grsecurity/grsec_tpe.c
93326@@ -0,0 +1,78 @@
93327+#include <linux/kernel.h>
93328+#include <linux/sched.h>
93329+#include <linux/file.h>
93330+#include <linux/fs.h>
93331+#include <linux/grinternal.h>
93332+
93333+extern int gr_acl_tpe_check(void);
93334+
93335+int
93336+gr_tpe_allow(const struct file *file)
93337+{
93338+#ifdef CONFIG_GRKERNSEC
93339+ struct inode *inode = d_backing_inode(file->f_path.dentry->d_parent);
93340+ struct inode *file_inode = d_backing_inode(file->f_path.dentry);
93341+ const struct cred *cred = current_cred();
93342+ char *msg = NULL;
93343+ char *msg2 = NULL;
93344+
93345+ // never restrict root
93346+ if (gr_is_global_root(cred->uid))
93347+ return 1;
93348+
93349+ if (grsec_enable_tpe) {
93350+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93351+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
93352+ msg = "not being in trusted group";
93353+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
93354+ msg = "being in untrusted group";
93355+#else
93356+ if (in_group_p(grsec_tpe_gid))
93357+ msg = "being in untrusted group";
93358+#endif
93359+ }
93360+ if (!msg && gr_acl_tpe_check())
93361+ msg = "being in untrusted role";
93362+
93363+ // not in any affected group/role
93364+ if (!msg)
93365+ goto next_check;
93366+
93367+ if (gr_is_global_nonroot(inode->i_uid))
93368+ msg2 = "file in non-root-owned directory";
93369+ else if (inode->i_mode & S_IWOTH)
93370+ msg2 = "file in world-writable directory";
93371+ else if (inode->i_mode & S_IWGRP)
93372+ msg2 = "file in group-writable directory";
93373+ else if (file_inode->i_mode & S_IWOTH)
93374+ msg2 = "file is world-writable";
93375+
93376+ if (msg && msg2) {
93377+ char fullmsg[70] = {0};
93378+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
93379+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
93380+ return 0;
93381+ }
93382+ msg = NULL;
93383+next_check:
93384+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93385+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
93386+ return 1;
93387+
93388+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
93389+ msg = "directory not owned by user";
93390+ else if (inode->i_mode & S_IWOTH)
93391+ msg = "file in world-writable directory";
93392+ else if (inode->i_mode & S_IWGRP)
93393+ msg = "file in group-writable directory";
93394+ else if (file_inode->i_mode & S_IWOTH)
93395+ msg = "file is world-writable";
93396+
93397+ if (msg) {
93398+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
93399+ return 0;
93400+ }
93401+#endif
93402+#endif
93403+ return 1;
93404+}
93405diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
93406new file mode 100644
93407index 0000000..ae02d8e
93408--- /dev/null
93409+++ b/grsecurity/grsec_usb.c
93410@@ -0,0 +1,15 @@
93411+#include <linux/kernel.h>
93412+#include <linux/grinternal.h>
93413+#include <linux/module.h>
93414+
93415+int gr_handle_new_usb(void)
93416+{
93417+#ifdef CONFIG_GRKERNSEC_DENYUSB
93418+ if (grsec_deny_new_usb) {
93419+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
93420+ return 1;
93421+ }
93422+#endif
93423+ return 0;
93424+}
93425+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
93426diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
93427new file mode 100644
93428index 0000000..158b330
93429--- /dev/null
93430+++ b/grsecurity/grsum.c
93431@@ -0,0 +1,64 @@
93432+#include <linux/err.h>
93433+#include <linux/kernel.h>
93434+#include <linux/sched.h>
93435+#include <linux/mm.h>
93436+#include <linux/scatterlist.h>
93437+#include <linux/crypto.h>
93438+#include <linux/gracl.h>
93439+
93440+
93441+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
93442+#error "crypto and sha256 must be built into the kernel"
93443+#endif
93444+
93445+int
93446+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
93447+{
93448+ struct crypto_hash *tfm;
93449+ struct hash_desc desc;
93450+ struct scatterlist sg[2];
93451+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
93452+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
93453+ unsigned long *sumptr = (unsigned long *)sum;
93454+ int cryptres;
93455+ int retval = 1;
93456+ volatile int mismatched = 0;
93457+ volatile int dummy = 0;
93458+ unsigned int i;
93459+
93460+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
93461+ if (IS_ERR(tfm)) {
93462+ /* should never happen, since sha256 should be built in */
93463+ memset(entry->pw, 0, GR_PW_LEN);
93464+ return 1;
93465+ }
93466+
93467+ sg_init_table(sg, 2);
93468+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
93469+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
93470+
93471+ desc.tfm = tfm;
93472+ desc.flags = 0;
93473+
93474+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
93475+ temp_sum);
93476+
93477+ memset(entry->pw, 0, GR_PW_LEN);
93478+
93479+ if (cryptres)
93480+ goto out;
93481+
93482+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
93483+ if (sumptr[i] != tmpsumptr[i])
93484+ mismatched = 1;
93485+ else
93486+ dummy = 1; // waste a cycle
93487+
93488+ if (!mismatched)
93489+ retval = dummy - 1;
93490+
93491+out:
93492+ crypto_free_hash(tfm);
93493+
93494+ return retval;
93495+}
93496diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
93497index 5bdab6b..9ae82fe 100644
93498--- a/include/asm-generic/4level-fixup.h
93499+++ b/include/asm-generic/4level-fixup.h
93500@@ -14,8 +14,10 @@
93501 #define pmd_alloc(mm, pud, address) \
93502 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
93503 NULL: pmd_offset(pud, address))
93504+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
93505
93506 #define pud_alloc(mm, pgd, address) (pgd)
93507+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
93508 #define pud_offset(pgd, start) (pgd)
93509 #define pud_none(pud) 0
93510 #define pud_bad(pud) 0
93511diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
93512index b7babf0..1e4b4f1 100644
93513--- a/include/asm-generic/atomic-long.h
93514+++ b/include/asm-generic/atomic-long.h
93515@@ -22,6 +22,12 @@
93516
93517 typedef atomic64_t atomic_long_t;
93518
93519+#ifdef CONFIG_PAX_REFCOUNT
93520+typedef atomic64_unchecked_t atomic_long_unchecked_t;
93521+#else
93522+typedef atomic64_t atomic_long_unchecked_t;
93523+#endif
93524+
93525 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
93526
93527 static inline long atomic_long_read(atomic_long_t *l)
93528@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93529 return (long)atomic64_read(v);
93530 }
93531
93532+#ifdef CONFIG_PAX_REFCOUNT
93533+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93534+{
93535+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93536+
93537+ return (long)atomic64_read_unchecked(v);
93538+}
93539+#endif
93540+
93541 static inline void atomic_long_set(atomic_long_t *l, long i)
93542 {
93543 atomic64_t *v = (atomic64_t *)l;
93544@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93545 atomic64_set(v, i);
93546 }
93547
93548+#ifdef CONFIG_PAX_REFCOUNT
93549+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93550+{
93551+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93552+
93553+ atomic64_set_unchecked(v, i);
93554+}
93555+#endif
93556+
93557 static inline void atomic_long_inc(atomic_long_t *l)
93558 {
93559 atomic64_t *v = (atomic64_t *)l;
93560@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93561 atomic64_inc(v);
93562 }
93563
93564+#ifdef CONFIG_PAX_REFCOUNT
93565+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93566+{
93567+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93568+
93569+ atomic64_inc_unchecked(v);
93570+}
93571+#endif
93572+
93573 static inline void atomic_long_dec(atomic_long_t *l)
93574 {
93575 atomic64_t *v = (atomic64_t *)l;
93576@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93577 atomic64_dec(v);
93578 }
93579
93580+#ifdef CONFIG_PAX_REFCOUNT
93581+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93582+{
93583+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93584+
93585+ atomic64_dec_unchecked(v);
93586+}
93587+#endif
93588+
93589 static inline void atomic_long_add(long i, atomic_long_t *l)
93590 {
93591 atomic64_t *v = (atomic64_t *)l;
93592@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93593 atomic64_add(i, v);
93594 }
93595
93596+#ifdef CONFIG_PAX_REFCOUNT
93597+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93598+{
93599+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93600+
93601+ atomic64_add_unchecked(i, v);
93602+}
93603+#endif
93604+
93605 static inline void atomic_long_sub(long i, atomic_long_t *l)
93606 {
93607 atomic64_t *v = (atomic64_t *)l;
93608@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93609 atomic64_sub(i, v);
93610 }
93611
93612+#ifdef CONFIG_PAX_REFCOUNT
93613+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93614+{
93615+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93616+
93617+ atomic64_sub_unchecked(i, v);
93618+}
93619+#endif
93620+
93621 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93622 {
93623 atomic64_t *v = (atomic64_t *)l;
93624@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93625 return atomic64_add_negative(i, v);
93626 }
93627
93628-static inline long atomic_long_add_return(long i, atomic_long_t *l)
93629+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
93630 {
93631 atomic64_t *v = (atomic64_t *)l;
93632
93633 return (long)atomic64_add_return(i, v);
93634 }
93635
93636+#ifdef CONFIG_PAX_REFCOUNT
93637+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
93638+{
93639+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93640+
93641+ return (long)atomic64_add_return_unchecked(i, v);
93642+}
93643+#endif
93644+
93645 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
93646 {
93647 atomic64_t *v = (atomic64_t *)l;
93648@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
93649 return (long)atomic64_inc_return(v);
93650 }
93651
93652+#ifdef CONFIG_PAX_REFCOUNT
93653+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
93654+{
93655+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93656+
93657+ return (long)atomic64_inc_return_unchecked(v);
93658+}
93659+#endif
93660+
93661 static inline long atomic_long_dec_return(atomic_long_t *l)
93662 {
93663 atomic64_t *v = (atomic64_t *)l;
93664@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
93665
93666 typedef atomic_t atomic_long_t;
93667
93668+#ifdef CONFIG_PAX_REFCOUNT
93669+typedef atomic_unchecked_t atomic_long_unchecked_t;
93670+#else
93671+typedef atomic_t atomic_long_unchecked_t;
93672+#endif
93673+
93674 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
93675 static inline long atomic_long_read(atomic_long_t *l)
93676 {
93677@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93678 return (long)atomic_read(v);
93679 }
93680
93681+#ifdef CONFIG_PAX_REFCOUNT
93682+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93683+{
93684+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93685+
93686+ return (long)atomic_read_unchecked(v);
93687+}
93688+#endif
93689+
93690 static inline void atomic_long_set(atomic_long_t *l, long i)
93691 {
93692 atomic_t *v = (atomic_t *)l;
93693@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93694 atomic_set(v, i);
93695 }
93696
93697+#ifdef CONFIG_PAX_REFCOUNT
93698+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93699+{
93700+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93701+
93702+ atomic_set_unchecked(v, i);
93703+}
93704+#endif
93705+
93706 static inline void atomic_long_inc(atomic_long_t *l)
93707 {
93708 atomic_t *v = (atomic_t *)l;
93709@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93710 atomic_inc(v);
93711 }
93712
93713+#ifdef CONFIG_PAX_REFCOUNT
93714+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93715+{
93716+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93717+
93718+ atomic_inc_unchecked(v);
93719+}
93720+#endif
93721+
93722 static inline void atomic_long_dec(atomic_long_t *l)
93723 {
93724 atomic_t *v = (atomic_t *)l;
93725@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93726 atomic_dec(v);
93727 }
93728
93729+#ifdef CONFIG_PAX_REFCOUNT
93730+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93731+{
93732+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93733+
93734+ atomic_dec_unchecked(v);
93735+}
93736+#endif
93737+
93738 static inline void atomic_long_add(long i, atomic_long_t *l)
93739 {
93740 atomic_t *v = (atomic_t *)l;
93741@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93742 atomic_add(i, v);
93743 }
93744
93745+#ifdef CONFIG_PAX_REFCOUNT
93746+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93747+{
93748+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93749+
93750+ atomic_add_unchecked(i, v);
93751+}
93752+#endif
93753+
93754 static inline void atomic_long_sub(long i, atomic_long_t *l)
93755 {
93756 atomic_t *v = (atomic_t *)l;
93757@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93758 atomic_sub(i, v);
93759 }
93760
93761+#ifdef CONFIG_PAX_REFCOUNT
93762+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93763+{
93764+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93765+
93766+ atomic_sub_unchecked(i, v);
93767+}
93768+#endif
93769+
93770 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93771 {
93772 atomic_t *v = (atomic_t *)l;
93773@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93774 return atomic_add_negative(i, v);
93775 }
93776
93777-static inline long atomic_long_add_return(long i, atomic_long_t *l)
93778+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
93779 {
93780 atomic_t *v = (atomic_t *)l;
93781
93782 return (long)atomic_add_return(i, v);
93783 }
93784
93785+#ifdef CONFIG_PAX_REFCOUNT
93786+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
93787+{
93788+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93789+
93790+ return (long)atomic_add_return_unchecked(i, v);
93791+}
93792+
93793+#endif
93794+
93795 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
93796 {
93797 atomic_t *v = (atomic_t *)l;
93798@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
93799 return (long)atomic_inc_return(v);
93800 }
93801
93802+#ifdef CONFIG_PAX_REFCOUNT
93803+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
93804+{
93805+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93806+
93807+ return (long)atomic_inc_return_unchecked(v);
93808+}
93809+#endif
93810+
93811 static inline long atomic_long_dec_return(atomic_long_t *l)
93812 {
93813 atomic_t *v = (atomic_t *)l;
93814@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
93815
93816 #endif /* BITS_PER_LONG == 64 */
93817
93818+#ifdef CONFIG_PAX_REFCOUNT
93819+static inline void pax_refcount_needs_these_functions(void)
93820+{
93821+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
93822+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
93823+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
93824+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
93825+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
93826+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
93827+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
93828+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
93829+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
93830+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
93831+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
93832+#ifdef CONFIG_X86
93833+ atomic_clear_mask_unchecked(0, NULL);
93834+ atomic_set_mask_unchecked(0, NULL);
93835+#endif
93836+
93837+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
93838+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
93839+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
93840+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
93841+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
93842+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
93843+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
93844+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
93845+}
93846+#else
93847+#define atomic_read_unchecked(v) atomic_read(v)
93848+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
93849+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
93850+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
93851+#define atomic_inc_unchecked(v) atomic_inc(v)
93852+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
93853+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
93854+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
93855+#define atomic_dec_unchecked(v) atomic_dec(v)
93856+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
93857+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
93858+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
93859+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
93860+
93861+#define atomic_long_read_unchecked(v) atomic_long_read(v)
93862+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
93863+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
93864+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
93865+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
93866+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
93867+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
93868+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
93869+#endif
93870+
93871 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
93872diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
93873index 30ad9c8..c70c170 100644
93874--- a/include/asm-generic/atomic64.h
93875+++ b/include/asm-generic/atomic64.h
93876@@ -16,6 +16,8 @@ typedef struct {
93877 long long counter;
93878 } atomic64_t;
93879
93880+typedef atomic64_t atomic64_unchecked_t;
93881+
93882 #define ATOMIC64_INIT(i) { (i) }
93883
93884 extern long long atomic64_read(const atomic64_t *v);
93885@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
93886 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
93887 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
93888
93889+#define atomic64_read_unchecked(v) atomic64_read(v)
93890+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
93891+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
93892+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
93893+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
93894+#define atomic64_inc_unchecked(v) atomic64_inc(v)
93895+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
93896+#define atomic64_dec_unchecked(v) atomic64_dec(v)
93897+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
93898+
93899 #endif /* _ASM_GENERIC_ATOMIC64_H */
93900diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
93901index f5c40b0..e902f9d 100644
93902--- a/include/asm-generic/barrier.h
93903+++ b/include/asm-generic/barrier.h
93904@@ -82,7 +82,7 @@
93905 do { \
93906 compiletime_assert_atomic_type(*p); \
93907 smp_mb(); \
93908- ACCESS_ONCE(*p) = (v); \
93909+ ACCESS_ONCE_RW(*p) = (v); \
93910 } while (0)
93911
93912 #define smp_load_acquire(p) \
93913diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
93914index a60a7cc..0fe12f2 100644
93915--- a/include/asm-generic/bitops/__fls.h
93916+++ b/include/asm-generic/bitops/__fls.h
93917@@ -9,7 +9,7 @@
93918 *
93919 * Undefined if no set bit exists, so code should check against 0 first.
93920 */
93921-static __always_inline unsigned long __fls(unsigned long word)
93922+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
93923 {
93924 int num = BITS_PER_LONG - 1;
93925
93926diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
93927index 0576d1f..dad6c71 100644
93928--- a/include/asm-generic/bitops/fls.h
93929+++ b/include/asm-generic/bitops/fls.h
93930@@ -9,7 +9,7 @@
93931 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
93932 */
93933
93934-static __always_inline int fls(int x)
93935+static __always_inline int __intentional_overflow(-1) fls(int x)
93936 {
93937 int r = 32;
93938
93939diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
93940index b097cf8..3d40e14 100644
93941--- a/include/asm-generic/bitops/fls64.h
93942+++ b/include/asm-generic/bitops/fls64.h
93943@@ -15,7 +15,7 @@
93944 * at position 64.
93945 */
93946 #if BITS_PER_LONG == 32
93947-static __always_inline int fls64(__u64 x)
93948+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
93949 {
93950 __u32 h = x >> 32;
93951 if (h)
93952@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
93953 return fls(x);
93954 }
93955 #elif BITS_PER_LONG == 64
93956-static __always_inline int fls64(__u64 x)
93957+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
93958 {
93959 if (x == 0)
93960 return 0;
93961diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
93962index 630dd23..8c1dcb6b 100644
93963--- a/include/asm-generic/bug.h
93964+++ b/include/asm-generic/bug.h
93965@@ -62,13 +62,13 @@ struct bug_entry {
93966 * to provide better diagnostics.
93967 */
93968 #ifndef __WARN_TAINT
93969-extern __printf(3, 4)
93970+extern __printf(3, 4) __nocapture(1, 3, 4)
93971 void warn_slowpath_fmt(const char *file, const int line,
93972 const char *fmt, ...);
93973-extern __printf(4, 5)
93974+extern __printf(4, 5) __nocapture(1, 4, 5)
93975 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
93976 const char *fmt, ...);
93977-extern void warn_slowpath_null(const char *file, const int line);
93978+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
93979 #define WANT_WARN_ON_SLOWPATH
93980 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
93981 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
93982diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
93983index 1bfcfe5..e04c5c9 100644
93984--- a/include/asm-generic/cache.h
93985+++ b/include/asm-generic/cache.h
93986@@ -6,7 +6,7 @@
93987 * cache lines need to provide their own cache.h.
93988 */
93989
93990-#define L1_CACHE_SHIFT 5
93991-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
93992+#define L1_CACHE_SHIFT 5UL
93993+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
93994
93995 #endif /* __ASM_GENERIC_CACHE_H */
93996diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
93997index 0d68a1e..b74a761 100644
93998--- a/include/asm-generic/emergency-restart.h
93999+++ b/include/asm-generic/emergency-restart.h
94000@@ -1,7 +1,7 @@
94001 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
94002 #define _ASM_GENERIC_EMERGENCY_RESTART_H
94003
94004-static inline void machine_emergency_restart(void)
94005+static inline __noreturn void machine_emergency_restart(void)
94006 {
94007 machine_restart(NULL);
94008 }
94009diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
94010index 90f99c7..00ce236 100644
94011--- a/include/asm-generic/kmap_types.h
94012+++ b/include/asm-generic/kmap_types.h
94013@@ -2,9 +2,9 @@
94014 #define _ASM_GENERIC_KMAP_TYPES_H
94015
94016 #ifdef __WITH_KM_FENCE
94017-# define KM_TYPE_NR 41
94018+# define KM_TYPE_NR 42
94019 #else
94020-# define KM_TYPE_NR 20
94021+# define KM_TYPE_NR 21
94022 #endif
94023
94024 #endif
94025diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
94026index 9ceb03b..62b0b8f 100644
94027--- a/include/asm-generic/local.h
94028+++ b/include/asm-generic/local.h
94029@@ -23,24 +23,37 @@ typedef struct
94030 atomic_long_t a;
94031 } local_t;
94032
94033+typedef struct {
94034+ atomic_long_unchecked_t a;
94035+} local_unchecked_t;
94036+
94037 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
94038
94039 #define local_read(l) atomic_long_read(&(l)->a)
94040+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
94041 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
94042+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
94043 #define local_inc(l) atomic_long_inc(&(l)->a)
94044+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
94045 #define local_dec(l) atomic_long_dec(&(l)->a)
94046+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
94047 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
94048+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
94049 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
94050+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
94051
94052 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
94053 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
94054 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
94055 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
94056 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
94057+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
94058 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
94059 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
94060+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
94061
94062 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94063+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94064 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
94065 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
94066 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
94067diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
94068index 725612b..9cc513a 100644
94069--- a/include/asm-generic/pgtable-nopmd.h
94070+++ b/include/asm-generic/pgtable-nopmd.h
94071@@ -1,14 +1,19 @@
94072 #ifndef _PGTABLE_NOPMD_H
94073 #define _PGTABLE_NOPMD_H
94074
94075-#ifndef __ASSEMBLY__
94076-
94077 #include <asm-generic/pgtable-nopud.h>
94078
94079-struct mm_struct;
94080-
94081 #define __PAGETABLE_PMD_FOLDED
94082
94083+#define PMD_SHIFT PUD_SHIFT
94084+#define PTRS_PER_PMD 1
94085+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
94086+#define PMD_MASK (~(PMD_SIZE-1))
94087+
94088+#ifndef __ASSEMBLY__
94089+
94090+struct mm_struct;
94091+
94092 /*
94093 * Having the pmd type consist of a pud gets the size right, and allows
94094 * us to conceptually access the pud entry that this pmd is folded into
94095@@ -16,11 +21,6 @@ struct mm_struct;
94096 */
94097 typedef struct { pud_t pud; } pmd_t;
94098
94099-#define PMD_SHIFT PUD_SHIFT
94100-#define PTRS_PER_PMD 1
94101-#define PMD_SIZE (1UL << PMD_SHIFT)
94102-#define PMD_MASK (~(PMD_SIZE-1))
94103-
94104 /*
94105 * The "pud_xxx()" functions here are trivial for a folded two-level
94106 * setup: the pmd is never bad, and a pmd always exists (as it's folded
94107diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
94108index 810431d..0ec4804f 100644
94109--- a/include/asm-generic/pgtable-nopud.h
94110+++ b/include/asm-generic/pgtable-nopud.h
94111@@ -1,10 +1,15 @@
94112 #ifndef _PGTABLE_NOPUD_H
94113 #define _PGTABLE_NOPUD_H
94114
94115-#ifndef __ASSEMBLY__
94116-
94117 #define __PAGETABLE_PUD_FOLDED
94118
94119+#define PUD_SHIFT PGDIR_SHIFT
94120+#define PTRS_PER_PUD 1
94121+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
94122+#define PUD_MASK (~(PUD_SIZE-1))
94123+
94124+#ifndef __ASSEMBLY__
94125+
94126 /*
94127 * Having the pud type consist of a pgd gets the size right, and allows
94128 * us to conceptually access the pgd entry that this pud is folded into
94129@@ -12,11 +17,6 @@
94130 */
94131 typedef struct { pgd_t pgd; } pud_t;
94132
94133-#define PUD_SHIFT PGDIR_SHIFT
94134-#define PTRS_PER_PUD 1
94135-#define PUD_SIZE (1UL << PUD_SHIFT)
94136-#define PUD_MASK (~(PUD_SIZE-1))
94137-
94138 /*
94139 * The "pgd_xxx()" functions here are trivial for a folded two-level
94140 * setup: the pud is never bad, and a pud always exists (as it's folded
94141@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
94142 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
94143
94144 #define pgd_populate(mm, pgd, pud) do { } while (0)
94145+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
94146 /*
94147 * (puds are folded into pgds so this doesn't get actually called,
94148 * but the define is needed for a generic inline function.)
94149diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
94150index 39f1d6a..7dae6fb 100644
94151--- a/include/asm-generic/pgtable.h
94152+++ b/include/asm-generic/pgtable.h
94153@@ -695,6 +695,22 @@ static inline int pmd_protnone(pmd_t pmd)
94154 }
94155 #endif /* CONFIG_NUMA_BALANCING */
94156
94157+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
94158+#ifdef CONFIG_PAX_KERNEXEC
94159+#error KERNEXEC requires pax_open_kernel
94160+#else
94161+static inline unsigned long pax_open_kernel(void) { return 0; }
94162+#endif
94163+#endif
94164+
94165+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
94166+#ifdef CONFIG_PAX_KERNEXEC
94167+#error KERNEXEC requires pax_close_kernel
94168+#else
94169+static inline unsigned long pax_close_kernel(void) { return 0; }
94170+#endif
94171+#endif
94172+
94173 #endif /* CONFIG_MMU */
94174
94175 #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
94176diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
94177index 72d8803..cb9749c 100644
94178--- a/include/asm-generic/uaccess.h
94179+++ b/include/asm-generic/uaccess.h
94180@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
94181 return __clear_user(to, n);
94182 }
94183
94184+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
94185+#ifdef CONFIG_PAX_MEMORY_UDEREF
94186+#error UDEREF requires pax_open_userland
94187+#else
94188+static inline unsigned long pax_open_userland(void) { return 0; }
94189+#endif
94190+#endif
94191+
94192+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
94193+#ifdef CONFIG_PAX_MEMORY_UDEREF
94194+#error UDEREF requires pax_close_userland
94195+#else
94196+static inline unsigned long pax_close_userland(void) { return 0; }
94197+#endif
94198+#endif
94199+
94200 #endif /* __ASM_GENERIC_UACCESS_H */
94201diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
94202index 8bd374d..9590e70 100644
94203--- a/include/asm-generic/vmlinux.lds.h
94204+++ b/include/asm-generic/vmlinux.lds.h
94205@@ -246,6 +246,7 @@
94206 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
94207 VMLINUX_SYMBOL(__start_rodata) = .; \
94208 *(.rodata) *(.rodata.*) \
94209+ *(.data..read_only) \
94210 *(__vermagic) /* Kernel version magic */ \
94211 . = ALIGN(8); \
94212 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
94213@@ -504,6 +505,7 @@
94214 KERNEL_CTORS() \
94215 MCOUNT_REC() \
94216 *(.init.rodata) \
94217+ *(.init.rodata.*) \
94218 FTRACE_EVENTS() \
94219 TRACE_SYSCALLS() \
94220 KPROBE_BLACKLIST() \
94221@@ -525,6 +527,8 @@
94222
94223 #define EXIT_DATA \
94224 *(.exit.data) \
94225+ *(.exit.rodata) \
94226+ *(.exit.rodata.*) \
94227 MEM_DISCARD(exit.data) \
94228 MEM_DISCARD(exit.rodata)
94229
94230@@ -741,17 +745,18 @@
94231 * section in the linker script will go there too. @phdr should have
94232 * a leading colon.
94233 *
94234- * Note that this macros defines __per_cpu_load as an absolute symbol.
94235+ * Note that this macros defines per_cpu_load as an absolute symbol.
94236 * If there is no need to put the percpu section at a predetermined
94237 * address, use PERCPU_SECTION.
94238 */
94239 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
94240- VMLINUX_SYMBOL(__per_cpu_load) = .; \
94241- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
94242+ per_cpu_load = .; \
94243+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
94244 - LOAD_OFFSET) { \
94245+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
94246 PERCPU_INPUT(cacheline) \
94247 } phdr \
94248- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
94249+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
94250
94251 /**
94252 * PERCPU_SECTION - define output section for percpu area, simple version
94253diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
94254index 0ecb768..f910132 100644
94255--- a/include/crypto/algapi.h
94256+++ b/include/crypto/algapi.h
94257@@ -34,7 +34,7 @@ struct crypto_type {
94258 unsigned int maskclear;
94259 unsigned int maskset;
94260 unsigned int tfmsize;
94261-};
94262+} __do_const;
94263
94264 struct crypto_instance {
94265 struct crypto_alg alg;
94266diff --git a/include/drm/drmP.h b/include/drm/drmP.h
94267index 62c40777..f980496 100644
94268--- a/include/drm/drmP.h
94269+++ b/include/drm/drmP.h
94270@@ -59,6 +59,7 @@
94271
94272 #include <asm/mman.h>
94273 #include <asm/pgalloc.h>
94274+#include <asm/local.h>
94275 #include <asm/uaccess.h>
94276
94277 #include <uapi/drm/drm.h>
94278@@ -137,17 +138,18 @@ void drm_err(const char *format, ...);
94279 /*@{*/
94280
94281 /* driver capabilities and requirements mask */
94282-#define DRIVER_USE_AGP 0x1
94283-#define DRIVER_PCI_DMA 0x8
94284-#define DRIVER_SG 0x10
94285-#define DRIVER_HAVE_DMA 0x20
94286-#define DRIVER_HAVE_IRQ 0x40
94287-#define DRIVER_IRQ_SHARED 0x80
94288-#define DRIVER_GEM 0x1000
94289-#define DRIVER_MODESET 0x2000
94290-#define DRIVER_PRIME 0x4000
94291-#define DRIVER_RENDER 0x8000
94292-#define DRIVER_ATOMIC 0x10000
94293+#define DRIVER_USE_AGP 0x1
94294+#define DRIVER_PCI_DMA 0x8
94295+#define DRIVER_SG 0x10
94296+#define DRIVER_HAVE_DMA 0x20
94297+#define DRIVER_HAVE_IRQ 0x40
94298+#define DRIVER_IRQ_SHARED 0x80
94299+#define DRIVER_GEM 0x1000
94300+#define DRIVER_MODESET 0x2000
94301+#define DRIVER_PRIME 0x4000
94302+#define DRIVER_RENDER 0x8000
94303+#define DRIVER_ATOMIC 0x10000
94304+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
94305
94306 /***********************************************************************/
94307 /** \name Macros to make printk easier */
94308@@ -233,10 +235,12 @@ void drm_err(const char *format, ...);
94309 * \param cmd command.
94310 * \param arg argument.
94311 */
94312-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
94313+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
94314+ struct drm_file *file_priv);
94315+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
94316 struct drm_file *file_priv);
94317
94318-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94319+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
94320 unsigned long arg);
94321
94322 #define DRM_IOCTL_NR(n) _IOC_NR(n)
94323@@ -252,9 +256,9 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94324 struct drm_ioctl_desc {
94325 unsigned int cmd;
94326 int flags;
94327- drm_ioctl_t *func;
94328+ drm_ioctl_t func;
94329 const char *name;
94330-};
94331+} __do_const;
94332
94333 /**
94334 * Creates a driver or general drm_ioctl_desc array entry for the given
94335@@ -645,7 +649,8 @@ struct drm_info_list {
94336 int (*show)(struct seq_file*, void*); /** show callback */
94337 u32 driver_features; /**< Required driver features for this entry */
94338 void *data;
94339-};
94340+} __do_const;
94341+typedef struct drm_info_list __no_const drm_info_list_no_const;
94342
94343 /**
94344 * debugfs node structure. This structure represents a debugfs file.
94345@@ -729,7 +734,7 @@ struct drm_device {
94346
94347 /** \name Usage Counters */
94348 /*@{ */
94349- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94350+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94351 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
94352 int buf_use; /**< Buffers in use -- cannot alloc */
94353 atomic_t buf_alloc; /**< Buffer allocation in progress */
94354diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
94355index c8fc187..079d4c2 100644
94356--- a/include/drm/drm_crtc_helper.h
94357+++ b/include/drm/drm_crtc_helper.h
94358@@ -161,7 +161,7 @@ struct drm_encoder_helper_funcs {
94359 int (*atomic_check)(struct drm_encoder *encoder,
94360 struct drm_crtc_state *crtc_state,
94361 struct drm_connector_state *conn_state);
94362-};
94363+} __no_const;
94364
94365 /**
94366 * struct drm_connector_helper_funcs - helper operations for connectors
94367diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
94368index 6133723..4c1fccb 100644
94369--- a/include/drm/i915_pciids.h
94370+++ b/include/drm/i915_pciids.h
94371@@ -37,7 +37,7 @@
94372 */
94373 #define INTEL_VGA_DEVICE(id, info) { \
94374 0x8086, id, \
94375- ~0, ~0, \
94376+ PCI_ANY_ID, PCI_ANY_ID, \
94377 0x030000, 0xff0000, \
94378 (unsigned long) info }
94379
94380diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
94381index 72dcbe8..8db58d7 100644
94382--- a/include/drm/ttm/ttm_memory.h
94383+++ b/include/drm/ttm/ttm_memory.h
94384@@ -48,7 +48,7 @@
94385
94386 struct ttm_mem_shrink {
94387 int (*do_shrink) (struct ttm_mem_shrink *);
94388-};
94389+} __no_const;
94390
94391 /**
94392 * struct ttm_mem_global - Global memory accounting structure.
94393diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
94394index 49a8284..9643967 100644
94395--- a/include/drm/ttm/ttm_page_alloc.h
94396+++ b/include/drm/ttm/ttm_page_alloc.h
94397@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
94398 */
94399 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
94400
94401+struct device;
94402 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94403 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94404
94405diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
94406index 4b840e8..155d235 100644
94407--- a/include/keys/asymmetric-subtype.h
94408+++ b/include/keys/asymmetric-subtype.h
94409@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
94410 /* Verify the signature on a key of this subtype (optional) */
94411 int (*verify_signature)(const struct key *key,
94412 const struct public_key_signature *sig);
94413-};
94414+} __do_const;
94415
94416 /**
94417 * asymmetric_key_subtype - Get the subtype from an asymmetric key
94418diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
94419index c1da539..1dcec55 100644
94420--- a/include/linux/atmdev.h
94421+++ b/include/linux/atmdev.h
94422@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
94423 #endif
94424
94425 struct k_atm_aal_stats {
94426-#define __HANDLE_ITEM(i) atomic_t i
94427+#define __HANDLE_ITEM(i) atomic_unchecked_t i
94428 __AAL_STAT_ITEMS
94429 #undef __HANDLE_ITEM
94430 };
94431@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
94432 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
94433 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
94434 struct module *owner;
94435-};
94436+} __do_const ;
94437
94438 struct atmphy_ops {
94439 int (*start)(struct atm_dev *dev);
94440diff --git a/include/linux/atomic.h b/include/linux/atomic.h
94441index 5b08a85..60922fb 100644
94442--- a/include/linux/atomic.h
94443+++ b/include/linux/atomic.h
94444@@ -12,7 +12,7 @@
94445 * Atomically adds @a to @v, so long as @v was not already @u.
94446 * Returns non-zero if @v was not @u, and zero otherwise.
94447 */
94448-static inline int atomic_add_unless(atomic_t *v, int a, int u)
94449+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
94450 {
94451 return __atomic_add_unless(v, a, u) != u;
94452 }
94453diff --git a/include/linux/audit.h b/include/linux/audit.h
94454index c2e7e3a..8bfc0e1 100644
94455--- a/include/linux/audit.h
94456+++ b/include/linux/audit.h
94457@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
94458 extern unsigned int audit_serial(void);
94459 extern int auditsc_get_stamp(struct audit_context *ctx,
94460 struct timespec *t, unsigned int *serial);
94461-extern int audit_set_loginuid(kuid_t loginuid);
94462+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
94463
94464 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
94465 {
94466diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
94467index 576e463..28fd926 100644
94468--- a/include/linux/binfmts.h
94469+++ b/include/linux/binfmts.h
94470@@ -44,7 +44,7 @@ struct linux_binprm {
94471 unsigned interp_flags;
94472 unsigned interp_data;
94473 unsigned long loader, exec;
94474-};
94475+} __randomize_layout;
94476
94477 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
94478 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
94479@@ -77,8 +77,10 @@ struct linux_binfmt {
94480 int (*load_binary)(struct linux_binprm *);
94481 int (*load_shlib)(struct file *);
94482 int (*core_dump)(struct coredump_params *cprm);
94483+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
94484+ void (*handle_mmap)(struct file *);
94485 unsigned long min_coredump; /* minimal dump size */
94486-};
94487+} __do_const __randomize_layout;
94488
94489 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
94490
94491diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
94492index ea17cca..dd56e56 100644
94493--- a/include/linux/bitmap.h
94494+++ b/include/linux/bitmap.h
94495@@ -295,7 +295,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
94496 return find_first_zero_bit(src, nbits) == nbits;
94497 }
94498
94499-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
94500+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
94501 {
94502 if (small_const_nbits(nbits))
94503 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
94504diff --git a/include/linux/bitops.h b/include/linux/bitops.h
94505index 297f5bd..0b6d1e8 100644
94506--- a/include/linux/bitops.h
94507+++ b/include/linux/bitops.h
94508@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
94509 * @word: value to rotate
94510 * @shift: bits to roll
94511 */
94512-static inline __u32 rol32(__u32 word, unsigned int shift)
94513+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
94514 {
94515 return (word << shift) | (word >> (32 - shift));
94516 }
94517@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
94518 * @word: value to rotate
94519 * @shift: bits to roll
94520 */
94521-static inline __u32 ror32(__u32 word, unsigned int shift)
94522+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
94523 {
94524 return (word >> shift) | (word << (32 - shift));
94525 }
94526@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
94527 return (__s32)(value << shift) >> shift;
94528 }
94529
94530-static inline unsigned fls_long(unsigned long l)
94531+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
94532 {
94533 if (sizeof(l) == 4)
94534 return fls(l);
94535diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
94536index 5d93a66..978c4a0 100644
94537--- a/include/linux/blkdev.h
94538+++ b/include/linux/blkdev.h
94539@@ -1614,7 +1614,7 @@ struct block_device_operations {
94540 /* this callback is with swap_lock and sometimes page table lock held */
94541 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
94542 struct module *owner;
94543-};
94544+} __do_const;
94545
94546 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
94547 unsigned long);
94548diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
94549index afc1343..9735539 100644
94550--- a/include/linux/blktrace_api.h
94551+++ b/include/linux/blktrace_api.h
94552@@ -25,7 +25,7 @@ struct blk_trace {
94553 struct dentry *dropped_file;
94554 struct dentry *msg_file;
94555 struct list_head running_list;
94556- atomic_t dropped;
94557+ atomic_unchecked_t dropped;
94558 };
94559
94560 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
94561diff --git a/include/linux/cache.h b/include/linux/cache.h
94562index 17e7e82..1d7da26 100644
94563--- a/include/linux/cache.h
94564+++ b/include/linux/cache.h
94565@@ -16,6 +16,14 @@
94566 #define __read_mostly
94567 #endif
94568
94569+#ifndef __read_only
94570+#ifdef CONFIG_PAX_KERNEXEC
94571+#error KERNEXEC requires __read_only
94572+#else
94573+#define __read_only __read_mostly
94574+#endif
94575+#endif
94576+
94577 #ifndef ____cacheline_aligned
94578 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
94579 #endif
94580diff --git a/include/linux/capability.h b/include/linux/capability.h
94581index af9f0b9..71a5e5c 100644
94582--- a/include/linux/capability.h
94583+++ b/include/linux/capability.h
94584@@ -237,15 +237,28 @@ static inline bool capable(int cap)
94585 {
94586 return true;
94587 }
94588+static inline bool capable_nolog(int cap)
94589+{
94590+ return true;
94591+}
94592 static inline bool ns_capable(struct user_namespace *ns, int cap)
94593 {
94594 return true;
94595 }
94596+static inline bool ns_capable_nolog(struct user_namespace *ns, int cap)
94597+{
94598+ return true;
94599+}
94600 #endif /* CONFIG_MULTIUSER */
94601 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
94602+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
94603 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
94604+extern bool capable_nolog(int cap);
94605+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
94606
94607 /* audit system wants to get cap info from files as well */
94608 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
94609
94610+extern int is_privileged_binary(const struct dentry *dentry);
94611+
94612 #endif /* !_LINUX_CAPABILITY_H */
94613diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
94614index 8609d57..86e4d79 100644
94615--- a/include/linux/cdrom.h
94616+++ b/include/linux/cdrom.h
94617@@ -87,7 +87,6 @@ struct cdrom_device_ops {
94618
94619 /* driver specifications */
94620 const int capability; /* capability flags */
94621- int n_minors; /* number of active minor devices */
94622 /* handle uniform packets for scsi type devices (scsi,atapi) */
94623 int (*generic_packet) (struct cdrom_device_info *,
94624 struct packet_command *);
94625diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
94626index bda5ec0b4..51d8ea1 100644
94627--- a/include/linux/cleancache.h
94628+++ b/include/linux/cleancache.h
94629@@ -35,7 +35,7 @@ struct cleancache_ops {
94630 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
94631 void (*invalidate_inode)(int, struct cleancache_filekey);
94632 void (*invalidate_fs)(int);
94633-};
94634+} __no_const;
94635
94636 extern int cleancache_register_ops(struct cleancache_ops *ops);
94637 extern void __cleancache_init_fs(struct super_block *);
94638diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
94639index df69531..0180e68 100644
94640--- a/include/linux/clk-provider.h
94641+++ b/include/linux/clk-provider.h
94642@@ -195,6 +195,7 @@ struct clk_ops {
94643 void (*init)(struct clk_hw *hw);
94644 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
94645 };
94646+typedef struct clk_ops __no_const clk_ops_no_const;
94647
94648 /**
94649 * struct clk_init_data - holds init data that's common to all clocks and is
94650@@ -209,7 +210,7 @@ struct clk_ops {
94651 struct clk_init_data {
94652 const char *name;
94653 const struct clk_ops *ops;
94654- const char **parent_names;
94655+ const char * const *parent_names;
94656 u8 num_parents;
94657 unsigned long flags;
94658 };
94659@@ -426,12 +427,12 @@ extern const struct clk_ops clk_mux_ops;
94660 extern const struct clk_ops clk_mux_ro_ops;
94661
94662 struct clk *clk_register_mux(struct device *dev, const char *name,
94663- const char **parent_names, u8 num_parents, unsigned long flags,
94664+ const char * const *parent_names, u8 num_parents, unsigned long flags,
94665 void __iomem *reg, u8 shift, u8 width,
94666 u8 clk_mux_flags, spinlock_t *lock);
94667
94668 struct clk *clk_register_mux_table(struct device *dev, const char *name,
94669- const char **parent_names, u8 num_parents, unsigned long flags,
94670+ const char * const *parent_names, u8 num_parents, unsigned long flags,
94671 void __iomem *reg, u8 shift, u32 mask,
94672 u8 clk_mux_flags, u32 *table, spinlock_t *lock);
94673
94674diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
94675index 94bad77..a39e810 100644
94676--- a/include/linux/clkdev.h
94677+++ b/include/linux/clkdev.h
94678@@ -32,7 +32,7 @@ struct clk_lookup {
94679 }
94680
94681 struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
94682- const char *dev_fmt, ...);
94683+ const char *dev_fmt, ...) __printf(3, 4);
94684
94685 void clkdev_add(struct clk_lookup *cl);
94686 void clkdev_drop(struct clk_lookup *cl);
94687@@ -40,7 +40,8 @@ void clkdev_drop(struct clk_lookup *cl);
94688 void clkdev_add_table(struct clk_lookup *, size_t);
94689 int clk_add_alias(const char *, const char *, char *, struct device *);
94690
94691-int clk_register_clkdev(struct clk *, const char *, const char *, ...);
94692+int clk_register_clkdev(struct clk *, const char *, const char *, ...)
94693+ __printf(3, 4);
94694 int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);
94695
94696 #ifdef CONFIG_COMMON_CLK
94697diff --git a/include/linux/compat.h b/include/linux/compat.h
94698index ab25814..63b52db 100644
94699--- a/include/linux/compat.h
94700+++ b/include/linux/compat.h
94701@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
94702 compat_size_t __user *len_ptr);
94703
94704 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
94705-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
94706+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
94707 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
94708 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
94709 compat_ssize_t msgsz, int msgflg);
94710@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
94711 long compat_sys_msgctl(int first, int second, void __user *uptr);
94712 long compat_sys_shmctl(int first, int second, void __user *uptr);
94713 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
94714- unsigned nsems, const struct compat_timespec __user *timeout);
94715+ compat_long_t nsems, const struct compat_timespec __user *timeout);
94716 asmlinkage long compat_sys_keyctl(u32 option,
94717 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
94718 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
94719@@ -424,7 +424,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv,
94720
94721 asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
94722
94723-extern int compat_printk(const char *fmt, ...);
94724+extern __printf(1, 2) int compat_printk(const char *fmt, ...);
94725 extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);
94726 extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);
94727
94728@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
94729 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
94730 compat_ulong_t addr, compat_ulong_t data);
94731 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
94732- compat_long_t addr, compat_long_t data);
94733+ compat_ulong_t addr, compat_ulong_t data);
94734
94735 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
94736 /*
94737diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
94738index 371e560..e2e4e3e 100644
94739--- a/include/linux/compiler-gcc.h
94740+++ b/include/linux/compiler-gcc.h
94741@@ -108,8 +108,8 @@
94742 */
94743 #define __pure __attribute__((pure))
94744 #define __aligned(x) __attribute__((aligned(x)))
94745-#define __printf(a, b) __attribute__((format(printf, a, b)))
94746-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
94747+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
94748+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
94749 #define noinline __attribute__((noinline))
94750 #define __attribute_const__ __attribute__((__const__))
94751 #define __maybe_unused __attribute__((unused))
94752diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
94753index 769e198..7ee7cb5 100644
94754--- a/include/linux/compiler-gcc4.h
94755+++ b/include/linux/compiler-gcc4.h
94756@@ -39,9 +39,38 @@
94757 # define __compiletime_warning(message) __attribute__((warning(message)))
94758 # define __compiletime_error(message) __attribute__((error(message)))
94759 #endif /* __CHECKER__ */
94760+
94761+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
94762+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
94763+#define __bos0(ptr) __bos((ptr), 0)
94764+#define __bos1(ptr) __bos((ptr), 1)
94765 #endif /* GCC_VERSION >= 40300 */
94766
94767 #if GCC_VERSION >= 40500
94768+
94769+#ifdef RANDSTRUCT_PLUGIN
94770+#define __randomize_layout __attribute__((randomize_layout))
94771+#define __no_randomize_layout __attribute__((no_randomize_layout))
94772+#endif
94773+
94774+#ifdef CONSTIFY_PLUGIN
94775+#define __no_const __attribute__((no_const))
94776+#define __do_const __attribute__((do_const))
94777+#endif
94778+
94779+#ifdef SIZE_OVERFLOW_PLUGIN
94780+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
94781+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
94782+#endif
94783+
94784+#ifdef LATENT_ENTROPY_PLUGIN
94785+#define __latent_entropy __attribute__((latent_entropy))
94786+#endif
94787+
94788+#ifdef INITIFY_PLUGIN
94789+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
94790+#endif
94791+
94792 /*
94793 * Mark a position in code as unreachable. This can be used to
94794 * suppress control flow warnings after asm blocks that transfer
94795diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
94796index efee493..8aa8f6b 100644
94797--- a/include/linux/compiler-gcc5.h
94798+++ b/include/linux/compiler-gcc5.h
94799@@ -28,6 +28,34 @@
94800 # define __compiletime_error(message) __attribute__((error(message)))
94801 #endif /* __CHECKER__ */
94802
94803+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
94804+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
94805+#define __bos0(ptr) __bos((ptr), 0)
94806+#define __bos1(ptr) __bos((ptr), 1)
94807+
94808+#ifdef RANDSTRUCT_PLUGIN
94809+#define __randomize_layout __attribute__((randomize_layout))
94810+#define __no_randomize_layout __attribute__((no_randomize_layout))
94811+#endif
94812+
94813+#ifdef CONSTIFY_PLUGIN
94814+#define __no_const __attribute__((no_const))
94815+#define __do_const __attribute__((do_const))
94816+#endif
94817+
94818+#ifdef SIZE_OVERFLOW_PLUGIN
94819+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
94820+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
94821+#endif
94822+
94823+#ifdef LATENT_ENTROPY_PLUGIN
94824+#define __latent_entropy __attribute__((latent_entropy))
94825+#endif
94826+
94827+#ifdef INITIFY_PLUGIN
94828+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
94829+#endif
94830+
94831 /*
94832 * Mark a position in code as unreachable. This can be used to
94833 * suppress control flow warnings after asm blocks that transfer
94834diff --git a/include/linux/compiler.h b/include/linux/compiler.h
94835index 8677225..2d49df1 100644
94836--- a/include/linux/compiler.h
94837+++ b/include/linux/compiler.h
94838@@ -5,11 +5,14 @@
94839
94840 #ifdef __CHECKER__
94841 # define __user __attribute__((noderef, address_space(1)))
94842+# define __force_user __force __user
94843 # define __kernel __attribute__((address_space(0)))
94844+# define __force_kernel __force __kernel
94845 # define __safe __attribute__((safe))
94846 # define __force __attribute__((force))
94847 # define __nocast __attribute__((nocast))
94848 # define __iomem __attribute__((noderef, address_space(2)))
94849+# define __force_iomem __force __iomem
94850 # define __must_hold(x) __attribute__((context(x,1,1)))
94851 # define __acquires(x) __attribute__((context(x,0,1)))
94852 # define __releases(x) __attribute__((context(x,1,0)))
94853@@ -17,20 +20,37 @@
94854 # define __release(x) __context__(x,-1)
94855 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
94856 # define __percpu __attribute__((noderef, address_space(3)))
94857+# define __force_percpu __force __percpu
94858 #ifdef CONFIG_SPARSE_RCU_POINTER
94859 # define __rcu __attribute__((noderef, address_space(4)))
94860+# define __force_rcu __force __rcu
94861 #else
94862 # define __rcu
94863+# define __force_rcu
94864 #endif
94865 extern void __chk_user_ptr(const volatile void __user *);
94866 extern void __chk_io_ptr(const volatile void __iomem *);
94867 #else
94868-# define __user
94869-# define __kernel
94870+# ifdef CHECKER_PLUGIN
94871+//# define __user
94872+//# define __force_user
94873+//# define __kernel
94874+//# define __force_kernel
94875+# else
94876+# ifdef STRUCTLEAK_PLUGIN
94877+# define __user __attribute__((user))
94878+# else
94879+# define __user
94880+# endif
94881+# define __force_user
94882+# define __kernel
94883+# define __force_kernel
94884+# endif
94885 # define __safe
94886 # define __force
94887 # define __nocast
94888 # define __iomem
94889+# define __force_iomem
94890 # define __chk_user_ptr(x) (void)0
94891 # define __chk_io_ptr(x) (void)0
94892 # define __builtin_warning(x, y...) (1)
94893@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
94894 # define __release(x) (void)0
94895 # define __cond_lock(x,c) (c)
94896 # define __percpu
94897+# define __force_percpu
94898 # define __rcu
94899+# define __force_rcu
94900 #endif
94901
94902 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
94903@@ -199,27 +221,27 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
94904 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
94905 {
94906 switch (size) {
94907- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
94908- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
94909- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
94910- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
94911+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
94912+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
94913+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
94914+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
94915 default:
94916 barrier();
94917- __builtin_memcpy((void *)res, (const void *)p, size);
94918+ __builtin_memcpy(res, (const void *)p, size);
94919 barrier();
94920 }
94921 }
94922
94923-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
94924+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
94925 {
94926 switch (size) {
94927- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
94928- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
94929- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
94930- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
94931+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
94932+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
94933+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
94934+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
94935 default:
94936 barrier();
94937- __builtin_memcpy((void *)p, (const void *)res, size);
94938+ __builtin_memcpy((void *)p, res, size);
94939 barrier();
94940 }
94941 }
94942@@ -352,6 +374,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
94943 # define __attribute_const__ /* unimplemented */
94944 #endif
94945
94946+#ifndef __randomize_layout
94947+# define __randomize_layout
94948+#endif
94949+
94950+#ifndef __no_randomize_layout
94951+# define __no_randomize_layout
94952+#endif
94953+
94954+#ifndef __no_const
94955+# define __no_const
94956+#endif
94957+
94958+#ifndef __do_const
94959+# define __do_const
94960+#endif
94961+
94962+#ifndef __size_overflow
94963+# define __size_overflow(...)
94964+#endif
94965+
94966+#ifndef __intentional_overflow
94967+# define __intentional_overflow(...)
94968+#endif
94969+
94970+#ifndef __latent_entropy
94971+# define __latent_entropy
94972+#endif
94973+
94974+#ifndef __nocapture
94975+# define __nocapture(...)
94976+#endif
94977+
94978 /*
94979 * Tell gcc if a function is cold. The compiler will assume any path
94980 * directly leading to the call is unlikely.
94981@@ -361,6 +415,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
94982 #define __cold
94983 #endif
94984
94985+#ifndef __alloc_size
94986+#define __alloc_size(...)
94987+#endif
94988+
94989+#ifndef __bos
94990+#define __bos(ptr, arg)
94991+#endif
94992+
94993+#ifndef __bos0
94994+#define __bos0(ptr)
94995+#endif
94996+
94997+#ifndef __bos1
94998+#define __bos1(ptr)
94999+#endif
95000+
95001 /* Simple shorthand for a section definition */
95002 #ifndef __section
95003 # define __section(S) __attribute__ ((__section__(#S)))
95004@@ -375,6 +445,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95005 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
95006 #endif
95007
95008+#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))
95009+
95010 /* Is this type a native word size -- useful for atomic operations */
95011 #ifndef __native_word
95012 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
95013@@ -454,8 +526,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95014 */
95015 #define __ACCESS_ONCE(x) ({ \
95016 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
95017- (volatile typeof(x) *)&(x); })
95018+ (volatile const typeof(x) *)&(x); })
95019 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
95020+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
95021
95022 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
95023 #ifdef CONFIG_KPROBES
95024diff --git a/include/linux/completion.h b/include/linux/completion.h
95025index 5d5aaae..0ea9b84 100644
95026--- a/include/linux/completion.h
95027+++ b/include/linux/completion.h
95028@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
95029
95030 extern void wait_for_completion(struct completion *);
95031 extern void wait_for_completion_io(struct completion *);
95032-extern int wait_for_completion_interruptible(struct completion *x);
95033-extern int wait_for_completion_killable(struct completion *x);
95034+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
95035+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
95036 extern unsigned long wait_for_completion_timeout(struct completion *x,
95037- unsigned long timeout);
95038+ unsigned long timeout) __intentional_overflow(-1);
95039 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
95040- unsigned long timeout);
95041+ unsigned long timeout) __intentional_overflow(-1);
95042 extern long wait_for_completion_interruptible_timeout(
95043- struct completion *x, unsigned long timeout);
95044+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95045 extern long wait_for_completion_killable_timeout(
95046- struct completion *x, unsigned long timeout);
95047+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95048 extern bool try_wait_for_completion(struct completion *x);
95049 extern bool completion_done(struct completion *x);
95050
95051diff --git a/include/linux/configfs.h b/include/linux/configfs.h
95052index 34025df..9c263df 100644
95053--- a/include/linux/configfs.h
95054+++ b/include/linux/configfs.h
95055@@ -64,7 +64,8 @@ struct config_item {
95056 struct dentry *ci_dentry;
95057 };
95058
95059-extern int config_item_set_name(struct config_item *, const char *, ...);
95060+extern __printf(2, 3)
95061+int config_item_set_name(struct config_item *, const char *, ...);
95062
95063 static inline char *config_item_name(struct config_item * item)
95064 {
95065@@ -125,7 +126,7 @@ struct configfs_attribute {
95066 const char *ca_name;
95067 struct module *ca_owner;
95068 umode_t ca_mode;
95069-};
95070+} __do_const;
95071
95072 /*
95073 * Users often need to create attribute structures for their configurable
95074diff --git a/include/linux/cpu.h b/include/linux/cpu.h
95075index c0fb6b1..23c30bd 100644
95076--- a/include/linux/cpu.h
95077+++ b/include/linux/cpu.h
95078@@ -40,9 +40,10 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr);
95079 extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
95080 extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
95081
95082-extern struct device *cpu_device_create(struct device *parent, void *drvdata,
95083- const struct attribute_group **groups,
95084- const char *fmt, ...);
95085+extern __printf(4, 5)
95086+struct device *cpu_device_create(struct device *parent, void *drvdata,
95087+ const struct attribute_group **groups,
95088+ const char *fmt, ...);
95089 #ifdef CONFIG_HOTPLUG_CPU
95090 extern void unregister_cpu(struct cpu *cpu);
95091 extern ssize_t arch_cpu_probe(const char *, size_t);
95092diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
95093index 2ee4888..0451f5e 100644
95094--- a/include/linux/cpufreq.h
95095+++ b/include/linux/cpufreq.h
95096@@ -207,6 +207,7 @@ struct global_attr {
95097 ssize_t (*store)(struct kobject *a, struct attribute *b,
95098 const char *c, size_t count);
95099 };
95100+typedef struct global_attr __no_const global_attr_no_const;
95101
95102 #define define_one_global_ro(_name) \
95103 static struct global_attr _name = \
95104@@ -278,7 +279,7 @@ struct cpufreq_driver {
95105 bool boost_supported;
95106 bool boost_enabled;
95107 int (*set_boost)(int state);
95108-};
95109+} __do_const;
95110
95111 /* flags */
95112 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
95113diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
95114index 9c5e892..feb34e0 100644
95115--- a/include/linux/cpuidle.h
95116+++ b/include/linux/cpuidle.h
95117@@ -59,7 +59,8 @@ struct cpuidle_state {
95118 void (*enter_freeze) (struct cpuidle_device *dev,
95119 struct cpuidle_driver *drv,
95120 int index);
95121-};
95122+} __do_const;
95123+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
95124
95125 /* Idle State Flags */
95126 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
95127@@ -227,7 +228,7 @@ struct cpuidle_governor {
95128 void (*reflect) (struct cpuidle_device *dev, int index);
95129
95130 struct module *owner;
95131-};
95132+} __do_const;
95133
95134 #ifdef CONFIG_CPU_IDLE
95135 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
95136diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
95137index 59915ea..81ebec0 100644
95138--- a/include/linux/cpumask.h
95139+++ b/include/linux/cpumask.h
95140@@ -127,17 +127,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95141 }
95142
95143 /* Valid inputs for n are -1 and 0. */
95144-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95145+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95146 {
95147 return n+1;
95148 }
95149
95150-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95151+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95152 {
95153 return n+1;
95154 }
95155
95156-static inline unsigned int cpumask_next_and(int n,
95157+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
95158 const struct cpumask *srcp,
95159 const struct cpumask *andp)
95160 {
95161@@ -181,7 +181,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95162 *
95163 * Returns >= nr_cpu_ids if no further cpus set.
95164 */
95165-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95166+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95167 {
95168 /* -1 is a legal arg here. */
95169 if (n != -1)
95170@@ -196,7 +196,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95171 *
95172 * Returns >= nr_cpu_ids if no further cpus unset.
95173 */
95174-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95175+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95176 {
95177 /* -1 is a legal arg here. */
95178 if (n != -1)
95179@@ -204,7 +204,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95180 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
95181 }
95182
95183-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
95184+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
95185 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
95186 unsigned int cpumask_local_spread(unsigned int i, int node);
95187
95188@@ -471,7 +471,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
95189 * cpumask_weight - Count of bits in *srcp
95190 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
95191 */
95192-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
95193+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
95194 {
95195 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
95196 }
95197diff --git a/include/linux/cred.h b/include/linux/cred.h
95198index 8b6c083..51cb9f5 100644
95199--- a/include/linux/cred.h
95200+++ b/include/linux/cred.h
95201@@ -35,7 +35,7 @@ struct group_info {
95202 int nblocks;
95203 kgid_t small_block[NGROUPS_SMALL];
95204 kgid_t *blocks[0];
95205-};
95206+} __randomize_layout;
95207
95208 /**
95209 * get_group_info - Get a reference to a group info structure
95210@@ -152,7 +152,7 @@ struct cred {
95211 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
95212 struct group_info *group_info; /* supplementary groups for euid/fsgid */
95213 struct rcu_head rcu; /* RCU deletion hook */
95214-};
95215+} __randomize_layout;
95216
95217 extern void __put_cred(struct cred *);
95218 extern void exit_creds(struct task_struct *);
95219@@ -210,6 +210,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
95220 static inline void validate_process_creds(void)
95221 {
95222 }
95223+static inline void validate_task_creds(struct task_struct *task)
95224+{
95225+}
95226 #endif
95227
95228 /**
95229@@ -347,6 +350,7 @@ static inline void put_cred(const struct cred *_cred)
95230
95231 #define task_uid(task) (task_cred_xxx((task), uid))
95232 #define task_euid(task) (task_cred_xxx((task), euid))
95233+#define task_securebits(task) (task_cred_xxx((task), securebits))
95234
95235 #define current_cred_xxx(xxx) \
95236 ({ \
95237diff --git a/include/linux/crypto.h b/include/linux/crypto.h
95238index 10df5d2..503d678 100644
95239--- a/include/linux/crypto.h
95240+++ b/include/linux/crypto.h
95241@@ -632,7 +632,7 @@ struct cipher_tfm {
95242 const u8 *key, unsigned int keylen);
95243 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95244 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95245-};
95246+} __no_const;
95247
95248 struct hash_tfm {
95249 int (*init)(struct hash_desc *desc);
95250@@ -653,13 +653,13 @@ struct compress_tfm {
95251 int (*cot_decompress)(struct crypto_tfm *tfm,
95252 const u8 *src, unsigned int slen,
95253 u8 *dst, unsigned int *dlen);
95254-};
95255+} __no_const;
95256
95257 struct rng_tfm {
95258 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
95259 unsigned int dlen);
95260 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
95261-};
95262+} __no_const;
95263
95264 #define crt_ablkcipher crt_u.ablkcipher
95265 #define crt_aead crt_u.aead
95266diff --git a/include/linux/ctype.h b/include/linux/ctype.h
95267index 653589e..4ef254a 100644
95268--- a/include/linux/ctype.h
95269+++ b/include/linux/ctype.h
95270@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
95271 * Fast implementation of tolower() for internal usage. Do not use in your
95272 * code.
95273 */
95274-static inline char _tolower(const char c)
95275+static inline unsigned char _tolower(const unsigned char c)
95276 {
95277 return c | 0x20;
95278 }
95279diff --git a/include/linux/dcache.h b/include/linux/dcache.h
95280index df334cb..e730faa 100644
95281--- a/include/linux/dcache.h
95282+++ b/include/linux/dcache.h
95283@@ -123,6 +123,9 @@ struct dentry {
95284 unsigned long d_time; /* used by d_revalidate */
95285 void *d_fsdata; /* fs-specific data */
95286
95287+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
95288+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
95289+#endif
95290 struct list_head d_lru; /* LRU list */
95291 struct list_head d_child; /* child of parent list */
95292 struct list_head d_subdirs; /* our children */
95293@@ -133,7 +136,7 @@ struct dentry {
95294 struct hlist_node d_alias; /* inode alias list */
95295 struct rcu_head d_rcu;
95296 } d_u;
95297-};
95298+} __randomize_layout;
95299
95300 /*
95301 * dentry->d_lock spinlock nesting subclasses:
95302@@ -319,13 +322,14 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
95303
95304 static inline unsigned d_count(const struct dentry *dentry)
95305 {
95306- return dentry->d_lockref.count;
95307+ return __lockref_read(&dentry->d_lockref);
95308 }
95309
95310 /*
95311 * helper function for dentry_operations.d_dname() members
95312 */
95313-extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95314+extern __printf(4, 5)
95315+char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95316 extern char *simple_dname(struct dentry *, char *, int);
95317
95318 extern char *__d_path(const struct path *, const struct path *, char *, int);
95319@@ -347,7 +351,7 @@ extern char *dentry_path(struct dentry *, char *, int);
95320 static inline struct dentry *dget_dlock(struct dentry *dentry)
95321 {
95322 if (dentry)
95323- dentry->d_lockref.count++;
95324+ __lockref_inc(&dentry->d_lockref);
95325 return dentry;
95326 }
95327
95328diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
95329index 7925bf0..d5143d2 100644
95330--- a/include/linux/decompress/mm.h
95331+++ b/include/linux/decompress/mm.h
95332@@ -77,7 +77,7 @@ static void free(void *where)
95333 * warnings when not needed (indeed large_malloc / large_free are not
95334 * needed by inflate */
95335
95336-#define malloc(a) kmalloc(a, GFP_KERNEL)
95337+#define malloc(a) kmalloc((a), GFP_KERNEL)
95338 #define free(a) kfree(a)
95339
95340 #define large_malloc(a) vmalloc(a)
95341diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
95342index ce447f0..83c66bd 100644
95343--- a/include/linux/devfreq.h
95344+++ b/include/linux/devfreq.h
95345@@ -114,7 +114,7 @@ struct devfreq_governor {
95346 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
95347 int (*event_handler)(struct devfreq *devfreq,
95348 unsigned int event, void *data);
95349-};
95350+} __do_const;
95351
95352 /**
95353 * struct devfreq - Device devfreq structure
95354diff --git a/include/linux/device.h b/include/linux/device.h
95355index 6558af9..48bce1a 100644
95356--- a/include/linux/device.h
95357+++ b/include/linux/device.h
95358@@ -312,7 +312,7 @@ struct subsys_interface {
95359 struct list_head node;
95360 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
95361 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
95362-};
95363+} __do_const;
95364
95365 int subsys_interface_register(struct subsys_interface *sif);
95366 void subsys_interface_unregister(struct subsys_interface *sif);
95367@@ -508,7 +508,7 @@ struct device_type {
95368 void (*release)(struct device *dev);
95369
95370 const struct dev_pm_ops *pm;
95371-};
95372+} __do_const;
95373
95374 /* interface for exporting device attributes */
95375 struct device_attribute {
95376@@ -518,11 +518,12 @@ struct device_attribute {
95377 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
95378 const char *buf, size_t count);
95379 };
95380+typedef struct device_attribute __no_const device_attribute_no_const;
95381
95382 struct dev_ext_attribute {
95383 struct device_attribute attr;
95384 void *var;
95385-};
95386+} __do_const;
95387
95388 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
95389 char *buf);
95390@@ -607,8 +608,9 @@ extern int devres_release_group(struct device *dev, void *id);
95391
95392 /* managed devm_k.alloc/kfree for device drivers */
95393 extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
95394-extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95395- va_list ap);
95396+extern __printf(3, 0)
95397+char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95398+ va_list ap);
95399 extern __printf(3, 4)
95400 char *devm_kasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...);
95401 static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
95402@@ -980,12 +982,10 @@ extern int __must_check device_reprobe(struct device *dev);
95403 /*
95404 * Easy functions for dynamically creating devices on the fly
95405 */
95406-extern struct device *device_create_vargs(struct class *cls,
95407- struct device *parent,
95408- dev_t devt,
95409- void *drvdata,
95410- const char *fmt,
95411- va_list vargs);
95412+extern __printf(5, 0)
95413+struct device *device_create_vargs(struct class *cls, struct device *parent,
95414+ dev_t devt, void *drvdata,
95415+ const char *fmt, va_list vargs);
95416 extern __printf(5, 6)
95417 struct device *device_create(struct class *cls, struct device *parent,
95418 dev_t devt, void *drvdata,
95419diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
95420index ac07ff0..edff186 100644
95421--- a/include/linux/dma-mapping.h
95422+++ b/include/linux/dma-mapping.h
95423@@ -64,7 +64,7 @@ struct dma_map_ops {
95424 u64 (*get_required_mask)(struct device *dev);
95425 #endif
95426 int is_phys;
95427-};
95428+} __do_const;
95429
95430 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
95431
95432diff --git a/include/linux/efi.h b/include/linux/efi.h
95433index af5be03..d8a6ae2 100644
95434--- a/include/linux/efi.h
95435+++ b/include/linux/efi.h
95436@@ -1057,6 +1057,7 @@ struct efivar_operations {
95437 efi_set_variable_nonblocking_t *set_variable_nonblocking;
95438 efi_query_variable_store_t *query_variable_store;
95439 };
95440+typedef struct efivar_operations __no_const efivar_operations_no_const;
95441
95442 struct efivars {
95443 /*
95444diff --git a/include/linux/elf.h b/include/linux/elf.h
95445index 20fa8d8..3d0dd18 100644
95446--- a/include/linux/elf.h
95447+++ b/include/linux/elf.h
95448@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
95449 #define elf_note elf32_note
95450 #define elf_addr_t Elf32_Off
95451 #define Elf_Half Elf32_Half
95452+#define elf_dyn Elf32_Dyn
95453
95454 #else
95455
95456@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
95457 #define elf_note elf64_note
95458 #define elf_addr_t Elf64_Off
95459 #define Elf_Half Elf64_Half
95460+#define elf_dyn Elf64_Dyn
95461
95462 #endif
95463
95464diff --git a/include/linux/err.h b/include/linux/err.h
95465index a729120..6ede2c9 100644
95466--- a/include/linux/err.h
95467+++ b/include/linux/err.h
95468@@ -20,12 +20,12 @@
95469
95470 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
95471
95472-static inline void * __must_check ERR_PTR(long error)
95473+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
95474 {
95475 return (void *) error;
95476 }
95477
95478-static inline long __must_check PTR_ERR(__force const void *ptr)
95479+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
95480 {
95481 return (long) ptr;
95482 }
95483diff --git a/include/linux/extcon.h b/include/linux/extcon.h
95484index 36f49c4..a2a1f4c 100644
95485--- a/include/linux/extcon.h
95486+++ b/include/linux/extcon.h
95487@@ -135,7 +135,7 @@ struct extcon_dev {
95488 /* /sys/class/extcon/.../mutually_exclusive/... */
95489 struct attribute_group attr_g_muex;
95490 struct attribute **attrs_muex;
95491- struct device_attribute *d_attrs_muex;
95492+ device_attribute_no_const *d_attrs_muex;
95493 };
95494
95495 /**
95496diff --git a/include/linux/fb.h b/include/linux/fb.h
95497index 043f328..180ccbf 100644
95498--- a/include/linux/fb.h
95499+++ b/include/linux/fb.h
95500@@ -305,7 +305,8 @@ struct fb_ops {
95501 /* called at KDB enter and leave time to prepare the console */
95502 int (*fb_debug_enter)(struct fb_info *info);
95503 int (*fb_debug_leave)(struct fb_info *info);
95504-};
95505+} __do_const;
95506+typedef struct fb_ops __no_const fb_ops_no_const;
95507
95508 #ifdef CONFIG_FB_TILEBLITTING
95509 #define FB_TILE_CURSOR_NONE 0
95510diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
95511index 230f87b..1fd0485 100644
95512--- a/include/linux/fdtable.h
95513+++ b/include/linux/fdtable.h
95514@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
95515 void put_files_struct(struct files_struct *fs);
95516 void reset_files_struct(struct files_struct *);
95517 int unshare_files(struct files_struct **);
95518-struct files_struct *dup_fd(struct files_struct *, int *);
95519+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
95520 void do_close_on_exec(struct files_struct *);
95521 int iterate_fd(struct files_struct *, unsigned,
95522 int (*)(const void *, struct file *, unsigned),
95523diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
95524index 8293262..2b3b8bd 100644
95525--- a/include/linux/frontswap.h
95526+++ b/include/linux/frontswap.h
95527@@ -11,7 +11,7 @@ struct frontswap_ops {
95528 int (*load)(unsigned, pgoff_t, struct page *);
95529 void (*invalidate_page)(unsigned, pgoff_t);
95530 void (*invalidate_area)(unsigned);
95531-};
95532+} __no_const;
95533
95534 extern bool frontswap_enabled;
95535 extern struct frontswap_ops *
95536diff --git a/include/linux/fs.h b/include/linux/fs.h
95537index 571aab9..03a5b06 100644
95538--- a/include/linux/fs.h
95539+++ b/include/linux/fs.h
95540@@ -437,7 +437,7 @@ struct address_space {
95541 spinlock_t private_lock; /* for use by the address_space */
95542 struct list_head private_list; /* ditto */
95543 void *private_data; /* ditto */
95544-} __attribute__((aligned(sizeof(long))));
95545+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
95546 /*
95547 * On most architectures that alignment is already the case; but
95548 * must be enforced here for CRIS, to let the least significant bit
95549@@ -480,7 +480,7 @@ struct block_device {
95550 int bd_fsfreeze_count;
95551 /* Mutex for freeze */
95552 struct mutex bd_fsfreeze_mutex;
95553-};
95554+} __randomize_layout;
95555
95556 /*
95557 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
95558@@ -666,7 +666,7 @@ struct inode {
95559 #endif
95560
95561 void *i_private; /* fs or device private pointer */
95562-};
95563+} __randomize_layout;
95564
95565 static inline int inode_unhashed(struct inode *inode)
95566 {
95567@@ -861,7 +861,7 @@ struct file {
95568 struct list_head f_tfile_llink;
95569 #endif /* #ifdef CONFIG_EPOLL */
95570 struct address_space *f_mapping;
95571-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
95572+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
95573
95574 struct file_handle {
95575 __u32 handle_bytes;
95576@@ -990,7 +990,7 @@ struct file_lock {
95577 int state; /* state of grant or error if -ve */
95578 } afs;
95579 } fl_u;
95580-};
95581+} __randomize_layout;
95582
95583 struct file_lock_context {
95584 spinlock_t flc_lock;
95585@@ -1351,7 +1351,7 @@ struct super_block {
95586 * Indicates how deep in a filesystem stack this SB is
95587 */
95588 int s_stack_depth;
95589-};
95590+} __randomize_layout;
95591
95592 extern struct timespec current_fs_time(struct super_block *sb);
95593
95594@@ -1603,7 +1603,8 @@ struct file_operations {
95595 #ifndef CONFIG_MMU
95596 unsigned (*mmap_capabilities)(struct file *);
95597 #endif
95598-};
95599+} __do_const __randomize_layout;
95600+typedef struct file_operations __no_const file_operations_no_const;
95601
95602 struct inode_operations {
95603 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
95604@@ -2303,7 +2304,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
95605 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
95606 unsigned int count, const char *name,
95607 const struct file_operations *fops);
95608-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95609+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95610 unsigned int count, const char *name);
95611 extern void unregister_chrdev_region(dev_t, unsigned);
95612 extern void chrdev_show(struct seq_file *,off_t);
95613@@ -2989,4 +2990,14 @@ static inline bool dir_relax(struct inode *inode)
95614 return !IS_DEADDIR(inode);
95615 }
95616
95617+static inline bool is_sidechannel_device(const struct inode *inode)
95618+{
95619+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
95620+ umode_t mode = inode->i_mode;
95621+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
95622+#else
95623+ return false;
95624+#endif
95625+}
95626+
95627 #endif /* _LINUX_FS_H */
95628diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
95629index 0efc3e6..fd23610 100644
95630--- a/include/linux/fs_struct.h
95631+++ b/include/linux/fs_struct.h
95632@@ -6,13 +6,13 @@
95633 #include <linux/seqlock.h>
95634
95635 struct fs_struct {
95636- int users;
95637+ atomic_t users;
95638 spinlock_t lock;
95639 seqcount_t seq;
95640 int umask;
95641 int in_exec;
95642 struct path root, pwd;
95643-};
95644+} __randomize_layout;
95645
95646 extern struct kmem_cache *fs_cachep;
95647
95648diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
95649index 7714849..a4a5c7a 100644
95650--- a/include/linux/fscache-cache.h
95651+++ b/include/linux/fscache-cache.h
95652@@ -113,7 +113,7 @@ struct fscache_operation {
95653 fscache_operation_release_t release;
95654 };
95655
95656-extern atomic_t fscache_op_debug_id;
95657+extern atomic_unchecked_t fscache_op_debug_id;
95658 extern void fscache_op_work_func(struct work_struct *work);
95659
95660 extern void fscache_enqueue_operation(struct fscache_operation *);
95661@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
95662 INIT_WORK(&op->work, fscache_op_work_func);
95663 atomic_set(&op->usage, 1);
95664 op->state = FSCACHE_OP_ST_INITIALISED;
95665- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
95666+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
95667 op->processor = processor;
95668 op->release = release;
95669 INIT_LIST_HEAD(&op->pend_link);
95670diff --git a/include/linux/fscache.h b/include/linux/fscache.h
95671index 115bb81..e7b812b 100644
95672--- a/include/linux/fscache.h
95673+++ b/include/linux/fscache.h
95674@@ -152,7 +152,7 @@ struct fscache_cookie_def {
95675 * - this is mandatory for any object that may have data
95676 */
95677 void (*now_uncached)(void *cookie_netfs_data);
95678-};
95679+} __do_const;
95680
95681 /*
95682 * fscache cached network filesystem type
95683diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
95684index 7ee1774..72505b8 100644
95685--- a/include/linux/fsnotify.h
95686+++ b/include/linux/fsnotify.h
95687@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
95688 struct inode *inode = file_inode(file);
95689 __u32 mask = FS_ACCESS;
95690
95691+ if (is_sidechannel_device(inode))
95692+ return;
95693+
95694 if (S_ISDIR(inode->i_mode))
95695 mask |= FS_ISDIR;
95696
95697@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
95698 struct inode *inode = file_inode(file);
95699 __u32 mask = FS_MODIFY;
95700
95701+ if (is_sidechannel_device(inode))
95702+ return;
95703+
95704 if (S_ISDIR(inode->i_mode))
95705 mask |= FS_ISDIR;
95706
95707@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
95708 */
95709 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
95710 {
95711- return kstrdup(name, GFP_KERNEL);
95712+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
95713 }
95714
95715 /*
95716diff --git a/include/linux/genhd.h b/include/linux/genhd.h
95717index ec274e0..e678159 100644
95718--- a/include/linux/genhd.h
95719+++ b/include/linux/genhd.h
95720@@ -194,7 +194,7 @@ struct gendisk {
95721 struct kobject *slave_dir;
95722
95723 struct timer_rand_state *random;
95724- atomic_t sync_io; /* RAID */
95725+ atomic_unchecked_t sync_io; /* RAID */
95726 struct disk_events *ev;
95727 #ifdef CONFIG_BLK_DEV_INTEGRITY
95728 struct blk_integrity *integrity;
95729@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
95730 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
95731
95732 /* drivers/char/random.c */
95733-extern void add_disk_randomness(struct gendisk *disk);
95734+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
95735 extern void rand_initialize_disk(struct gendisk *disk);
95736
95737 static inline sector_t get_start_sect(struct block_device *bdev)
95738diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
95739index 667c311..abac2a7 100644
95740--- a/include/linux/genl_magic_func.h
95741+++ b/include/linux/genl_magic_func.h
95742@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
95743 },
95744
95745 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
95746-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
95747+static struct genl_ops ZZZ_genl_ops[] = {
95748 #include GENL_MAGIC_INCLUDE_FILE
95749 };
95750
95751diff --git a/include/linux/gfp.h b/include/linux/gfp.h
95752index 15928f0..90b31d7 100644
95753--- a/include/linux/gfp.h
95754+++ b/include/linux/gfp.h
95755@@ -35,6 +35,13 @@ struct vm_area_struct;
95756 #define ___GFP_NO_KSWAPD 0x400000u
95757 #define ___GFP_OTHER_NODE 0x800000u
95758 #define ___GFP_WRITE 0x1000000u
95759+
95760+#ifdef CONFIG_PAX_USERCOPY_SLABS
95761+#define ___GFP_USERCOPY 0x2000000u
95762+#else
95763+#define ___GFP_USERCOPY 0
95764+#endif
95765+
95766 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
95767
95768 /*
95769@@ -94,6 +101,7 @@ struct vm_area_struct;
95770 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
95771 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
95772 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
95773+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
95774
95775 /*
95776 * This may seem redundant, but it's a way of annotating false positives vs.
95777@@ -101,7 +109,7 @@ struct vm_area_struct;
95778 */
95779 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
95780
95781-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
95782+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
95783 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
95784
95785 /* This equals 0, but use constants in case they ever change */
95786@@ -146,6 +154,8 @@ struct vm_area_struct;
95787 /* 4GB DMA on some platforms */
95788 #define GFP_DMA32 __GFP_DMA32
95789
95790+#define GFP_USERCOPY __GFP_USERCOPY
95791+
95792 /* Convert GFP flags to their corresponding migrate type */
95793 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
95794 {
95795diff --git a/include/linux/gracl.h b/include/linux/gracl.h
95796new file mode 100644
95797index 0000000..91858e4
95798--- /dev/null
95799+++ b/include/linux/gracl.h
95800@@ -0,0 +1,342 @@
95801+#ifndef GR_ACL_H
95802+#define GR_ACL_H
95803+
95804+#include <linux/grdefs.h>
95805+#include <linux/resource.h>
95806+#include <linux/capability.h>
95807+#include <linux/dcache.h>
95808+#include <asm/resource.h>
95809+
95810+/* Major status information */
95811+
95812+#define GR_VERSION "grsecurity 3.1"
95813+#define GRSECURITY_VERSION 0x3100
95814+
95815+enum {
95816+ GR_SHUTDOWN = 0,
95817+ GR_ENABLE = 1,
95818+ GR_SPROLE = 2,
95819+ GR_OLDRELOAD = 3,
95820+ GR_SEGVMOD = 4,
95821+ GR_STATUS = 5,
95822+ GR_UNSPROLE = 6,
95823+ GR_PASSSET = 7,
95824+ GR_SPROLEPAM = 8,
95825+ GR_RELOAD = 9,
95826+};
95827+
95828+/* Password setup definitions
95829+ * kernel/grhash.c */
95830+enum {
95831+ GR_PW_LEN = 128,
95832+ GR_SALT_LEN = 16,
95833+ GR_SHA_LEN = 32,
95834+};
95835+
95836+enum {
95837+ GR_SPROLE_LEN = 64,
95838+};
95839+
95840+enum {
95841+ GR_NO_GLOB = 0,
95842+ GR_REG_GLOB,
95843+ GR_CREATE_GLOB
95844+};
95845+
95846+#define GR_NLIMITS 32
95847+
95848+/* Begin Data Structures */
95849+
95850+struct sprole_pw {
95851+ unsigned char *rolename;
95852+ unsigned char salt[GR_SALT_LEN];
95853+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
95854+};
95855+
95856+struct name_entry {
95857+ __u32 key;
95858+ u64 inode;
95859+ dev_t device;
95860+ char *name;
95861+ __u16 len;
95862+ __u8 deleted;
95863+ struct name_entry *prev;
95864+ struct name_entry *next;
95865+};
95866+
95867+struct inodev_entry {
95868+ struct name_entry *nentry;
95869+ struct inodev_entry *prev;
95870+ struct inodev_entry *next;
95871+};
95872+
95873+struct acl_role_db {
95874+ struct acl_role_label **r_hash;
95875+ __u32 r_size;
95876+};
95877+
95878+struct inodev_db {
95879+ struct inodev_entry **i_hash;
95880+ __u32 i_size;
95881+};
95882+
95883+struct name_db {
95884+ struct name_entry **n_hash;
95885+ __u32 n_size;
95886+};
95887+
95888+struct crash_uid {
95889+ uid_t uid;
95890+ unsigned long expires;
95891+};
95892+
95893+struct gr_hash_struct {
95894+ void **table;
95895+ void **nametable;
95896+ void *first;
95897+ __u32 table_size;
95898+ __u32 used_size;
95899+ int type;
95900+};
95901+
95902+/* Userspace Grsecurity ACL data structures */
95903+
95904+struct acl_subject_label {
95905+ char *filename;
95906+ u64 inode;
95907+ dev_t device;
95908+ __u32 mode;
95909+ kernel_cap_t cap_mask;
95910+ kernel_cap_t cap_lower;
95911+ kernel_cap_t cap_invert_audit;
95912+
95913+ struct rlimit res[GR_NLIMITS];
95914+ __u32 resmask;
95915+
95916+ __u8 user_trans_type;
95917+ __u8 group_trans_type;
95918+ uid_t *user_transitions;
95919+ gid_t *group_transitions;
95920+ __u16 user_trans_num;
95921+ __u16 group_trans_num;
95922+
95923+ __u32 sock_families[2];
95924+ __u32 ip_proto[8];
95925+ __u32 ip_type;
95926+ struct acl_ip_label **ips;
95927+ __u32 ip_num;
95928+ __u32 inaddr_any_override;
95929+
95930+ __u32 crashes;
95931+ unsigned long expires;
95932+
95933+ struct acl_subject_label *parent_subject;
95934+ struct gr_hash_struct *hash;
95935+ struct acl_subject_label *prev;
95936+ struct acl_subject_label *next;
95937+
95938+ struct acl_object_label **obj_hash;
95939+ __u32 obj_hash_size;
95940+ __u16 pax_flags;
95941+};
95942+
95943+struct role_allowed_ip {
95944+ __u32 addr;
95945+ __u32 netmask;
95946+
95947+ struct role_allowed_ip *prev;
95948+ struct role_allowed_ip *next;
95949+};
95950+
95951+struct role_transition {
95952+ char *rolename;
95953+
95954+ struct role_transition *prev;
95955+ struct role_transition *next;
95956+};
95957+
95958+struct acl_role_label {
95959+ char *rolename;
95960+ uid_t uidgid;
95961+ __u16 roletype;
95962+
95963+ __u16 auth_attempts;
95964+ unsigned long expires;
95965+
95966+ struct acl_subject_label *root_label;
95967+ struct gr_hash_struct *hash;
95968+
95969+ struct acl_role_label *prev;
95970+ struct acl_role_label *next;
95971+
95972+ struct role_transition *transitions;
95973+ struct role_allowed_ip *allowed_ips;
95974+ uid_t *domain_children;
95975+ __u16 domain_child_num;
95976+
95977+ umode_t umask;
95978+
95979+ struct acl_subject_label **subj_hash;
95980+ __u32 subj_hash_size;
95981+};
95982+
95983+struct user_acl_role_db {
95984+ struct acl_role_label **r_table;
95985+ __u32 num_pointers; /* Number of allocations to track */
95986+ __u32 num_roles; /* Number of roles */
95987+ __u32 num_domain_children; /* Number of domain children */
95988+ __u32 num_subjects; /* Number of subjects */
95989+ __u32 num_objects; /* Number of objects */
95990+};
95991+
95992+struct acl_object_label {
95993+ char *filename;
95994+ u64 inode;
95995+ dev_t device;
95996+ __u32 mode;
95997+
95998+ struct acl_subject_label *nested;
95999+ struct acl_object_label *globbed;
96000+
96001+ /* next two structures not used */
96002+
96003+ struct acl_object_label *prev;
96004+ struct acl_object_label *next;
96005+};
96006+
96007+struct acl_ip_label {
96008+ char *iface;
96009+ __u32 addr;
96010+ __u32 netmask;
96011+ __u16 low, high;
96012+ __u8 mode;
96013+ __u32 type;
96014+ __u32 proto[8];
96015+
96016+ /* next two structures not used */
96017+
96018+ struct acl_ip_label *prev;
96019+ struct acl_ip_label *next;
96020+};
96021+
96022+struct gr_arg {
96023+ struct user_acl_role_db role_db;
96024+ unsigned char pw[GR_PW_LEN];
96025+ unsigned char salt[GR_SALT_LEN];
96026+ unsigned char sum[GR_SHA_LEN];
96027+ unsigned char sp_role[GR_SPROLE_LEN];
96028+ struct sprole_pw *sprole_pws;
96029+ dev_t segv_device;
96030+ u64 segv_inode;
96031+ uid_t segv_uid;
96032+ __u16 num_sprole_pws;
96033+ __u16 mode;
96034+};
96035+
96036+struct gr_arg_wrapper {
96037+ struct gr_arg *arg;
96038+ __u32 version;
96039+ __u32 size;
96040+};
96041+
96042+struct subject_map {
96043+ struct acl_subject_label *user;
96044+ struct acl_subject_label *kernel;
96045+ struct subject_map *prev;
96046+ struct subject_map *next;
96047+};
96048+
96049+struct acl_subj_map_db {
96050+ struct subject_map **s_hash;
96051+ __u32 s_size;
96052+};
96053+
96054+struct gr_policy_state {
96055+ struct sprole_pw **acl_special_roles;
96056+ __u16 num_sprole_pws;
96057+ struct acl_role_label *kernel_role;
96058+ struct acl_role_label *role_list;
96059+ struct acl_role_label *default_role;
96060+ struct acl_role_db acl_role_set;
96061+ struct acl_subj_map_db subj_map_set;
96062+ struct name_db name_set;
96063+ struct inodev_db inodev_set;
96064+};
96065+
96066+struct gr_alloc_state {
96067+ unsigned long alloc_stack_next;
96068+ unsigned long alloc_stack_size;
96069+ void **alloc_stack;
96070+};
96071+
96072+struct gr_reload_state {
96073+ struct gr_policy_state oldpolicy;
96074+ struct gr_alloc_state oldalloc;
96075+ struct gr_policy_state newpolicy;
96076+ struct gr_alloc_state newalloc;
96077+ struct gr_policy_state *oldpolicy_ptr;
96078+ struct gr_alloc_state *oldalloc_ptr;
96079+ unsigned char oldmode;
96080+};
96081+
96082+/* End Data Structures Section */
96083+
96084+/* Hash functions generated by empirical testing by Brad Spengler
96085+ Makes good use of the low bits of the inode. Generally 0-1 times
96086+ in loop for successful match. 0-3 for unsuccessful match.
96087+ Shift/add algorithm with modulus of table size and an XOR*/
96088+
96089+static __inline__ unsigned int
96090+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
96091+{
96092+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
96093+}
96094+
96095+ static __inline__ unsigned int
96096+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
96097+{
96098+ return ((const unsigned long)userp % sz);
96099+}
96100+
96101+static __inline__ unsigned int
96102+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
96103+{
96104+ unsigned int rem;
96105+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
96106+ return rem;
96107+}
96108+
96109+static __inline__ unsigned int
96110+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
96111+{
96112+ return full_name_hash((const unsigned char *)name, len) % sz;
96113+}
96114+
96115+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
96116+ subj = NULL; \
96117+ iter = 0; \
96118+ while (iter < role->subj_hash_size) { \
96119+ if (subj == NULL) \
96120+ subj = role->subj_hash[iter]; \
96121+ if (subj == NULL) { \
96122+ iter++; \
96123+ continue; \
96124+ }
96125+
96126+#define FOR_EACH_SUBJECT_END(subj,iter) \
96127+ subj = subj->next; \
96128+ if (subj == NULL) \
96129+ iter++; \
96130+ }
96131+
96132+
96133+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
96134+ subj = role->hash->first; \
96135+ while (subj != NULL) {
96136+
96137+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
96138+ subj = subj->next; \
96139+ }
96140+
96141+#endif
96142+
96143diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
96144new file mode 100644
96145index 0000000..af64092
96146--- /dev/null
96147+++ b/include/linux/gracl_compat.h
96148@@ -0,0 +1,156 @@
96149+#ifndef GR_ACL_COMPAT_H
96150+#define GR_ACL_COMPAT_H
96151+
96152+#include <linux/resource.h>
96153+#include <asm/resource.h>
96154+
96155+struct sprole_pw_compat {
96156+ compat_uptr_t rolename;
96157+ unsigned char salt[GR_SALT_LEN];
96158+ unsigned char sum[GR_SHA_LEN];
96159+};
96160+
96161+struct gr_hash_struct_compat {
96162+ compat_uptr_t table;
96163+ compat_uptr_t nametable;
96164+ compat_uptr_t first;
96165+ __u32 table_size;
96166+ __u32 used_size;
96167+ int type;
96168+};
96169+
96170+struct acl_subject_label_compat {
96171+ compat_uptr_t filename;
96172+ compat_u64 inode;
96173+ __u32 device;
96174+ __u32 mode;
96175+ kernel_cap_t cap_mask;
96176+ kernel_cap_t cap_lower;
96177+ kernel_cap_t cap_invert_audit;
96178+
96179+ struct compat_rlimit res[GR_NLIMITS];
96180+ __u32 resmask;
96181+
96182+ __u8 user_trans_type;
96183+ __u8 group_trans_type;
96184+ compat_uptr_t user_transitions;
96185+ compat_uptr_t group_transitions;
96186+ __u16 user_trans_num;
96187+ __u16 group_trans_num;
96188+
96189+ __u32 sock_families[2];
96190+ __u32 ip_proto[8];
96191+ __u32 ip_type;
96192+ compat_uptr_t ips;
96193+ __u32 ip_num;
96194+ __u32 inaddr_any_override;
96195+
96196+ __u32 crashes;
96197+ compat_ulong_t expires;
96198+
96199+ compat_uptr_t parent_subject;
96200+ compat_uptr_t hash;
96201+ compat_uptr_t prev;
96202+ compat_uptr_t next;
96203+
96204+ compat_uptr_t obj_hash;
96205+ __u32 obj_hash_size;
96206+ __u16 pax_flags;
96207+};
96208+
96209+struct role_allowed_ip_compat {
96210+ __u32 addr;
96211+ __u32 netmask;
96212+
96213+ compat_uptr_t prev;
96214+ compat_uptr_t next;
96215+};
96216+
96217+struct role_transition_compat {
96218+ compat_uptr_t rolename;
96219+
96220+ compat_uptr_t prev;
96221+ compat_uptr_t next;
96222+};
96223+
96224+struct acl_role_label_compat {
96225+ compat_uptr_t rolename;
96226+ uid_t uidgid;
96227+ __u16 roletype;
96228+
96229+ __u16 auth_attempts;
96230+ compat_ulong_t expires;
96231+
96232+ compat_uptr_t root_label;
96233+ compat_uptr_t hash;
96234+
96235+ compat_uptr_t prev;
96236+ compat_uptr_t next;
96237+
96238+ compat_uptr_t transitions;
96239+ compat_uptr_t allowed_ips;
96240+ compat_uptr_t domain_children;
96241+ __u16 domain_child_num;
96242+
96243+ umode_t umask;
96244+
96245+ compat_uptr_t subj_hash;
96246+ __u32 subj_hash_size;
96247+};
96248+
96249+struct user_acl_role_db_compat {
96250+ compat_uptr_t r_table;
96251+ __u32 num_pointers;
96252+ __u32 num_roles;
96253+ __u32 num_domain_children;
96254+ __u32 num_subjects;
96255+ __u32 num_objects;
96256+};
96257+
96258+struct acl_object_label_compat {
96259+ compat_uptr_t filename;
96260+ compat_u64 inode;
96261+ __u32 device;
96262+ __u32 mode;
96263+
96264+ compat_uptr_t nested;
96265+ compat_uptr_t globbed;
96266+
96267+ compat_uptr_t prev;
96268+ compat_uptr_t next;
96269+};
96270+
96271+struct acl_ip_label_compat {
96272+ compat_uptr_t iface;
96273+ __u32 addr;
96274+ __u32 netmask;
96275+ __u16 low, high;
96276+ __u8 mode;
96277+ __u32 type;
96278+ __u32 proto[8];
96279+
96280+ compat_uptr_t prev;
96281+ compat_uptr_t next;
96282+};
96283+
96284+struct gr_arg_compat {
96285+ struct user_acl_role_db_compat role_db;
96286+ unsigned char pw[GR_PW_LEN];
96287+ unsigned char salt[GR_SALT_LEN];
96288+ unsigned char sum[GR_SHA_LEN];
96289+ unsigned char sp_role[GR_SPROLE_LEN];
96290+ compat_uptr_t sprole_pws;
96291+ __u32 segv_device;
96292+ compat_u64 segv_inode;
96293+ uid_t segv_uid;
96294+ __u16 num_sprole_pws;
96295+ __u16 mode;
96296+};
96297+
96298+struct gr_arg_wrapper_compat {
96299+ compat_uptr_t arg;
96300+ __u32 version;
96301+ __u32 size;
96302+};
96303+
96304+#endif
96305diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
96306new file mode 100644
96307index 0000000..323ecf2
96308--- /dev/null
96309+++ b/include/linux/gralloc.h
96310@@ -0,0 +1,9 @@
96311+#ifndef __GRALLOC_H
96312+#define __GRALLOC_H
96313+
96314+void acl_free_all(void);
96315+int acl_alloc_stack_init(unsigned long size);
96316+void *acl_alloc(unsigned long len);
96317+void *acl_alloc_num(unsigned long num, unsigned long len);
96318+
96319+#endif
96320diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
96321new file mode 100644
96322index 0000000..be66033
96323--- /dev/null
96324+++ b/include/linux/grdefs.h
96325@@ -0,0 +1,140 @@
96326+#ifndef GRDEFS_H
96327+#define GRDEFS_H
96328+
96329+/* Begin grsecurity status declarations */
96330+
96331+enum {
96332+ GR_READY = 0x01,
96333+ GR_STATUS_INIT = 0x00 // disabled state
96334+};
96335+
96336+/* Begin ACL declarations */
96337+
96338+/* Role flags */
96339+
96340+enum {
96341+ GR_ROLE_USER = 0x0001,
96342+ GR_ROLE_GROUP = 0x0002,
96343+ GR_ROLE_DEFAULT = 0x0004,
96344+ GR_ROLE_SPECIAL = 0x0008,
96345+ GR_ROLE_AUTH = 0x0010,
96346+ GR_ROLE_NOPW = 0x0020,
96347+ GR_ROLE_GOD = 0x0040,
96348+ GR_ROLE_LEARN = 0x0080,
96349+ GR_ROLE_TPE = 0x0100,
96350+ GR_ROLE_DOMAIN = 0x0200,
96351+ GR_ROLE_PAM = 0x0400,
96352+ GR_ROLE_PERSIST = 0x0800
96353+};
96354+
96355+/* ACL Subject and Object mode flags */
96356+enum {
96357+ GR_DELETED = 0x80000000
96358+};
96359+
96360+/* ACL Object-only mode flags */
96361+enum {
96362+ GR_READ = 0x00000001,
96363+ GR_APPEND = 0x00000002,
96364+ GR_WRITE = 0x00000004,
96365+ GR_EXEC = 0x00000008,
96366+ GR_FIND = 0x00000010,
96367+ GR_INHERIT = 0x00000020,
96368+ GR_SETID = 0x00000040,
96369+ GR_CREATE = 0x00000080,
96370+ GR_DELETE = 0x00000100,
96371+ GR_LINK = 0x00000200,
96372+ GR_AUDIT_READ = 0x00000400,
96373+ GR_AUDIT_APPEND = 0x00000800,
96374+ GR_AUDIT_WRITE = 0x00001000,
96375+ GR_AUDIT_EXEC = 0x00002000,
96376+ GR_AUDIT_FIND = 0x00004000,
96377+ GR_AUDIT_INHERIT= 0x00008000,
96378+ GR_AUDIT_SETID = 0x00010000,
96379+ GR_AUDIT_CREATE = 0x00020000,
96380+ GR_AUDIT_DELETE = 0x00040000,
96381+ GR_AUDIT_LINK = 0x00080000,
96382+ GR_PTRACERD = 0x00100000,
96383+ GR_NOPTRACE = 0x00200000,
96384+ GR_SUPPRESS = 0x00400000,
96385+ GR_NOLEARN = 0x00800000,
96386+ GR_INIT_TRANSFER= 0x01000000
96387+};
96388+
96389+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
96390+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
96391+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
96392+
96393+/* ACL subject-only mode flags */
96394+enum {
96395+ GR_KILL = 0x00000001,
96396+ GR_VIEW = 0x00000002,
96397+ GR_PROTECTED = 0x00000004,
96398+ GR_LEARN = 0x00000008,
96399+ GR_OVERRIDE = 0x00000010,
96400+ /* just a placeholder, this mode is only used in userspace */
96401+ GR_DUMMY = 0x00000020,
96402+ GR_PROTSHM = 0x00000040,
96403+ GR_KILLPROC = 0x00000080,
96404+ GR_KILLIPPROC = 0x00000100,
96405+ /* just a placeholder, this mode is only used in userspace */
96406+ GR_NOTROJAN = 0x00000200,
96407+ GR_PROTPROCFD = 0x00000400,
96408+ GR_PROCACCT = 0x00000800,
96409+ GR_RELAXPTRACE = 0x00001000,
96410+ //GR_NESTED = 0x00002000,
96411+ GR_INHERITLEARN = 0x00004000,
96412+ GR_PROCFIND = 0x00008000,
96413+ GR_POVERRIDE = 0x00010000,
96414+ GR_KERNELAUTH = 0x00020000,
96415+ GR_ATSECURE = 0x00040000,
96416+ GR_SHMEXEC = 0x00080000
96417+};
96418+
96419+enum {
96420+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
96421+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
96422+ GR_PAX_ENABLE_MPROTECT = 0x0004,
96423+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
96424+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
96425+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
96426+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
96427+ GR_PAX_DISABLE_MPROTECT = 0x0400,
96428+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
96429+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
96430+};
96431+
96432+enum {
96433+ GR_ID_USER = 0x01,
96434+ GR_ID_GROUP = 0x02,
96435+};
96436+
96437+enum {
96438+ GR_ID_ALLOW = 0x01,
96439+ GR_ID_DENY = 0x02,
96440+};
96441+
96442+#define GR_CRASH_RES 31
96443+#define GR_UIDTABLE_MAX 500
96444+
96445+/* begin resource learning section */
96446+enum {
96447+ GR_RLIM_CPU_BUMP = 60,
96448+ GR_RLIM_FSIZE_BUMP = 50000,
96449+ GR_RLIM_DATA_BUMP = 10000,
96450+ GR_RLIM_STACK_BUMP = 1000,
96451+ GR_RLIM_CORE_BUMP = 10000,
96452+ GR_RLIM_RSS_BUMP = 500000,
96453+ GR_RLIM_NPROC_BUMP = 1,
96454+ GR_RLIM_NOFILE_BUMP = 5,
96455+ GR_RLIM_MEMLOCK_BUMP = 50000,
96456+ GR_RLIM_AS_BUMP = 500000,
96457+ GR_RLIM_LOCKS_BUMP = 2,
96458+ GR_RLIM_SIGPENDING_BUMP = 5,
96459+ GR_RLIM_MSGQUEUE_BUMP = 10000,
96460+ GR_RLIM_NICE_BUMP = 1,
96461+ GR_RLIM_RTPRIO_BUMP = 1,
96462+ GR_RLIM_RTTIME_BUMP = 1000000
96463+};
96464+
96465+#endif
96466diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
96467new file mode 100644
96468index 0000000..fb1de5d
96469--- /dev/null
96470+++ b/include/linux/grinternal.h
96471@@ -0,0 +1,230 @@
96472+#ifndef __GRINTERNAL_H
96473+#define __GRINTERNAL_H
96474+
96475+#ifdef CONFIG_GRKERNSEC
96476+
96477+#include <linux/fs.h>
96478+#include <linux/mnt_namespace.h>
96479+#include <linux/nsproxy.h>
96480+#include <linux/gracl.h>
96481+#include <linux/grdefs.h>
96482+#include <linux/grmsg.h>
96483+
96484+void gr_add_learn_entry(const char *fmt, ...)
96485+ __attribute__ ((format (printf, 1, 2)));
96486+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
96487+ const struct vfsmount *mnt);
96488+__u32 gr_check_create(const struct dentry *new_dentry,
96489+ const struct dentry *parent,
96490+ const struct vfsmount *mnt, const __u32 mode);
96491+int gr_check_protected_task(const struct task_struct *task);
96492+__u32 to_gr_audit(const __u32 reqmode);
96493+int gr_set_acls(const int type);
96494+int gr_acl_is_enabled(void);
96495+char gr_roletype_to_char(void);
96496+
96497+void gr_handle_alertkill(struct task_struct *task);
96498+char *gr_to_filename(const struct dentry *dentry,
96499+ const struct vfsmount *mnt);
96500+char *gr_to_filename1(const struct dentry *dentry,
96501+ const struct vfsmount *mnt);
96502+char *gr_to_filename2(const struct dentry *dentry,
96503+ const struct vfsmount *mnt);
96504+char *gr_to_filename3(const struct dentry *dentry,
96505+ const struct vfsmount *mnt);
96506+
96507+extern int grsec_enable_ptrace_readexec;
96508+extern int grsec_enable_harden_ptrace;
96509+extern int grsec_enable_link;
96510+extern int grsec_enable_fifo;
96511+extern int grsec_enable_execve;
96512+extern int grsec_enable_shm;
96513+extern int grsec_enable_execlog;
96514+extern int grsec_enable_signal;
96515+extern int grsec_enable_audit_ptrace;
96516+extern int grsec_enable_forkfail;
96517+extern int grsec_enable_time;
96518+extern int grsec_enable_rofs;
96519+extern int grsec_deny_new_usb;
96520+extern int grsec_enable_chroot_shmat;
96521+extern int grsec_enable_chroot_mount;
96522+extern int grsec_enable_chroot_double;
96523+extern int grsec_enable_chroot_pivot;
96524+extern int grsec_enable_chroot_chdir;
96525+extern int grsec_enable_chroot_chmod;
96526+extern int grsec_enable_chroot_mknod;
96527+extern int grsec_enable_chroot_fchdir;
96528+extern int grsec_enable_chroot_nice;
96529+extern int grsec_enable_chroot_execlog;
96530+extern int grsec_enable_chroot_caps;
96531+extern int grsec_enable_chroot_rename;
96532+extern int grsec_enable_chroot_sysctl;
96533+extern int grsec_enable_chroot_unix;
96534+extern int grsec_enable_symlinkown;
96535+extern kgid_t grsec_symlinkown_gid;
96536+extern int grsec_enable_tpe;
96537+extern kgid_t grsec_tpe_gid;
96538+extern int grsec_enable_tpe_all;
96539+extern int grsec_enable_tpe_invert;
96540+extern int grsec_enable_socket_all;
96541+extern kgid_t grsec_socket_all_gid;
96542+extern int grsec_enable_socket_client;
96543+extern kgid_t grsec_socket_client_gid;
96544+extern int grsec_enable_socket_server;
96545+extern kgid_t grsec_socket_server_gid;
96546+extern kgid_t grsec_audit_gid;
96547+extern int grsec_enable_group;
96548+extern int grsec_enable_log_rwxmaps;
96549+extern int grsec_enable_mount;
96550+extern int grsec_enable_chdir;
96551+extern int grsec_resource_logging;
96552+extern int grsec_enable_blackhole;
96553+extern int grsec_lastack_retries;
96554+extern int grsec_enable_brute;
96555+extern int grsec_enable_harden_ipc;
96556+extern int grsec_lock;
96557+
96558+extern spinlock_t grsec_alert_lock;
96559+extern unsigned long grsec_alert_wtime;
96560+extern unsigned long grsec_alert_fyet;
96561+
96562+extern spinlock_t grsec_audit_lock;
96563+
96564+extern rwlock_t grsec_exec_file_lock;
96565+
96566+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
96567+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
96568+ (tsk)->exec_file->f_path.mnt) : "/")
96569+
96570+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
96571+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
96572+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96573+
96574+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
96575+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
96576+ (tsk)->exec_file->f_path.mnt) : "/")
96577+
96578+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
96579+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
96580+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96581+
96582+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
96583+
96584+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
96585+
96586+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
96587+{
96588+ if (file1 && file2) {
96589+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
96590+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
96591+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
96592+ return true;
96593+ }
96594+
96595+ return false;
96596+}
96597+
96598+#define GR_CHROOT_CAPS {{ \
96599+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
96600+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
96601+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
96602+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
96603+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
96604+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
96605+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
96606+
96607+#define security_learn(normal_msg,args...) \
96608+({ \
96609+ read_lock(&grsec_exec_file_lock); \
96610+ gr_add_learn_entry(normal_msg "\n", ## args); \
96611+ read_unlock(&grsec_exec_file_lock); \
96612+})
96613+
96614+enum {
96615+ GR_DO_AUDIT,
96616+ GR_DONT_AUDIT,
96617+ /* used for non-audit messages that we shouldn't kill the task on */
96618+ GR_DONT_AUDIT_GOOD
96619+};
96620+
96621+enum {
96622+ GR_TTYSNIFF,
96623+ GR_RBAC,
96624+ GR_RBAC_STR,
96625+ GR_STR_RBAC,
96626+ GR_RBAC_MODE2,
96627+ GR_RBAC_MODE3,
96628+ GR_FILENAME,
96629+ GR_SYSCTL_HIDDEN,
96630+ GR_NOARGS,
96631+ GR_ONE_INT,
96632+ GR_ONE_INT_TWO_STR,
96633+ GR_ONE_STR,
96634+ GR_STR_INT,
96635+ GR_TWO_STR_INT,
96636+ GR_TWO_INT,
96637+ GR_TWO_U64,
96638+ GR_THREE_INT,
96639+ GR_FIVE_INT_TWO_STR,
96640+ GR_TWO_STR,
96641+ GR_THREE_STR,
96642+ GR_FOUR_STR,
96643+ GR_STR_FILENAME,
96644+ GR_FILENAME_STR,
96645+ GR_FILENAME_TWO_INT,
96646+ GR_FILENAME_TWO_INT_STR,
96647+ GR_TEXTREL,
96648+ GR_PTRACE,
96649+ GR_RESOURCE,
96650+ GR_CAP,
96651+ GR_SIG,
96652+ GR_SIG2,
96653+ GR_CRASH1,
96654+ GR_CRASH2,
96655+ GR_PSACCT,
96656+ GR_RWXMAP,
96657+ GR_RWXMAPVMA
96658+};
96659+
96660+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
96661+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
96662+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
96663+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
96664+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
96665+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
96666+#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)
96667+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
96668+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
96669+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
96670+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
96671+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
96672+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
96673+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
96674+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
96675+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
96676+#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)
96677+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
96678+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
96679+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
96680+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
96681+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
96682+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
96683+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
96684+#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)
96685+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
96686+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
96687+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
96688+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
96689+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
96690+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
96691+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
96692+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
96693+#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)
96694+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
96695+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
96696+
96697+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
96698+
96699+#endif
96700+
96701+#endif
96702diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
96703new file mode 100644
96704index 0000000..26ef560
96705--- /dev/null
96706+++ b/include/linux/grmsg.h
96707@@ -0,0 +1,118 @@
96708+#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"
96709+#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"
96710+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
96711+#define GR_STOPMOD_MSG "denied modification of module state by "
96712+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
96713+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
96714+#define GR_IOPERM_MSG "denied use of ioperm() by "
96715+#define GR_IOPL_MSG "denied use of iopl() by "
96716+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
96717+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
96718+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
96719+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
96720+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
96721+#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"
96722+#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"
96723+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
96724+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
96725+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
96726+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
96727+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
96728+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
96729+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
96730+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
96731+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
96732+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
96733+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
96734+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
96735+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
96736+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
96737+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
96738+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
96739+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
96740+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
96741+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
96742+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
96743+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
96744+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
96745+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
96746+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
96747+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
96748+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
96749+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
96750+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
96751+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
96752+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
96753+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
96754+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
96755+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
96756+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
96757+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
96758+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
96759+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
96760+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
96761+#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"
96762+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
96763+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
96764+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
96765+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
96766+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
96767+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
96768+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
96769+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
96770+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
96771+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
96772+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
96773+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
96774+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
96775+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
96776+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
96777+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
96778+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
96779+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
96780+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
96781+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
96782+#define GR_FAILFORK_MSG "failed fork with errno %s by "
96783+#define GR_NICE_CHROOT_MSG "denied priority change by "
96784+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
96785+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
96786+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
96787+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
96788+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
96789+#define GR_TIME_MSG "time set by "
96790+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
96791+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
96792+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
96793+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
96794+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
96795+#define GR_BIND_MSG "denied bind() by "
96796+#define GR_CONNECT_MSG "denied connect() by "
96797+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
96798+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
96799+#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"
96800+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
96801+#define GR_CAP_ACL_MSG "use of %s denied for "
96802+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
96803+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
96804+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
96805+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
96806+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
96807+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
96808+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
96809+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
96810+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
96811+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
96812+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
96813+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
96814+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
96815+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
96816+#define GR_VM86_MSG "denied use of vm86 by "
96817+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
96818+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
96819+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
96820+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
96821+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
96822+#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 "
96823+#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 "
96824+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
96825+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
96826diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
96827new file mode 100644
96828index 0000000..085a746
96829--- /dev/null
96830+++ b/include/linux/grsecurity.h
96831@@ -0,0 +1,247 @@
96832+#ifndef GR_SECURITY_H
96833+#define GR_SECURITY_H
96834+#include <linux/fs.h>
96835+#include <linux/fs_struct.h>
96836+#include <linux/binfmts.h>
96837+#include <linux/gracl.h>
96838+
96839+/* notify of brain-dead configs */
96840+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96841+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
96842+#endif
96843+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96844+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
96845+#endif
96846+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
96847+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
96848+#endif
96849+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
96850+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
96851+#endif
96852+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
96853+#error "CONFIG_PAX enabled, but no PaX options are enabled."
96854+#endif
96855+
96856+int gr_handle_new_usb(void);
96857+
96858+void gr_handle_brute_attach(int dumpable);
96859+void gr_handle_brute_check(void);
96860+void gr_handle_kernel_exploit(void);
96861+
96862+char gr_roletype_to_char(void);
96863+
96864+int gr_proc_is_restricted(void);
96865+
96866+int gr_acl_enable_at_secure(void);
96867+
96868+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
96869+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
96870+
96871+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
96872+
96873+void gr_del_task_from_ip_table(struct task_struct *p);
96874+
96875+int gr_pid_is_chrooted(struct task_struct *p);
96876+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
96877+int gr_handle_chroot_nice(void);
96878+int gr_handle_chroot_sysctl(const int op);
96879+int gr_handle_chroot_setpriority(struct task_struct *p,
96880+ const int niceval);
96881+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
96882+int gr_chroot_fhandle(void);
96883+int gr_handle_chroot_chroot(const struct dentry *dentry,
96884+ const struct vfsmount *mnt);
96885+void gr_handle_chroot_chdir(const struct path *path);
96886+int gr_handle_chroot_chmod(const struct dentry *dentry,
96887+ const struct vfsmount *mnt, const int mode);
96888+int gr_handle_chroot_mknod(const struct dentry *dentry,
96889+ const struct vfsmount *mnt, const int mode);
96890+int gr_handle_chroot_mount(const struct dentry *dentry,
96891+ const struct vfsmount *mnt,
96892+ const char *dev_name);
96893+int gr_handle_chroot_pivot(void);
96894+int gr_handle_chroot_unix(const pid_t pid);
96895+
96896+int gr_handle_rawio(const struct inode *inode);
96897+
96898+void gr_handle_ioperm(void);
96899+void gr_handle_iopl(void);
96900+void gr_handle_msr_write(void);
96901+
96902+umode_t gr_acl_umask(void);
96903+
96904+int gr_tpe_allow(const struct file *file);
96905+
96906+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
96907+void gr_clear_chroot_entries(struct task_struct *task);
96908+
96909+void gr_log_forkfail(const int retval);
96910+void gr_log_timechange(void);
96911+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
96912+void gr_log_chdir(const struct dentry *dentry,
96913+ const struct vfsmount *mnt);
96914+void gr_log_chroot_exec(const struct dentry *dentry,
96915+ const struct vfsmount *mnt);
96916+void gr_log_remount(const char *devname, const int retval);
96917+void gr_log_unmount(const char *devname, const int retval);
96918+void gr_log_mount(const char *from, struct path *to, const int retval);
96919+void gr_log_textrel(struct vm_area_struct *vma);
96920+void gr_log_ptgnustack(struct file *file);
96921+void gr_log_rwxmmap(struct file *file);
96922+void gr_log_rwxmprotect(struct vm_area_struct *vma);
96923+
96924+int gr_handle_follow_link(const struct dentry *dentry,
96925+ const struct vfsmount *mnt);
96926+int gr_handle_fifo(const struct dentry *dentry,
96927+ const struct vfsmount *mnt,
96928+ const struct dentry *dir, const int flag,
96929+ const int acc_mode);
96930+int gr_handle_hardlink(const struct dentry *dentry,
96931+ const struct vfsmount *mnt,
96932+ const struct filename *to);
96933+
96934+int gr_is_capable(const int cap);
96935+int gr_is_capable_nolog(const int cap);
96936+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
96937+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
96938+
96939+void gr_copy_label(struct task_struct *tsk);
96940+void gr_handle_crash(struct task_struct *task, const int sig);
96941+int gr_handle_signal(const struct task_struct *p, const int sig);
96942+int gr_check_crash_uid(const kuid_t uid);
96943+int gr_check_protected_task(const struct task_struct *task);
96944+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
96945+int gr_acl_handle_mmap(const struct file *file,
96946+ const unsigned long prot);
96947+int gr_acl_handle_mprotect(const struct file *file,
96948+ const unsigned long prot);
96949+int gr_check_hidden_task(const struct task_struct *tsk);
96950+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
96951+ const struct vfsmount *mnt);
96952+__u32 gr_acl_handle_utime(const struct dentry *dentry,
96953+ const struct vfsmount *mnt);
96954+__u32 gr_acl_handle_access(const struct dentry *dentry,
96955+ const struct vfsmount *mnt, const int fmode);
96956+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
96957+ const struct vfsmount *mnt, umode_t *mode);
96958+__u32 gr_acl_handle_chown(const struct dentry *dentry,
96959+ const struct vfsmount *mnt);
96960+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
96961+ const struct vfsmount *mnt);
96962+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
96963+ const struct vfsmount *mnt);
96964+int gr_handle_ptrace(struct task_struct *task, const long request);
96965+int gr_handle_proc_ptrace(struct task_struct *task);
96966+__u32 gr_acl_handle_execve(const struct dentry *dentry,
96967+ const struct vfsmount *mnt);
96968+int gr_check_crash_exec(const struct file *filp);
96969+int gr_acl_is_enabled(void);
96970+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
96971+ const kgid_t gid);
96972+int gr_set_proc_label(const struct dentry *dentry,
96973+ const struct vfsmount *mnt,
96974+ const int unsafe_flags);
96975+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
96976+ const struct vfsmount *mnt);
96977+__u32 gr_acl_handle_open(const struct dentry *dentry,
96978+ const struct vfsmount *mnt, int acc_mode);
96979+__u32 gr_acl_handle_creat(const struct dentry *dentry,
96980+ const struct dentry *p_dentry,
96981+ const struct vfsmount *p_mnt,
96982+ int open_flags, int acc_mode, const int imode);
96983+void gr_handle_create(const struct dentry *dentry,
96984+ const struct vfsmount *mnt);
96985+void gr_handle_proc_create(const struct dentry *dentry,
96986+ const struct inode *inode);
96987+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
96988+ const struct dentry *parent_dentry,
96989+ const struct vfsmount *parent_mnt,
96990+ const int mode);
96991+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
96992+ const struct dentry *parent_dentry,
96993+ const struct vfsmount *parent_mnt);
96994+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
96995+ const struct vfsmount *mnt);
96996+void gr_handle_delete(const u64 ino, const dev_t dev);
96997+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
96998+ const struct vfsmount *mnt);
96999+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
97000+ const struct dentry *parent_dentry,
97001+ const struct vfsmount *parent_mnt,
97002+ const struct filename *from);
97003+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
97004+ const struct dentry *parent_dentry,
97005+ const struct vfsmount *parent_mnt,
97006+ const struct dentry *old_dentry,
97007+ const struct vfsmount *old_mnt, const struct filename *to);
97008+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
97009+int gr_acl_handle_rename(struct dentry *new_dentry,
97010+ struct dentry *parent_dentry,
97011+ const struct vfsmount *parent_mnt,
97012+ struct dentry *old_dentry,
97013+ struct inode *old_parent_inode,
97014+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
97015+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
97016+ struct dentry *old_dentry,
97017+ struct dentry *new_dentry,
97018+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
97019+__u32 gr_check_link(const struct dentry *new_dentry,
97020+ const struct dentry *parent_dentry,
97021+ const struct vfsmount *parent_mnt,
97022+ const struct dentry *old_dentry,
97023+ const struct vfsmount *old_mnt);
97024+int gr_acl_handle_filldir(const struct file *file, const char *name,
97025+ const unsigned int namelen, const u64 ino);
97026+
97027+__u32 gr_acl_handle_unix(const struct dentry *dentry,
97028+ const struct vfsmount *mnt);
97029+void gr_acl_handle_exit(void);
97030+void gr_acl_handle_psacct(struct task_struct *task, const long code);
97031+int gr_acl_handle_procpidmem(const struct task_struct *task);
97032+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
97033+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
97034+void gr_audit_ptrace(struct task_struct *task);
97035+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
97036+u64 gr_get_ino_from_dentry(struct dentry *dentry);
97037+void gr_put_exec_file(struct task_struct *task);
97038+
97039+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
97040+
97041+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97042+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97043+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
97044+ struct dentry *newdentry, struct vfsmount *newmnt);
97045+
97046+#ifdef CONFIG_GRKERNSEC_RESLOG
97047+extern void gr_log_resource(const struct task_struct *task, const int res,
97048+ const unsigned long wanted, const int gt);
97049+#else
97050+static inline void gr_log_resource(const struct task_struct *task, const int res,
97051+ const unsigned long wanted, const int gt)
97052+{
97053+}
97054+#endif
97055+
97056+#ifdef CONFIG_GRKERNSEC
97057+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
97058+void gr_handle_vm86(void);
97059+void gr_handle_mem_readwrite(u64 from, u64 to);
97060+
97061+void gr_log_badprocpid(const char *entry);
97062+
97063+extern int grsec_enable_dmesg;
97064+extern int grsec_disable_privio;
97065+
97066+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
97067+extern kgid_t grsec_proc_gid;
97068+#endif
97069+
97070+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
97071+extern int grsec_enable_chroot_findtask;
97072+#endif
97073+#ifdef CONFIG_GRKERNSEC_SETXID
97074+extern int grsec_enable_setxid;
97075+#endif
97076+#endif
97077+
97078+#endif
97079diff --git a/include/linux/grsock.h b/include/linux/grsock.h
97080new file mode 100644
97081index 0000000..e7ffaaf
97082--- /dev/null
97083+++ b/include/linux/grsock.h
97084@@ -0,0 +1,19 @@
97085+#ifndef __GRSOCK_H
97086+#define __GRSOCK_H
97087+
97088+extern void gr_attach_curr_ip(const struct sock *sk);
97089+extern int gr_handle_sock_all(const int family, const int type,
97090+ const int protocol);
97091+extern int gr_handle_sock_server(const struct sockaddr *sck);
97092+extern int gr_handle_sock_server_other(const struct sock *sck);
97093+extern int gr_handle_sock_client(const struct sockaddr *sck);
97094+extern int gr_search_connect(struct socket * sock,
97095+ struct sockaddr_in * addr);
97096+extern int gr_search_bind(struct socket * sock,
97097+ struct sockaddr_in * addr);
97098+extern int gr_search_listen(struct socket * sock);
97099+extern int gr_search_accept(struct socket * sock);
97100+extern int gr_search_socket(const int domain, const int type,
97101+ const int protocol);
97102+
97103+#endif
97104diff --git a/include/linux/highmem.h b/include/linux/highmem.h
97105index 9286a46..373f27f 100644
97106--- a/include/linux/highmem.h
97107+++ b/include/linux/highmem.h
97108@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
97109 kunmap_atomic(kaddr);
97110 }
97111
97112+static inline void sanitize_highpage(struct page *page)
97113+{
97114+ void *kaddr;
97115+ unsigned long flags;
97116+
97117+ local_irq_save(flags);
97118+ kaddr = kmap_atomic(page);
97119+ clear_page(kaddr);
97120+ kunmap_atomic(kaddr);
97121+ local_irq_restore(flags);
97122+}
97123+
97124 static inline void zero_user_segments(struct page *page,
97125 unsigned start1, unsigned end1,
97126 unsigned start2, unsigned end2)
97127diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
97128index 1c7b89a..7dda400 100644
97129--- a/include/linux/hwmon-sysfs.h
97130+++ b/include/linux/hwmon-sysfs.h
97131@@ -25,7 +25,8 @@
97132 struct sensor_device_attribute{
97133 struct device_attribute dev_attr;
97134 int index;
97135-};
97136+} __do_const;
97137+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
97138 #define to_sensor_dev_attr(_dev_attr) \
97139 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
97140
97141@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
97142 struct device_attribute dev_attr;
97143 u8 index;
97144 u8 nr;
97145-};
97146+} __do_const;
97147+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
97148 #define to_sensor_dev_attr_2(_dev_attr) \
97149 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
97150
97151diff --git a/include/linux/i2c.h b/include/linux/i2c.h
97152index e83a738..8b323fa 100644
97153--- a/include/linux/i2c.h
97154+++ b/include/linux/i2c.h
97155@@ -409,6 +409,7 @@ struct i2c_algorithm {
97156 int (*unreg_slave)(struct i2c_client *client);
97157 #endif
97158 };
97159+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
97160
97161 /**
97162 * struct i2c_bus_recovery_info - I2C bus recovery information
97163diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
97164index 66a7d76..5e68d20 100644
97165--- a/include/linux/if_pppox.h
97166+++ b/include/linux/if_pppox.h
97167@@ -78,7 +78,7 @@ struct pppox_proto {
97168 int (*ioctl)(struct socket *sock, unsigned int cmd,
97169 unsigned long arg);
97170 struct module *owner;
97171-};
97172+} __do_const;
97173
97174 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
97175 extern void unregister_pppox_proto(int proto_num);
97176diff --git a/include/linux/init.h b/include/linux/init.h
97177index 21b6d76..4a6775c 100644
97178--- a/include/linux/init.h
97179+++ b/include/linux/init.h
97180@@ -37,9 +37,17 @@
97181 * section.
97182 */
97183
97184+#define add_init_latent_entropy __latent_entropy
97185+
97186+#ifdef CONFIG_MEMORY_HOTPLUG
97187+#define add_meminit_latent_entropy
97188+#else
97189+#define add_meminit_latent_entropy __latent_entropy
97190+#endif
97191+
97192 /* These are for everybody (although not all archs will actually
97193 discard it in modules) */
97194-#define __init __section(.init.text) __cold notrace
97195+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
97196 #define __initdata __section(.init.data)
97197 #define __initconst __constsection(.init.rodata)
97198 #define __exitdata __section(.exit.data)
97199@@ -100,7 +108,7 @@
97200 #define __cpuexitconst
97201
97202 /* Used for MEMORY_HOTPLUG */
97203-#define __meminit __section(.meminit.text) __cold notrace
97204+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
97205 #define __meminitdata __section(.meminit.data)
97206 #define __meminitconst __constsection(.meminit.rodata)
97207 #define __memexit __section(.memexit.text) __exitused __cold notrace
97208diff --git a/include/linux/init_task.h b/include/linux/init_task.h
97209index 696d223..6d6b39f 100644
97210--- a/include/linux/init_task.h
97211+++ b/include/linux/init_task.h
97212@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
97213
97214 #define INIT_TASK_COMM "swapper"
97215
97216+#ifdef CONFIG_X86
97217+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
97218+#else
97219+#define INIT_TASK_THREAD_INFO
97220+#endif
97221+
97222 #ifdef CONFIG_RT_MUTEXES
97223 # define INIT_RT_MUTEXES(tsk) \
97224 .pi_waiters = RB_ROOT, \
97225@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
97226 RCU_POINTER_INITIALIZER(cred, &init_cred), \
97227 .comm = INIT_TASK_COMM, \
97228 .thread = INIT_THREAD, \
97229+ INIT_TASK_THREAD_INFO \
97230 .fs = &init_fs, \
97231 .files = &init_files, \
97232 .signal = &init_signals, \
97233diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
97234index 950ae45..df6ac60 100644
97235--- a/include/linux/interrupt.h
97236+++ b/include/linux/interrupt.h
97237@@ -432,8 +432,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
97238
97239 struct softirq_action
97240 {
97241- void (*action)(struct softirq_action *);
97242-};
97243+ void (*action)(void);
97244+} __no_const;
97245
97246 asmlinkage void do_softirq(void);
97247 asmlinkage void __do_softirq(void);
97248@@ -447,7 +447,7 @@ static inline void do_softirq_own_stack(void)
97249 }
97250 #endif
97251
97252-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
97253+extern void open_softirq(int nr, void (*action)(void));
97254 extern void softirq_init(void);
97255 extern void __raise_softirq_irqoff(unsigned int nr);
97256
97257diff --git a/include/linux/iommu.h b/include/linux/iommu.h
97258index 0546b87..46fd5b6 100644
97259--- a/include/linux/iommu.h
97260+++ b/include/linux/iommu.h
97261@@ -174,7 +174,7 @@ struct iommu_ops {
97262
97263 unsigned long pgsize_bitmap;
97264 void *priv;
97265-};
97266+} __do_const;
97267
97268 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
97269 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
97270@@ -234,7 +234,7 @@ extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
97271 void *data);
97272 struct device *iommu_device_create(struct device *parent, void *drvdata,
97273 const struct attribute_group **groups,
97274- const char *fmt, ...);
97275+ const char *fmt, ...) __printf(4, 5);
97276 void iommu_device_destroy(struct device *dev);
97277 int iommu_device_link(struct device *dev, struct device *link);
97278 void iommu_device_unlink(struct device *dev, struct device *link);
97279diff --git a/include/linux/ioport.h b/include/linux/ioport.h
97280index 388e3ae..d7e45a1 100644
97281--- a/include/linux/ioport.h
97282+++ b/include/linux/ioport.h
97283@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
97284 int adjust_resource(struct resource *res, resource_size_t start,
97285 resource_size_t size);
97286 resource_size_t resource_alignment(struct resource *res);
97287-static inline resource_size_t resource_size(const struct resource *res)
97288+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
97289 {
97290 return res->end - res->start + 1;
97291 }
97292diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
97293index 1eee6bc..9cf4912 100644
97294--- a/include/linux/ipc_namespace.h
97295+++ b/include/linux/ipc_namespace.h
97296@@ -60,7 +60,7 @@ struct ipc_namespace {
97297 struct user_namespace *user_ns;
97298
97299 struct ns_common ns;
97300-};
97301+} __randomize_layout;
97302
97303 extern struct ipc_namespace init_ipc_ns;
97304 extern atomic_t nr_ipc_ns;
97305diff --git a/include/linux/irq.h b/include/linux/irq.h
97306index 3532dca..03ffc0b 100644
97307--- a/include/linux/irq.h
97308+++ b/include/linux/irq.h
97309@@ -370,7 +370,8 @@ struct irq_chip {
97310 int (*irq_set_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool state);
97311
97312 unsigned long flags;
97313-};
97314+} __do_const;
97315+typedef struct irq_chip __no_const irq_chip_no_const;
97316
97317 /*
97318 * irq_chip specific flags
97319diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
97320index dd1109f..4f4fdda 100644
97321--- a/include/linux/irqdesc.h
97322+++ b/include/linux/irqdesc.h
97323@@ -61,7 +61,7 @@ struct irq_desc {
97324 unsigned int irq_count; /* For detecting broken IRQs */
97325 unsigned long last_unhandled; /* Aging timer for unhandled count */
97326 unsigned int irqs_unhandled;
97327- atomic_t threads_handled;
97328+ atomic_unchecked_t threads_handled;
97329 int threads_handled_last;
97330 raw_spinlock_t lock;
97331 struct cpumask *percpu_enabled;
97332diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
97333index 676d730..8d3a1ad 100644
97334--- a/include/linux/irqdomain.h
97335+++ b/include/linux/irqdomain.h
97336@@ -40,6 +40,7 @@ struct device_node;
97337 struct irq_domain;
97338 struct of_device_id;
97339 struct irq_chip;
97340+typedef struct irq_chip __no_const irq_chip_no_const;
97341 struct irq_data;
97342
97343 /* Number of irqs reserved for a legacy isa controller */
97344diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
97345index c367cbd..c9b79e6 100644
97346--- a/include/linux/jiffies.h
97347+++ b/include/linux/jiffies.h
97348@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
97349 /*
97350 * Convert various time units to each other:
97351 */
97352-extern unsigned int jiffies_to_msecs(const unsigned long j);
97353-extern unsigned int jiffies_to_usecs(const unsigned long j);
97354+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
97355+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
97356
97357-static inline u64 jiffies_to_nsecs(const unsigned long j)
97358+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
97359 {
97360 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
97361 }
97362
97363-extern unsigned long msecs_to_jiffies(const unsigned int m);
97364-extern unsigned long usecs_to_jiffies(const unsigned int u);
97365+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
97366+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
97367 extern unsigned long timespec_to_jiffies(const struct timespec *value);
97368 extern void jiffies_to_timespec(const unsigned long jiffies,
97369- struct timespec *value);
97370-extern unsigned long timeval_to_jiffies(const struct timeval *value);
97371+ struct timespec *value) __intentional_overflow(-1);
97372+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
97373 extern void jiffies_to_timeval(const unsigned long jiffies,
97374 struct timeval *value);
97375
97376diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
97377index 6883e19..e854fcb 100644
97378--- a/include/linux/kallsyms.h
97379+++ b/include/linux/kallsyms.h
97380@@ -15,7 +15,8 @@
97381
97382 struct module;
97383
97384-#ifdef CONFIG_KALLSYMS
97385+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
97386+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
97387 /* Lookup the address for a symbol. Returns 0 if not found. */
97388 unsigned long kallsyms_lookup_name(const char *name);
97389
97390@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
97391 /* Stupid that this does nothing, but I didn't create this mess. */
97392 #define __print_symbol(fmt, addr)
97393 #endif /*CONFIG_KALLSYMS*/
97394+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
97395+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
97396+extern unsigned long kallsyms_lookup_name(const char *name);
97397+extern void __print_symbol(const char *fmt, unsigned long address);
97398+extern int sprint_backtrace(char *buffer, unsigned long address);
97399+extern int sprint_symbol(char *buffer, unsigned long address);
97400+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
97401+const char *kallsyms_lookup(unsigned long addr,
97402+ unsigned long *symbolsize,
97403+ unsigned long *offset,
97404+ char **modname, char *namebuf);
97405+extern int kallsyms_lookup_size_offset(unsigned long addr,
97406+ unsigned long *symbolsize,
97407+ unsigned long *offset);
97408+#endif
97409
97410 /* This macro allows us to keep printk typechecking */
97411 static __printf(1, 2)
97412diff --git a/include/linux/kernel.h b/include/linux/kernel.h
97413index 3a5b48e..240107b 100644
97414--- a/include/linux/kernel.h
97415+++ b/include/linux/kernel.h
97416@@ -390,7 +390,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
97417 /* Obsolete, do not use. Use kstrto<foo> instead */
97418
97419 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
97420-extern long simple_strtol(const char *,char **,unsigned int);
97421+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
97422 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
97423 extern long long simple_strtoll(const char *,char **,unsigned int);
97424
97425@@ -410,7 +410,8 @@ extern __printf(3, 0)
97426 int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
97427 extern __printf(2, 3)
97428 char *kasprintf(gfp_t gfp, const char *fmt, ...);
97429-extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97430+extern __printf(2, 0)
97431+char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97432
97433 extern __scanf(2, 3)
97434 int sscanf(const char *, const char *, ...);
97435@@ -681,10 +682,10 @@ do { \
97436 __ftrace_vprintk(_THIS_IP_, fmt, vargs); \
97437 } while (0)
97438
97439-extern int
97440+extern __printf(2, 0) int
97441 __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap);
97442
97443-extern int
97444+extern __printf(2, 0) int
97445 __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
97446
97447 extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
97448@@ -704,7 +705,7 @@ int trace_printk(const char *fmt, ...)
97449 {
97450 return 0;
97451 }
97452-static inline int
97453+static __printf(1, 0) inline int
97454 ftrace_vprintk(const char *fmt, va_list ap)
97455 {
97456 return 0;
97457diff --git a/include/linux/key-type.h b/include/linux/key-type.h
97458index ff9f1d3..6712be5 100644
97459--- a/include/linux/key-type.h
97460+++ b/include/linux/key-type.h
97461@@ -152,7 +152,7 @@ struct key_type {
97462 /* internal fields */
97463 struct list_head link; /* link in types list */
97464 struct lock_class_key lock_class; /* key->sem lock class */
97465-};
97466+} __do_const;
97467
97468 extern struct key_type key_type_keyring;
97469
97470diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
97471index e465bb1..19f605fd 100644
97472--- a/include/linux/kgdb.h
97473+++ b/include/linux/kgdb.h
97474@@ -52,7 +52,7 @@ extern int kgdb_connected;
97475 extern int kgdb_io_module_registered;
97476
97477 extern atomic_t kgdb_setting_breakpoint;
97478-extern atomic_t kgdb_cpu_doing_single_step;
97479+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
97480
97481 extern struct task_struct *kgdb_usethread;
97482 extern struct task_struct *kgdb_contthread;
97483@@ -254,7 +254,7 @@ struct kgdb_arch {
97484 void (*correct_hw_break)(void);
97485
97486 void (*enable_nmi)(bool on);
97487-};
97488+} __do_const;
97489
97490 /**
97491 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
97492@@ -279,7 +279,7 @@ struct kgdb_io {
97493 void (*pre_exception) (void);
97494 void (*post_exception) (void);
97495 int is_console;
97496-};
97497+} __do_const;
97498
97499 extern struct kgdb_arch arch_kgdb_ops;
97500
97501diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
97502index d0a1f99..0bd8b7c 100644
97503--- a/include/linux/kmemleak.h
97504+++ b/include/linux/kmemleak.h
97505@@ -27,7 +27,7 @@
97506
97507 extern void kmemleak_init(void) __ref;
97508 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97509- gfp_t gfp) __ref;
97510+ gfp_t gfp) __ref __size_overflow(2);
97511 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size,
97512 gfp_t gfp) __ref;
97513 extern void kmemleak_free(const void *ptr) __ref;
97514@@ -63,7 +63,7 @@ static inline void kmemleak_erase(void **ptr)
97515 static inline void kmemleak_init(void)
97516 {
97517 }
97518-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97519+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
97520 gfp_t gfp)
97521 {
97522 }
97523diff --git a/include/linux/kmod.h b/include/linux/kmod.h
97524index 0555cc6..40116ce 100644
97525--- a/include/linux/kmod.h
97526+++ b/include/linux/kmod.h
97527@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
97528 * usually useless though. */
97529 extern __printf(2, 3)
97530 int __request_module(bool wait, const char *name, ...);
97531+extern __printf(3, 4)
97532+int ___request_module(bool wait, char *param_name, const char *name, ...);
97533 #define request_module(mod...) __request_module(true, mod)
97534 #define request_module_nowait(mod...) __request_module(false, mod)
97535 #define try_then_request_module(x, mod...) \
97536@@ -57,6 +59,9 @@ struct subprocess_info {
97537 struct work_struct work;
97538 struct completion *complete;
97539 char *path;
97540+#ifdef CONFIG_GRKERNSEC
97541+ char *origpath;
97542+#endif
97543 char **argv;
97544 char **envp;
97545 int wait;
97546diff --git a/include/linux/kobject.h b/include/linux/kobject.h
97547index 2d61b90..3d69945 100644
97548--- a/include/linux/kobject.h
97549+++ b/include/linux/kobject.h
97550@@ -80,8 +80,9 @@ struct kobject {
97551
97552 extern __printf(2, 3)
97553 int kobject_set_name(struct kobject *kobj, const char *name, ...);
97554-extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97555- va_list vargs);
97556+extern __printf(2, 0)
97557+int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97558+ va_list vargs);
97559
97560 static inline const char *kobject_name(const struct kobject *kobj)
97561 {
97562@@ -118,7 +119,7 @@ struct kobj_type {
97563 struct attribute **default_attrs;
97564 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
97565 const void *(*namespace)(struct kobject *kobj);
97566-};
97567+} __do_const;
97568
97569 struct kobj_uevent_env {
97570 char *argv[3];
97571@@ -142,6 +143,7 @@ struct kobj_attribute {
97572 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
97573 const char *buf, size_t count);
97574 };
97575+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
97576
97577 extern const struct sysfs_ops kobj_sysfs_ops;
97578
97579@@ -169,7 +171,7 @@ struct kset {
97580 spinlock_t list_lock;
97581 struct kobject kobj;
97582 const struct kset_uevent_ops *uevent_ops;
97583-};
97584+} __randomize_layout;
97585
97586 extern void kset_init(struct kset *kset);
97587 extern int __must_check kset_register(struct kset *kset);
97588diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
97589index df32d25..fb52e27 100644
97590--- a/include/linux/kobject_ns.h
97591+++ b/include/linux/kobject_ns.h
97592@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
97593 const void *(*netlink_ns)(struct sock *sk);
97594 const void *(*initial_ns)(void);
97595 void (*drop_ns)(void *);
97596-};
97597+} __do_const;
97598
97599 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
97600 int kobj_ns_type_registered(enum kobj_ns_type type);
97601diff --git a/include/linux/kref.h b/include/linux/kref.h
97602index 484604d..0f6c5b6 100644
97603--- a/include/linux/kref.h
97604+++ b/include/linux/kref.h
97605@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
97606 static inline int kref_sub(struct kref *kref, unsigned int count,
97607 void (*release)(struct kref *kref))
97608 {
97609- WARN_ON(release == NULL);
97610+ BUG_ON(release == NULL);
97611
97612 if (atomic_sub_and_test((int) count, &kref->refcount)) {
97613 release(kref);
97614diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
97615index ad45054..7c54663 100644
97616--- a/include/linux/kvm_host.h
97617+++ b/include/linux/kvm_host.h
97618@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
97619 {
97620 }
97621 #endif
97622-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97623+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97624 struct module *module);
97625 void kvm_exit(void);
97626
97627@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
97628 struct kvm_guest_debug *dbg);
97629 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
97630
97631-int kvm_arch_init(void *opaque);
97632+int kvm_arch_init(const void *opaque);
97633 void kvm_arch_exit(void);
97634
97635 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
97636diff --git a/include/linux/libata.h b/include/linux/libata.h
97637index e0e3378..38e206f 100644
97638--- a/include/linux/libata.h
97639+++ b/include/linux/libata.h
97640@@ -991,7 +991,7 @@ struct ata_port_operations {
97641 * fields must be pointers.
97642 */
97643 const struct ata_port_operations *inherits;
97644-};
97645+} __do_const;
97646
97647 struct ata_port_info {
97648 unsigned long flags;
97649diff --git a/include/linux/linkage.h b/include/linux/linkage.h
97650index a6a42dd..6c5ebce 100644
97651--- a/include/linux/linkage.h
97652+++ b/include/linux/linkage.h
97653@@ -36,6 +36,7 @@
97654 #endif
97655
97656 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
97657+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
97658 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
97659
97660 /*
97661diff --git a/include/linux/list.h b/include/linux/list.h
97662index feb773c..98f3075 100644
97663--- a/include/linux/list.h
97664+++ b/include/linux/list.h
97665@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
97666 extern void list_del(struct list_head *entry);
97667 #endif
97668
97669+extern void __pax_list_add(struct list_head *new,
97670+ struct list_head *prev,
97671+ struct list_head *next);
97672+static inline void pax_list_add(struct list_head *new, struct list_head *head)
97673+{
97674+ __pax_list_add(new, head, head->next);
97675+}
97676+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
97677+{
97678+ __pax_list_add(new, head->prev, head);
97679+}
97680+extern void pax_list_del(struct list_head *entry);
97681+
97682 /**
97683 * list_replace - replace old entry by new one
97684 * @old : the element to be replaced
97685@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
97686 INIT_LIST_HEAD(entry);
97687 }
97688
97689+extern void pax_list_del_init(struct list_head *entry);
97690+
97691 /**
97692 * list_move - delete from one list and add as another's head
97693 * @list: the entry to move
97694diff --git a/include/linux/lockref.h b/include/linux/lockref.h
97695index b10b122..d37b3de 100644
97696--- a/include/linux/lockref.h
97697+++ b/include/linux/lockref.h
97698@@ -28,7 +28,7 @@ struct lockref {
97699 #endif
97700 struct {
97701 spinlock_t lock;
97702- int count;
97703+ atomic_t count;
97704 };
97705 };
97706 };
97707@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
97708 extern int lockref_get_not_dead(struct lockref *);
97709
97710 /* Must be called under spinlock for reliable results */
97711-static inline int __lockref_is_dead(const struct lockref *l)
97712+static inline int __lockref_is_dead(const struct lockref *lockref)
97713 {
97714- return ((int)l->count < 0);
97715+ return atomic_read(&lockref->count) < 0;
97716+}
97717+
97718+static inline int __lockref_read(const struct lockref *lockref)
97719+{
97720+ return atomic_read(&lockref->count);
97721+}
97722+
97723+static inline void __lockref_set(struct lockref *lockref, int count)
97724+{
97725+ atomic_set(&lockref->count, count);
97726+}
97727+
97728+static inline void __lockref_inc(struct lockref *lockref)
97729+{
97730+ atomic_inc(&lockref->count);
97731+}
97732+
97733+static inline void __lockref_dec(struct lockref *lockref)
97734+{
97735+ atomic_dec(&lockref->count);
97736 }
97737
97738 #endif /* __LINUX_LOCKREF_H */
97739diff --git a/include/linux/math64.h b/include/linux/math64.h
97740index c45c089..298841c 100644
97741--- a/include/linux/math64.h
97742+++ b/include/linux/math64.h
97743@@ -15,7 +15,7 @@
97744 * This is commonly provided by 32bit archs to provide an optimized 64bit
97745 * divide.
97746 */
97747-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97748+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97749 {
97750 *remainder = dividend % divisor;
97751 return dividend / divisor;
97752@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
97753 /**
97754 * div64_u64 - unsigned 64bit divide with 64bit divisor
97755 */
97756-static inline u64 div64_u64(u64 dividend, u64 divisor)
97757+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
97758 {
97759 return dividend / divisor;
97760 }
97761@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
97762 #define div64_ul(x, y) div_u64((x), (y))
97763
97764 #ifndef div_u64_rem
97765-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97766+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97767 {
97768 *remainder = do_div(dividend, divisor);
97769 return dividend;
97770@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
97771 #endif
97772
97773 #ifndef div64_u64
97774-extern u64 div64_u64(u64 dividend, u64 divisor);
97775+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
97776 #endif
97777
97778 #ifndef div64_s64
97779@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
97780 * divide.
97781 */
97782 #ifndef div_u64
97783-static inline u64 div_u64(u64 dividend, u32 divisor)
97784+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
97785 {
97786 u32 remainder;
97787 return div_u64_rem(dividend, divisor, &remainder);
97788diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
97789index 3d385c8..deacb6a 100644
97790--- a/include/linux/mempolicy.h
97791+++ b/include/linux/mempolicy.h
97792@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
97793 }
97794
97795 #define vma_policy(vma) ((vma)->vm_policy)
97796+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
97797+{
97798+ vma->vm_policy = pol;
97799+}
97800
97801 static inline void mpol_get(struct mempolicy *pol)
97802 {
97803@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
97804 }
97805
97806 #define vma_policy(vma) NULL
97807+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
97808+{
97809+}
97810
97811 static inline int
97812 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
97813diff --git a/include/linux/mm.h b/include/linux/mm.h
97814index 0755b9f..bf8eab1 100644
97815--- a/include/linux/mm.h
97816+++ b/include/linux/mm.h
97817@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
97818
97819 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
97820 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
97821+
97822+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97823+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
97824+#endif
97825+
97826 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
97827 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
97828 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
97829@@ -257,8 +262,8 @@ struct vm_operations_struct {
97830 /* called by access_process_vm when get_user_pages() fails, typically
97831 * for use by special VMAs that can switch between memory and hardware
97832 */
97833- int (*access)(struct vm_area_struct *vma, unsigned long addr,
97834- void *buf, int len, int write);
97835+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
97836+ void *buf, size_t len, int write);
97837
97838 /* Called by the /proc/PID/maps code to ask the vma whether it
97839 * has a special name. Returning non-NULL will also cause this
97840@@ -296,6 +301,7 @@ struct vm_operations_struct {
97841 struct page *(*find_special_page)(struct vm_area_struct *vma,
97842 unsigned long addr);
97843 };
97844+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
97845
97846 struct mmu_gather;
97847 struct inode;
97848@@ -1002,6 +1008,34 @@ static inline int page_mapped(struct page *page)
97849 }
97850
97851 /*
97852+ * Return true only if the page has been allocated with
97853+ * ALLOC_NO_WATERMARKS and the low watermark was not
97854+ * met implying that the system is under some pressure.
97855+ */
97856+static inline bool page_is_pfmemalloc(struct page *page)
97857+{
97858+ /*
97859+ * Page index cannot be this large so this must be
97860+ * a pfmemalloc page.
97861+ */
97862+ return page->index == -1UL;
97863+}
97864+
97865+/*
97866+ * Only to be called by the page allocator on a freshly allocated
97867+ * page.
97868+ */
97869+static inline void set_page_pfmemalloc(struct page *page)
97870+{
97871+ page->index = -1UL;
97872+}
97873+
97874+static inline void clear_page_pfmemalloc(struct page *page)
97875+{
97876+ page->index = 0;
97877+}
97878+
97879+/*
97880 * Different kinds of faults, as returned by handle_mm_fault().
97881 * Used to decide whether a process gets delivered SIGBUS or
97882 * just gets major/minor fault counters bumped up.
97883@@ -1131,8 +1165,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
97884 unsigned long *pfn);
97885 int follow_phys(struct vm_area_struct *vma, unsigned long address,
97886 unsigned int flags, unsigned long *prot, resource_size_t *phys);
97887-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97888- void *buf, int len, int write);
97889+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97890+ void *buf, size_t len, int write);
97891
97892 static inline void unmap_shared_mapping_range(struct address_space *mapping,
97893 loff_t const holebegin, loff_t const holelen)
97894@@ -1172,9 +1206,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
97895 }
97896 #endif
97897
97898-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
97899-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97900- void *buf, int len, int write);
97901+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
97902+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97903+ void *buf, size_t len, int write);
97904
97905 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
97906 unsigned long start, unsigned long nr_pages,
97907@@ -1219,34 +1253,6 @@ int clear_page_dirty_for_io(struct page *page);
97908
97909 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
97910
97911-/* Is the vma a continuation of the stack vma above it? */
97912-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
97913-{
97914- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
97915-}
97916-
97917-static inline int stack_guard_page_start(struct vm_area_struct *vma,
97918- unsigned long addr)
97919-{
97920- return (vma->vm_flags & VM_GROWSDOWN) &&
97921- (vma->vm_start == addr) &&
97922- !vma_growsdown(vma->vm_prev, addr);
97923-}
97924-
97925-/* Is the vma a continuation of the stack vma below it? */
97926-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
97927-{
97928- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
97929-}
97930-
97931-static inline int stack_guard_page_end(struct vm_area_struct *vma,
97932- unsigned long addr)
97933-{
97934- return (vma->vm_flags & VM_GROWSUP) &&
97935- (vma->vm_end == addr) &&
97936- !vma_growsup(vma->vm_next, addr);
97937-}
97938-
97939 extern struct task_struct *task_of_stack(struct task_struct *task,
97940 struct vm_area_struct *vma, bool in_group);
97941
97942@@ -1369,8 +1375,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
97943 {
97944 return 0;
97945 }
97946+
97947+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
97948+ unsigned long address)
97949+{
97950+ return 0;
97951+}
97952 #else
97953 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
97954+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
97955 #endif
97956
97957 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
97958@@ -1380,6 +1393,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
97959 return 0;
97960 }
97961
97962+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
97963+ unsigned long address)
97964+{
97965+ return 0;
97966+}
97967+
97968 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
97969
97970 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
97971@@ -1392,6 +1411,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
97972
97973 #else
97974 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
97975+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
97976
97977 static inline void mm_nr_pmds_init(struct mm_struct *mm)
97978 {
97979@@ -1429,11 +1449,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
97980 NULL: pud_offset(pgd, address);
97981 }
97982
97983+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97984+{
97985+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
97986+ NULL: pud_offset(pgd, address);
97987+}
97988+
97989 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
97990 {
97991 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
97992 NULL: pmd_offset(pud, address);
97993 }
97994+
97995+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
97996+{
97997+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
97998+ NULL: pmd_offset(pud, address);
97999+}
98000 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
98001
98002 #if USE_SPLIT_PTE_PTLOCKS
98003@@ -1810,12 +1842,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
98004 bool *need_rmap_locks);
98005 extern void exit_mmap(struct mm_struct *);
98006
98007+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
98008+extern void gr_learn_resource(const struct task_struct *task, const int res,
98009+ const unsigned long wanted, const int gt);
98010+#else
98011+static inline void gr_learn_resource(const struct task_struct *task, const int res,
98012+ const unsigned long wanted, const int gt)
98013+{
98014+}
98015+#endif
98016+
98017 static inline int check_data_rlimit(unsigned long rlim,
98018 unsigned long new,
98019 unsigned long start,
98020 unsigned long end_data,
98021 unsigned long start_data)
98022 {
98023+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
98024 if (rlim < RLIM_INFINITY) {
98025 if (((new - start) + (end_data - start_data)) > rlim)
98026 return -ENOSPC;
98027@@ -1840,7 +1883,7 @@ extern int install_special_mapping(struct mm_struct *mm,
98028 unsigned long addr, unsigned long len,
98029 unsigned long flags, struct page **pages);
98030
98031-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
98032+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
98033
98034 extern unsigned long mmap_region(struct file *file, unsigned long addr,
98035 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
98036@@ -1848,6 +1891,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98037 unsigned long len, unsigned long prot, unsigned long flags,
98038 unsigned long pgoff, unsigned long *populate);
98039 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
98040+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
98041
98042 #ifdef CONFIG_MMU
98043 extern int __mm_populate(unsigned long addr, unsigned long len,
98044@@ -1876,10 +1920,11 @@ struct vm_unmapped_area_info {
98045 unsigned long high_limit;
98046 unsigned long align_mask;
98047 unsigned long align_offset;
98048+ unsigned long threadstack_offset;
98049 };
98050
98051-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
98052-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98053+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
98054+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
98055
98056 /*
98057 * Search for an unmapped address range.
98058@@ -1891,7 +1936,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98059 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
98060 */
98061 static inline unsigned long
98062-vm_unmapped_area(struct vm_unmapped_area_info *info)
98063+vm_unmapped_area(const struct vm_unmapped_area_info *info)
98064 {
98065 if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
98066 return unmapped_area_topdown(info);
98067@@ -1953,6 +1998,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
98068 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
98069 struct vm_area_struct **pprev);
98070
98071+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
98072+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
98073+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
98074+
98075 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
98076 NULL if none. Assume start_addr < end_addr. */
98077 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
98078@@ -1982,10 +2031,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
98079 }
98080
98081 #ifdef CONFIG_MMU
98082-pgprot_t vm_get_page_prot(unsigned long vm_flags);
98083+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
98084 void vma_set_page_prot(struct vm_area_struct *vma);
98085 #else
98086-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
98087+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
98088 {
98089 return __pgprot(0);
98090 }
98091@@ -2047,6 +2096,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
98092 static inline void vm_stat_account(struct mm_struct *mm,
98093 unsigned long flags, struct file *file, long pages)
98094 {
98095+
98096+#ifdef CONFIG_PAX_RANDMMAP
98097+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
98098+#endif
98099+
98100 mm->total_vm += pages;
98101 }
98102 #endif /* CONFIG_PROC_FS */
98103@@ -2149,7 +2203,7 @@ extern int unpoison_memory(unsigned long pfn);
98104 extern int sysctl_memory_failure_early_kill;
98105 extern int sysctl_memory_failure_recovery;
98106 extern void shake_page(struct page *p, int access);
98107-extern atomic_long_t num_poisoned_pages;
98108+extern atomic_long_unchecked_t num_poisoned_pages;
98109 extern int soft_offline_page(struct page *page, int flags);
98110
98111 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
98112@@ -2200,5 +2254,11 @@ void __init setup_nr_node_ids(void);
98113 static inline void setup_nr_node_ids(void) {}
98114 #endif
98115
98116+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98117+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
98118+#else
98119+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
98120+#endif
98121+
98122 #endif /* __KERNEL__ */
98123 #endif /* _LINUX_MM_H */
98124diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
98125index 8d37e26..29c54c9 100644
98126--- a/include/linux/mm_types.h
98127+++ b/include/linux/mm_types.h
98128@@ -63,15 +63,6 @@ struct page {
98129 union {
98130 pgoff_t index; /* Our offset within mapping. */
98131 void *freelist; /* sl[aou]b first free object */
98132- bool pfmemalloc; /* If set by the page allocator,
98133- * ALLOC_NO_WATERMARKS was set
98134- * and the low watermark was not
98135- * met implying that the system
98136- * is under some pressure. The
98137- * caller should try ensure
98138- * this page is only used to
98139- * free other pages.
98140- */
98141 };
98142
98143 union {
98144@@ -313,7 +304,9 @@ struct vm_area_struct {
98145 #ifdef CONFIG_NUMA
98146 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
98147 #endif
98148-};
98149+
98150+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
98151+} __randomize_layout;
98152
98153 struct core_thread {
98154 struct task_struct *task;
98155@@ -466,7 +459,25 @@ struct mm_struct {
98156 /* address of the bounds directory */
98157 void __user *bd_addr;
98158 #endif
98159-};
98160+
98161+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
98162+ unsigned long pax_flags;
98163+#endif
98164+
98165+#ifdef CONFIG_PAX_DLRESOLVE
98166+ unsigned long call_dl_resolve;
98167+#endif
98168+
98169+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
98170+ unsigned long call_syscall;
98171+#endif
98172+
98173+#ifdef CONFIG_PAX_ASLR
98174+ unsigned long delta_mmap; /* randomized offset */
98175+ unsigned long delta_stack; /* randomized offset */
98176+#endif
98177+
98178+} __randomize_layout;
98179
98180 static inline void mm_init_cpumask(struct mm_struct *mm)
98181 {
98182diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
98183index c5d5278..85cd5ce 100644
98184--- a/include/linux/mmiotrace.h
98185+++ b/include/linux/mmiotrace.h
98186@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
98187 /* Called from ioremap.c */
98188 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
98189 void __iomem *addr);
98190-extern void mmiotrace_iounmap(volatile void __iomem *addr);
98191+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
98192
98193 /* For anyone to insert markers. Remember trailing newline. */
98194 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
98195@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
98196 {
98197 }
98198
98199-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
98200+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
98201 {
98202 }
98203
98204@@ -106,6 +106,6 @@ extern void enable_mmiotrace(void);
98205 extern void disable_mmiotrace(void);
98206 extern void mmio_trace_rw(struct mmiotrace_rw *rw);
98207 extern void mmio_trace_mapping(struct mmiotrace_map *map);
98208-extern int mmio_trace_printk(const char *fmt, va_list args);
98209+extern __printf(1, 0) int mmio_trace_printk(const char *fmt, va_list args);
98210
98211 #endif /* _LINUX_MMIOTRACE_H */
98212diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
98213index 54d74f6..0728424 100644
98214--- a/include/linux/mmzone.h
98215+++ b/include/linux/mmzone.h
98216@@ -526,7 +526,7 @@ struct zone {
98217
98218 ZONE_PADDING(_pad3_)
98219 /* Zone statistics */
98220- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98221+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98222 } ____cacheline_internodealigned_in_smp;
98223
98224 enum zone_flags {
98225diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
98226index 3bfd567..72e7d8f 100644
98227--- a/include/linux/mod_devicetable.h
98228+++ b/include/linux/mod_devicetable.h
98229@@ -139,7 +139,7 @@ struct usb_device_id {
98230 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
98231 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
98232
98233-#define HID_ANY_ID (~0)
98234+#define HID_ANY_ID (~0U)
98235 #define HID_BUS_ANY 0xffff
98236 #define HID_GROUP_ANY 0x0000
98237
98238@@ -470,7 +470,7 @@ struct dmi_system_id {
98239 const char *ident;
98240 struct dmi_strmatch matches[4];
98241 void *driver_data;
98242-};
98243+} __do_const;
98244 /*
98245 * struct dmi_device_id appears during expansion of
98246 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
98247diff --git a/include/linux/module.h b/include/linux/module.h
98248index c883b86..516812e 100644
98249--- a/include/linux/module.h
98250+++ b/include/linux/module.h
98251@@ -17,9 +17,11 @@
98252 #include <linux/moduleparam.h>
98253 #include <linux/jump_label.h>
98254 #include <linux/export.h>
98255+#include <linux/fs.h>
98256
98257 #include <linux/percpu.h>
98258 #include <asm/module.h>
98259+#include <asm/pgtable.h>
98260
98261 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
98262 #define MODULE_SIG_STRING "~Module signature appended~\n"
98263@@ -42,7 +44,7 @@ struct module_kobject {
98264 struct kobject *drivers_dir;
98265 struct module_param_attrs *mp;
98266 struct completion *kobj_completion;
98267-};
98268+} __randomize_layout;
98269
98270 struct module_attribute {
98271 struct attribute attr;
98272@@ -54,12 +56,13 @@ struct module_attribute {
98273 int (*test)(struct module *);
98274 void (*free)(struct module *);
98275 };
98276+typedef struct module_attribute __no_const module_attribute_no_const;
98277
98278 struct module_version_attribute {
98279 struct module_attribute mattr;
98280 const char *module_name;
98281 const char *version;
98282-} __attribute__ ((__aligned__(sizeof(void *))));
98283+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
98284
98285 extern ssize_t __modver_version_show(struct module_attribute *,
98286 struct module_kobject *, char *);
98287@@ -221,7 +224,7 @@ struct module {
98288
98289 /* Sysfs stuff. */
98290 struct module_kobject mkobj;
98291- struct module_attribute *modinfo_attrs;
98292+ module_attribute_no_const *modinfo_attrs;
98293 const char *version;
98294 const char *srcversion;
98295 struct kobject *holders_dir;
98296@@ -270,19 +273,16 @@ struct module {
98297 int (*init)(void);
98298
98299 /* If this is non-NULL, vfree after init() returns */
98300- void *module_init;
98301+ void *module_init_rx, *module_init_rw;
98302
98303 /* Here is the actual code + data, vfree'd on unload. */
98304- void *module_core;
98305+ void *module_core_rx, *module_core_rw;
98306
98307 /* Here are the sizes of the init and core sections */
98308- unsigned int init_size, core_size;
98309+ unsigned int init_size_rw, core_size_rw;
98310
98311 /* The size of the executable code in each section. */
98312- unsigned int init_text_size, core_text_size;
98313-
98314- /* Size of RO sections of the module (text+rodata) */
98315- unsigned int init_ro_size, core_ro_size;
98316+ unsigned int init_size_rx, core_size_rx;
98317
98318 /* Arch-specific module values */
98319 struct mod_arch_specific arch;
98320@@ -340,6 +340,10 @@ struct module {
98321 unsigned int num_trace_events;
98322 struct trace_enum_map **trace_enums;
98323 unsigned int num_trace_enums;
98324+ struct file_operations trace_id;
98325+ struct file_operations trace_enable;
98326+ struct file_operations trace_format;
98327+ struct file_operations trace_filter;
98328 #endif
98329 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
98330 unsigned int num_ftrace_callsites;
98331@@ -367,7 +371,7 @@ struct module {
98332 ctor_fn_t *ctors;
98333 unsigned int num_ctors;
98334 #endif
98335-};
98336+} __randomize_layout;
98337 #ifndef MODULE_ARCH_INIT
98338 #define MODULE_ARCH_INIT {}
98339 #endif
98340@@ -388,18 +392,48 @@ bool is_module_address(unsigned long addr);
98341 bool is_module_percpu_address(unsigned long addr);
98342 bool is_module_text_address(unsigned long addr);
98343
98344+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
98345+{
98346+
98347+#ifdef CONFIG_PAX_KERNEXEC
98348+ if (ktla_ktva(addr) >= (unsigned long)start &&
98349+ ktla_ktva(addr) < (unsigned long)start + size)
98350+ return 1;
98351+#endif
98352+
98353+ return ((void *)addr >= start && (void *)addr < start + size);
98354+}
98355+
98356+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
98357+{
98358+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
98359+}
98360+
98361+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
98362+{
98363+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
98364+}
98365+
98366+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
98367+{
98368+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
98369+}
98370+
98371+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
98372+{
98373+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
98374+}
98375+
98376 static inline bool within_module_core(unsigned long addr,
98377 const struct module *mod)
98378 {
98379- return (unsigned long)mod->module_core <= addr &&
98380- addr < (unsigned long)mod->module_core + mod->core_size;
98381+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
98382 }
98383
98384 static inline bool within_module_init(unsigned long addr,
98385 const struct module *mod)
98386 {
98387- return (unsigned long)mod->module_init <= addr &&
98388- addr < (unsigned long)mod->module_init + mod->init_size;
98389+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
98390 }
98391
98392 static inline bool within_module(unsigned long addr, const struct module *mod)
98393diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
98394index 4d0cb9b..3169ac7 100644
98395--- a/include/linux/moduleloader.h
98396+++ b/include/linux/moduleloader.h
98397@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
98398 sections. Returns NULL on failure. */
98399 void *module_alloc(unsigned long size);
98400
98401+#ifdef CONFIG_PAX_KERNEXEC
98402+void *module_alloc_exec(unsigned long size);
98403+#else
98404+#define module_alloc_exec(x) module_alloc(x)
98405+#endif
98406+
98407 /* Free memory returned from module_alloc. */
98408 void module_memfree(void *module_region);
98409
98410+#ifdef CONFIG_PAX_KERNEXEC
98411+void module_memfree_exec(void *module_region);
98412+#else
98413+#define module_memfree_exec(x) module_memfree((x))
98414+#endif
98415+
98416 /*
98417 * Apply the given relocation to the (simplified) ELF. Return -error
98418 * or 0.
98419@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
98420 unsigned int relsec,
98421 struct module *me)
98422 {
98423+#ifdef CONFIG_MODULES
98424 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98425 module_name(me));
98426+#endif
98427 return -ENOEXEC;
98428 }
98429 #endif
98430@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
98431 unsigned int relsec,
98432 struct module *me)
98433 {
98434+#ifdef CONFIG_MODULES
98435 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98436 module_name(me));
98437+#endif
98438 return -ENOEXEC;
98439 }
98440 #endif
98441diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
98442index 1c9effa..1160bdd 100644
98443--- a/include/linux/moduleparam.h
98444+++ b/include/linux/moduleparam.h
98445@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
98446 * @len is usually just sizeof(string).
98447 */
98448 #define module_param_string(name, string, len, perm) \
98449- static const struct kparam_string __param_string_##name \
98450+ static const struct kparam_string __param_string_##name __used \
98451 = { len, string }; \
98452 __module_param_call(MODULE_PARAM_PREFIX, name, \
98453 &param_ops_string, \
98454@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
98455 */
98456 #define module_param_array_named(name, array, type, nump, perm) \
98457 param_check_##type(name, &(array)[0]); \
98458- static const struct kparam_array __param_arr_##name \
98459+ static const struct kparam_array __param_arr_##name __used \
98460 = { .max = ARRAY_SIZE(array), .num = nump, \
98461 .ops = &param_ops_##type, \
98462 .elemsize = sizeof(array[0]), .elem = array }; \
98463diff --git a/include/linux/mount.h b/include/linux/mount.h
98464index f822c3c..958ca0a 100644
98465--- a/include/linux/mount.h
98466+++ b/include/linux/mount.h
98467@@ -67,7 +67,7 @@ struct vfsmount {
98468 struct dentry *mnt_root; /* root of the mounted tree */
98469 struct super_block *mnt_sb; /* pointer to superblock */
98470 int mnt_flags;
98471-};
98472+} __randomize_layout;
98473
98474 struct file; /* forward dec */
98475 struct path;
98476diff --git a/include/linux/namei.h b/include/linux/namei.h
98477index c899077..b9a2010 100644
98478--- a/include/linux/namei.h
98479+++ b/include/linux/namei.h
98480@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
98481 extern void unlock_rename(struct dentry *, struct dentry *);
98482
98483 extern void nd_jump_link(struct nameidata *nd, struct path *path);
98484-extern void nd_set_link(struct nameidata *nd, char *path);
98485-extern char *nd_get_link(struct nameidata *nd);
98486+extern void nd_set_link(struct nameidata *nd, const char *path);
98487+extern const char *nd_get_link(const struct nameidata *nd);
98488
98489 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
98490 {
98491diff --git a/include/linux/net.h b/include/linux/net.h
98492index 738ea48..409dc09 100644
98493--- a/include/linux/net.h
98494+++ b/include/linux/net.h
98495@@ -190,7 +190,7 @@ struct net_proto_family {
98496 int (*create)(struct net *net, struct socket *sock,
98497 int protocol, int kern);
98498 struct module *owner;
98499-};
98500+} __do_const;
98501
98502 struct iovec;
98503 struct kvec;
98504diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
98505index 05b9a69..4d7e300 100644
98506--- a/include/linux/netdevice.h
98507+++ b/include/linux/netdevice.h
98508@@ -1208,6 +1208,7 @@ struct net_device_ops {
98509 u32 maxrate);
98510 int (*ndo_get_iflink)(const struct net_device *dev);
98511 };
98512+typedef struct net_device_ops __no_const net_device_ops_no_const;
98513
98514 /**
98515 * enum net_device_priv_flags - &struct net_device priv_flags
98516@@ -1515,7 +1516,7 @@ struct net_device {
98517 unsigned long base_addr;
98518 int irq;
98519
98520- atomic_t carrier_changes;
98521+ atomic_unchecked_t carrier_changes;
98522
98523 /*
98524 * Some hardware also needs these fields (state,dev_list,
98525@@ -1554,8 +1555,8 @@ struct net_device {
98526
98527 struct net_device_stats stats;
98528
98529- atomic_long_t rx_dropped;
98530- atomic_long_t tx_dropped;
98531+ atomic_long_unchecked_t rx_dropped;
98532+ atomic_long_unchecked_t tx_dropped;
98533
98534 #ifdef CONFIG_WIRELESS_EXT
98535 const struct iw_handler_def * wireless_handlers;
98536diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
98537index 63560d0..64aba5c 100644
98538--- a/include/linux/netfilter.h
98539+++ b/include/linux/netfilter.h
98540@@ -113,7 +113,7 @@ struct nf_sockopt_ops {
98541 #endif
98542 /* Use the module struct to lock set/get code in place */
98543 struct module *owner;
98544-};
98545+} __do_const;
98546
98547 /* Function to register/unregister hook points. */
98548 int nf_register_hook(struct nf_hook_ops *reg);
98549diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
98550index e955d47..04a5338 100644
98551--- a/include/linux/netfilter/nfnetlink.h
98552+++ b/include/linux/netfilter/nfnetlink.h
98553@@ -19,7 +19,7 @@ struct nfnl_callback {
98554 const struct nlattr * const cda[]);
98555 const struct nla_policy *policy; /* netlink attribute policy */
98556 const u_int16_t attr_count; /* number of nlattr's */
98557-};
98558+} __do_const;
98559
98560 struct nfnetlink_subsystem {
98561 const char *name;
98562diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
98563new file mode 100644
98564index 0000000..33f4af8
98565--- /dev/null
98566+++ b/include/linux/netfilter/xt_gradm.h
98567@@ -0,0 +1,9 @@
98568+#ifndef _LINUX_NETFILTER_XT_GRADM_H
98569+#define _LINUX_NETFILTER_XT_GRADM_H 1
98570+
98571+struct xt_gradm_mtinfo {
98572+ __u16 flags;
98573+ __u16 invflags;
98574+};
98575+
98576+#endif
98577diff --git a/include/linux/nls.h b/include/linux/nls.h
98578index 520681b..2b7fabb 100644
98579--- a/include/linux/nls.h
98580+++ b/include/linux/nls.h
98581@@ -31,7 +31,7 @@ struct nls_table {
98582 const unsigned char *charset2upper;
98583 struct module *owner;
98584 struct nls_table *next;
98585-};
98586+} __do_const;
98587
98588 /* this value hold the maximum octet of charset */
98589 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
98590@@ -46,7 +46,7 @@ enum utf16_endian {
98591 /* nls_base.c */
98592 extern int __register_nls(struct nls_table *, struct module *);
98593 extern int unregister_nls(struct nls_table *);
98594-extern struct nls_table *load_nls(char *);
98595+extern struct nls_table *load_nls(const char *);
98596 extern void unload_nls(struct nls_table *);
98597 extern struct nls_table *load_nls_default(void);
98598 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
98599diff --git a/include/linux/notifier.h b/include/linux/notifier.h
98600index d14a4c3..a078786 100644
98601--- a/include/linux/notifier.h
98602+++ b/include/linux/notifier.h
98603@@ -54,7 +54,8 @@ struct notifier_block {
98604 notifier_fn_t notifier_call;
98605 struct notifier_block __rcu *next;
98606 int priority;
98607-};
98608+} __do_const;
98609+typedef struct notifier_block __no_const notifier_block_no_const;
98610
98611 struct atomic_notifier_head {
98612 spinlock_t lock;
98613diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
98614index b2a0f15..4d7da32 100644
98615--- a/include/linux/oprofile.h
98616+++ b/include/linux/oprofile.h
98617@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
98618 int oprofilefs_create_ro_ulong(struct dentry * root,
98619 char const * name, ulong * val);
98620
98621-/** Create a file for read-only access to an atomic_t. */
98622+/** Create a file for read-only access to an atomic_unchecked_t. */
98623 int oprofilefs_create_ro_atomic(struct dentry * root,
98624- char const * name, atomic_t * val);
98625+ char const * name, atomic_unchecked_t * val);
98626
98627 /** create a directory */
98628 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
98629diff --git a/include/linux/padata.h b/include/linux/padata.h
98630index 4386946..f50c615 100644
98631--- a/include/linux/padata.h
98632+++ b/include/linux/padata.h
98633@@ -129,7 +129,7 @@ struct parallel_data {
98634 struct padata_serial_queue __percpu *squeue;
98635 atomic_t reorder_objects;
98636 atomic_t refcnt;
98637- atomic_t seq_nr;
98638+ atomic_unchecked_t seq_nr;
98639 struct padata_cpumask cpumask;
98640 spinlock_t lock ____cacheline_aligned;
98641 unsigned int processed;
98642diff --git a/include/linux/path.h b/include/linux/path.h
98643index d137218..be0c176 100644
98644--- a/include/linux/path.h
98645+++ b/include/linux/path.h
98646@@ -1,13 +1,15 @@
98647 #ifndef _LINUX_PATH_H
98648 #define _LINUX_PATH_H
98649
98650+#include <linux/compiler.h>
98651+
98652 struct dentry;
98653 struct vfsmount;
98654
98655 struct path {
98656 struct vfsmount *mnt;
98657 struct dentry *dentry;
98658-};
98659+} __randomize_layout;
98660
98661 extern void path_get(const struct path *);
98662 extern void path_put(const struct path *);
98663diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
98664index 8c78950..0d74ed9 100644
98665--- a/include/linux/pci_hotplug.h
98666+++ b/include/linux/pci_hotplug.h
98667@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
98668 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
98669 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
98670 int (*reset_slot) (struct hotplug_slot *slot, int probe);
98671-};
98672+} __do_const;
98673+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
98674
98675 /**
98676 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
98677diff --git a/include/linux/percpu.h b/include/linux/percpu.h
98678index caebf2a..4c3ae9d 100644
98679--- a/include/linux/percpu.h
98680+++ b/include/linux/percpu.h
98681@@ -34,7 +34,7 @@
98682 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
98683 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
98684 */
98685-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
98686+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
98687 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
98688
98689 /*
98690diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
98691index d8a82a8..8b580f0 100644
98692--- a/include/linux/perf_event.h
98693+++ b/include/linux/perf_event.h
98694@@ -379,8 +379,8 @@ struct perf_event {
98695
98696 enum perf_event_active_state state;
98697 unsigned int attach_state;
98698- local64_t count;
98699- atomic64_t child_count;
98700+ local64_t count; /* PaX: fix it one day */
98701+ atomic64_unchecked_t child_count;
98702
98703 /*
98704 * These are the total time in nanoseconds that the event
98705@@ -431,8 +431,8 @@ struct perf_event {
98706 * These accumulate total time (in nanoseconds) that children
98707 * events have been enabled and running, respectively.
98708 */
98709- atomic64_t child_total_time_enabled;
98710- atomic64_t child_total_time_running;
98711+ atomic64_unchecked_t child_total_time_enabled;
98712+ atomic64_unchecked_t child_total_time_running;
98713
98714 /*
98715 * Protect attach/detach and child_list:
98716@@ -812,7 +812,7 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
98717
98718 static inline u64 __perf_event_count(struct perf_event *event)
98719 {
98720- return local64_read(&event->count) + atomic64_read(&event->child_count);
98721+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
98722 }
98723
98724 extern void perf_event_mmap(struct vm_area_struct *vma);
98725@@ -836,7 +836,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
98726 entry->ip[entry->nr++] = ip;
98727 }
98728
98729-extern int sysctl_perf_event_paranoid;
98730+extern int sysctl_perf_event_legitimately_concerned;
98731 extern int sysctl_perf_event_mlock;
98732 extern int sysctl_perf_event_sample_rate;
98733 extern int sysctl_perf_cpu_time_max_percent;
98734@@ -851,19 +851,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
98735 loff_t *ppos);
98736
98737
98738+static inline bool perf_paranoid_any(void)
98739+{
98740+ return sysctl_perf_event_legitimately_concerned > 2;
98741+}
98742+
98743 static inline bool perf_paranoid_tracepoint_raw(void)
98744 {
98745- return sysctl_perf_event_paranoid > -1;
98746+ return sysctl_perf_event_legitimately_concerned > -1;
98747 }
98748
98749 static inline bool perf_paranoid_cpu(void)
98750 {
98751- return sysctl_perf_event_paranoid > 0;
98752+ return sysctl_perf_event_legitimately_concerned > 0;
98753 }
98754
98755 static inline bool perf_paranoid_kernel(void)
98756 {
98757- return sysctl_perf_event_paranoid > 1;
98758+ return sysctl_perf_event_legitimately_concerned > 1;
98759 }
98760
98761 extern void perf_event_init(void);
98762@@ -1017,7 +1022,7 @@ struct perf_pmu_events_attr {
98763 struct device_attribute attr;
98764 u64 id;
98765 const char *event_str;
98766-};
98767+} __do_const;
98768
98769 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
98770 char *page);
98771diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
98772index 918b117..7af374b7 100644
98773--- a/include/linux/pid_namespace.h
98774+++ b/include/linux/pid_namespace.h
98775@@ -45,7 +45,7 @@ struct pid_namespace {
98776 int hide_pid;
98777 int reboot; /* group exit code if this pidns was rebooted */
98778 struct ns_common ns;
98779-};
98780+} __randomize_layout;
98781
98782 extern struct pid_namespace init_pid_ns;
98783
98784diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
98785index eb8b8ac..62649e1 100644
98786--- a/include/linux/pipe_fs_i.h
98787+++ b/include/linux/pipe_fs_i.h
98788@@ -47,10 +47,10 @@ struct pipe_inode_info {
98789 struct mutex mutex;
98790 wait_queue_head_t wait;
98791 unsigned int nrbufs, curbuf, buffers;
98792- unsigned int readers;
98793- unsigned int writers;
98794- unsigned int files;
98795- unsigned int waiting_writers;
98796+ atomic_t readers;
98797+ atomic_t writers;
98798+ atomic_t files;
98799+ atomic_t waiting_writers;
98800 unsigned int r_counter;
98801 unsigned int w_counter;
98802 struct page *tmp_page;
98803diff --git a/include/linux/pm.h b/include/linux/pm.h
98804index 2d29c64..1b25b2a 100644
98805--- a/include/linux/pm.h
98806+++ b/include/linux/pm.h
98807@@ -616,6 +616,7 @@ struct dev_pm_domain {
98808 void (*sync)(struct device *dev);
98809 void (*dismiss)(struct device *dev);
98810 };
98811+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
98812
98813 /*
98814 * The PM_EVENT_ messages are also used by drivers implementing the legacy
98815diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
98816index 681ccb0..a90e0b7 100644
98817--- a/include/linux/pm_domain.h
98818+++ b/include/linux/pm_domain.h
98819@@ -39,11 +39,11 @@ struct gpd_dev_ops {
98820 int (*save_state)(struct device *dev);
98821 int (*restore_state)(struct device *dev);
98822 bool (*active_wakeup)(struct device *dev);
98823-};
98824+} __no_const;
98825
98826 struct gpd_cpuidle_data {
98827 unsigned int saved_exit_latency;
98828- struct cpuidle_state *idle_state;
98829+ cpuidle_state_no_const *idle_state;
98830 };
98831
98832 struct generic_pm_domain {
98833diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
98834index 30e84d4..22278b4 100644
98835--- a/include/linux/pm_runtime.h
98836+++ b/include/linux/pm_runtime.h
98837@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
98838
98839 static inline void pm_runtime_mark_last_busy(struct device *dev)
98840 {
98841- ACCESS_ONCE(dev->power.last_busy) = jiffies;
98842+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
98843 }
98844
98845 static inline bool pm_runtime_is_irq_safe(struct device *dev)
98846diff --git a/include/linux/pnp.h b/include/linux/pnp.h
98847index 5df733b..d55f252 100644
98848--- a/include/linux/pnp.h
98849+++ b/include/linux/pnp.h
98850@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
98851 struct pnp_fixup {
98852 char id[7];
98853 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
98854-};
98855+} __do_const;
98856
98857 /* config parameters */
98858 #define PNP_CONFIG_NORMAL 0x0001
98859diff --git a/include/linux/poison.h b/include/linux/poison.h
98860index 2110a81..13a11bb 100644
98861--- a/include/linux/poison.h
98862+++ b/include/linux/poison.h
98863@@ -19,8 +19,8 @@
98864 * under normal circumstances, used to verify that nobody uses
98865 * non-initialized list entries.
98866 */
98867-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
98868-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
98869+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
98870+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
98871
98872 /********** include/linux/timer.h **********/
98873 /*
98874diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
98875index d8b187c3..9a9257a 100644
98876--- a/include/linux/power/smartreflex.h
98877+++ b/include/linux/power/smartreflex.h
98878@@ -238,7 +238,7 @@ struct omap_sr_class_data {
98879 int (*notify)(struct omap_sr *sr, u32 status);
98880 u8 notify_flags;
98881 u8 class_type;
98882-};
98883+} __do_const;
98884
98885 /**
98886 * struct omap_sr_nvalue_table - Smartreflex n-target value info
98887diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
98888index 4ea1d37..80f4b33 100644
98889--- a/include/linux/ppp-comp.h
98890+++ b/include/linux/ppp-comp.h
98891@@ -84,7 +84,7 @@ struct compressor {
98892 struct module *owner;
98893 /* Extra skb space needed by the compressor algorithm */
98894 unsigned int comp_extra;
98895-};
98896+} __do_const;
98897
98898 /*
98899 * The return value from decompress routine is the length of the
98900diff --git a/include/linux/preempt.h b/include/linux/preempt.h
98901index de83b4e..c4b997d 100644
98902--- a/include/linux/preempt.h
98903+++ b/include/linux/preempt.h
98904@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
98905 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
98906 #endif
98907
98908+#define raw_preempt_count_add(val) __preempt_count_add(val)
98909+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
98910+
98911 #define __preempt_count_inc() __preempt_count_add(1)
98912 #define __preempt_count_dec() __preempt_count_sub(1)
98913
98914 #define preempt_count_inc() preempt_count_add(1)
98915+#define raw_preempt_count_inc() raw_preempt_count_add(1)
98916 #define preempt_count_dec() preempt_count_sub(1)
98917+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
98918
98919 #ifdef CONFIG_PREEMPT_COUNT
98920
98921@@ -41,6 +46,12 @@ do { \
98922 barrier(); \
98923 } while (0)
98924
98925+#define raw_preempt_disable() \
98926+do { \
98927+ raw_preempt_count_inc(); \
98928+ barrier(); \
98929+} while (0)
98930+
98931 #define sched_preempt_enable_no_resched() \
98932 do { \
98933 barrier(); \
98934@@ -49,6 +60,12 @@ do { \
98935
98936 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
98937
98938+#define raw_preempt_enable_no_resched() \
98939+do { \
98940+ barrier(); \
98941+ raw_preempt_count_dec(); \
98942+} while (0)
98943+
98944 #ifdef CONFIG_PREEMPT
98945 #define preempt_enable() \
98946 do { \
98947@@ -113,8 +130,10 @@ do { \
98948 * region.
98949 */
98950 #define preempt_disable() barrier()
98951+#define raw_preempt_disable() barrier()
98952 #define sched_preempt_enable_no_resched() barrier()
98953 #define preempt_enable_no_resched() barrier()
98954+#define raw_preempt_enable_no_resched() barrier()
98955 #define preempt_enable() barrier()
98956 #define preempt_check_resched() do { } while (0)
98957
98958@@ -128,11 +147,13 @@ do { \
98959 /*
98960 * Modules have no business playing preemption tricks.
98961 */
98962+#ifndef CONFIG_PAX_KERNEXEC
98963 #undef sched_preempt_enable_no_resched
98964 #undef preempt_enable_no_resched
98965 #undef preempt_enable_no_resched_notrace
98966 #undef preempt_check_resched
98967 #endif
98968+#endif
98969
98970 #define preempt_set_need_resched() \
98971 do { \
98972diff --git a/include/linux/printk.h b/include/linux/printk.h
98973index 9b30871..1aebc2d 100644
98974--- a/include/linux/printk.h
98975+++ b/include/linux/printk.h
98976@@ -120,7 +120,8 @@ static inline __printf(1, 2) __cold
98977 void early_printk(const char *s, ...) { }
98978 #endif
98979
98980-typedef int(*printk_func_t)(const char *fmt, va_list args);
98981+typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
98982+extern int kptr_restrict;
98983
98984 #ifdef CONFIG_PRINTK
98985 asmlinkage __printf(5, 0)
98986@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
98987
98988 extern int printk_delay_msec;
98989 extern int dmesg_restrict;
98990-extern int kptr_restrict;
98991
98992 extern void wake_up_klogd(void);
98993
98994@@ -164,7 +164,7 @@ char *log_buf_addr_get(void);
98995 u32 log_buf_len_get(void);
98996 void log_buf_kexec_setup(void);
98997 void __init setup_log_buf(int early);
98998-void dump_stack_set_arch_desc(const char *fmt, ...);
98999+__printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
99000 void dump_stack_print_info(const char *log_lvl);
99001 void show_regs_print_info(const char *log_lvl);
99002 #else
99003@@ -215,7 +215,7 @@ static inline void setup_log_buf(int early)
99004 {
99005 }
99006
99007-static inline void dump_stack_set_arch_desc(const char *fmt, ...)
99008+static inline __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...)
99009 {
99010 }
99011
99012diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
99013index b97bf2e..f14c92d4 100644
99014--- a/include/linux/proc_fs.h
99015+++ b/include/linux/proc_fs.h
99016@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
99017 extern struct proc_dir_entry *proc_symlink(const char *,
99018 struct proc_dir_entry *, const char *);
99019 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
99020+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
99021 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
99022 struct proc_dir_entry *, void *);
99023+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
99024+ struct proc_dir_entry *, void *);
99025 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
99026 struct proc_dir_entry *);
99027
99028@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
99029 return proc_create_data(name, mode, parent, proc_fops, NULL);
99030 }
99031
99032+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
99033+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
99034+{
99035+#ifdef CONFIG_GRKERNSEC_PROC_USER
99036+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
99037+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99038+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
99039+#else
99040+ return proc_create_data(name, mode, parent, proc_fops, NULL);
99041+#endif
99042+}
99043+
99044+
99045 extern void proc_set_size(struct proc_dir_entry *, loff_t);
99046 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
99047 extern void *PDE_DATA(const struct inode *);
99048@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
99049 struct proc_dir_entry *parent,const char *dest) { return NULL;}
99050 static inline struct proc_dir_entry *proc_mkdir(const char *name,
99051 struct proc_dir_entry *parent) {return NULL;}
99052+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
99053+ struct proc_dir_entry *parent) { return NULL; }
99054 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
99055 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99056+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
99057+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99058 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
99059 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
99060 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
99061@@ -79,7 +99,7 @@ struct net;
99062 static inline struct proc_dir_entry *proc_net_mkdir(
99063 struct net *net, const char *name, struct proc_dir_entry *parent)
99064 {
99065- return proc_mkdir_data(name, 0, parent, net);
99066+ return proc_mkdir_data_restrict(name, 0, parent, net);
99067 }
99068
99069 #endif /* _LINUX_PROC_FS_H */
99070diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
99071index 42dfc61..8113a99 100644
99072--- a/include/linux/proc_ns.h
99073+++ b/include/linux/proc_ns.h
99074@@ -16,7 +16,7 @@ struct proc_ns_operations {
99075 struct ns_common *(*get)(struct task_struct *task);
99076 void (*put)(struct ns_common *ns);
99077 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
99078-};
99079+} __do_const __randomize_layout;
99080
99081 extern const struct proc_ns_operations netns_operations;
99082 extern const struct proc_ns_operations utsns_operations;
99083diff --git a/include/linux/quota.h b/include/linux/quota.h
99084index b2505ac..5f7ab55 100644
99085--- a/include/linux/quota.h
99086+++ b/include/linux/quota.h
99087@@ -76,7 +76,7 @@ struct kqid { /* Type in which we store the quota identifier */
99088
99089 extern bool qid_eq(struct kqid left, struct kqid right);
99090 extern bool qid_lt(struct kqid left, struct kqid right);
99091-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
99092+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
99093 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
99094 extern bool qid_valid(struct kqid qid);
99095
99096diff --git a/include/linux/random.h b/include/linux/random.h
99097index b05856e..0a9f14e 100644
99098--- a/include/linux/random.h
99099+++ b/include/linux/random.h
99100@@ -9,9 +9,19 @@
99101 #include <uapi/linux/random.h>
99102
99103 extern void add_device_randomness(const void *, unsigned int);
99104+
99105+static inline void add_latent_entropy(void)
99106+{
99107+
99108+#ifdef LATENT_ENTROPY_PLUGIN
99109+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99110+#endif
99111+
99112+}
99113+
99114 extern void add_input_randomness(unsigned int type, unsigned int code,
99115- unsigned int value);
99116-extern void add_interrupt_randomness(int irq, int irq_flags);
99117+ unsigned int value) __latent_entropy;
99118+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
99119
99120 extern void get_random_bytes(void *buf, int nbytes);
99121 extern void get_random_bytes_arch(void *buf, int nbytes);
99122@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
99123 extern const struct file_operations random_fops, urandom_fops;
99124 #endif
99125
99126-unsigned int get_random_int(void);
99127+unsigned int __intentional_overflow(-1) get_random_int(void);
99128 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
99129
99130-u32 prandom_u32(void);
99131+u32 prandom_u32(void) __intentional_overflow(-1);
99132 void prandom_bytes(void *buf, size_t nbytes);
99133 void prandom_seed(u32 seed);
99134 void prandom_reseed_late(void);
99135@@ -37,6 +47,11 @@ struct rnd_state {
99136 u32 prandom_u32_state(struct rnd_state *state);
99137 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99138
99139+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
99140+{
99141+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
99142+}
99143+
99144 /**
99145 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
99146 * @ep_ro: right open interval endpoint
99147@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99148 *
99149 * Returns: pseudo-random number in interval [0, ep_ro)
99150 */
99151-static inline u32 prandom_u32_max(u32 ep_ro)
99152+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
99153 {
99154 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
99155 }
99156diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
99157index 378c5ee..aa84a47 100644
99158--- a/include/linux/rbtree_augmented.h
99159+++ b/include/linux/rbtree_augmented.h
99160@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
99161 old->rbaugmented = rbcompute(old); \
99162 } \
99163 rbstatic const struct rb_augment_callbacks rbname = { \
99164- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
99165+ .propagate = rbname ## _propagate, \
99166+ .copy = rbname ## _copy, \
99167+ .rotate = rbname ## _rotate \
99168 };
99169
99170
99171diff --git a/include/linux/rculist.h b/include/linux/rculist.h
99172index a18b16f..2683096 100644
99173--- a/include/linux/rculist.h
99174+++ b/include/linux/rculist.h
99175@@ -29,8 +29,8 @@
99176 */
99177 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
99178 {
99179- ACCESS_ONCE(list->next) = list;
99180- ACCESS_ONCE(list->prev) = list;
99181+ ACCESS_ONCE_RW(list->next) = list;
99182+ ACCESS_ONCE_RW(list->prev) = list;
99183 }
99184
99185 /*
99186@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
99187 struct list_head *prev, struct list_head *next);
99188 #endif
99189
99190+void __pax_list_add_rcu(struct list_head *new,
99191+ struct list_head *prev, struct list_head *next);
99192+
99193 /**
99194 * list_add_rcu - add a new entry to rcu-protected list
99195 * @new: new entry to be added
99196@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
99197 __list_add_rcu(new, head, head->next);
99198 }
99199
99200+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
99201+{
99202+ __pax_list_add_rcu(new, head, head->next);
99203+}
99204+
99205 /**
99206 * list_add_tail_rcu - add a new entry to rcu-protected list
99207 * @new: new entry to be added
99208@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
99209 __list_add_rcu(new, head->prev, head);
99210 }
99211
99212+static inline void pax_list_add_tail_rcu(struct list_head *new,
99213+ struct list_head *head)
99214+{
99215+ __pax_list_add_rcu(new, head->prev, head);
99216+}
99217+
99218 /**
99219 * list_del_rcu - deletes entry from list without re-initialization
99220 * @entry: the element to delete from the list.
99221@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
99222 entry->prev = LIST_POISON2;
99223 }
99224
99225+extern void pax_list_del_rcu(struct list_head *entry);
99226+
99227 /**
99228 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
99229 * @n: the element to delete from the hash list.
99230diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
99231index 573a5af..de97a14 100644
99232--- a/include/linux/rcupdate.h
99233+++ b/include/linux/rcupdate.h
99234@@ -365,7 +365,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
99235 do { \
99236 rcu_all_qs(); \
99237 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
99238- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
99239+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
99240 } while (0)
99241 #else /* #ifdef CONFIG_TASKS_RCU */
99242 #define TASKS_RCU(x) do { } while (0)
99243diff --git a/include/linux/reboot.h b/include/linux/reboot.h
99244index a7ff409..03e2fa8 100644
99245--- a/include/linux/reboot.h
99246+++ b/include/linux/reboot.h
99247@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
99248 */
99249
99250 extern void migrate_to_reboot_cpu(void);
99251-extern void machine_restart(char *cmd);
99252-extern void machine_halt(void);
99253-extern void machine_power_off(void);
99254+extern void machine_restart(char *cmd) __noreturn;
99255+extern void machine_halt(void) __noreturn;
99256+extern void machine_power_off(void) __noreturn;
99257
99258 extern void machine_shutdown(void);
99259 struct pt_regs;
99260@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
99261 */
99262
99263 extern void kernel_restart_prepare(char *cmd);
99264-extern void kernel_restart(char *cmd);
99265-extern void kernel_halt(void);
99266-extern void kernel_power_off(void);
99267+extern void kernel_restart(char *cmd) __noreturn;
99268+extern void kernel_halt(void) __noreturn;
99269+extern void kernel_power_off(void) __noreturn;
99270
99271 extern int C_A_D; /* for sysctl */
99272 void ctrl_alt_del(void);
99273@@ -77,7 +77,7 @@ extern void orderly_reboot(void);
99274 * Emergency restart, callable from an interrupt handler.
99275 */
99276
99277-extern void emergency_restart(void);
99278+extern void emergency_restart(void) __noreturn;
99279 #include <asm/emergency-restart.h>
99280
99281 #endif /* _LINUX_REBOOT_H */
99282diff --git a/include/linux/regset.h b/include/linux/regset.h
99283index 8e0c9fe..ac4d221 100644
99284--- a/include/linux/regset.h
99285+++ b/include/linux/regset.h
99286@@ -161,7 +161,8 @@ struct user_regset {
99287 unsigned int align;
99288 unsigned int bias;
99289 unsigned int core_note_type;
99290-};
99291+} __do_const;
99292+typedef struct user_regset __no_const user_regset_no_const;
99293
99294 /**
99295 * struct user_regset_view - available regsets
99296diff --git a/include/linux/relay.h b/include/linux/relay.h
99297index d7c8359..818daf5 100644
99298--- a/include/linux/relay.h
99299+++ b/include/linux/relay.h
99300@@ -157,7 +157,7 @@ struct rchan_callbacks
99301 * The callback should return 0 if successful, negative if not.
99302 */
99303 int (*remove_buf_file)(struct dentry *dentry);
99304-};
99305+} __no_const;
99306
99307 /*
99308 * CONFIG_RELAY kernel API, kernel/relay.c
99309diff --git a/include/linux/rio.h b/include/linux/rio.h
99310index 6bda06f..bf39a9b 100644
99311--- a/include/linux/rio.h
99312+++ b/include/linux/rio.h
99313@@ -358,7 +358,7 @@ struct rio_ops {
99314 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
99315 u64 rstart, u32 size, u32 flags);
99316 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
99317-};
99318+} __no_const;
99319
99320 #define RIO_RESOURCE_MEM 0x00000100
99321 #define RIO_RESOURCE_DOORBELL 0x00000200
99322diff --git a/include/linux/rmap.h b/include/linux/rmap.h
99323index c89c53a..aa0a65a 100644
99324--- a/include/linux/rmap.h
99325+++ b/include/linux/rmap.h
99326@@ -146,8 +146,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
99327 void anon_vma_init(void); /* create anon_vma_cachep */
99328 int anon_vma_prepare(struct vm_area_struct *);
99329 void unlink_anon_vmas(struct vm_area_struct *);
99330-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
99331-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
99332+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
99333+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
99334
99335 static inline void anon_vma_merge(struct vm_area_struct *vma,
99336 struct vm_area_struct *next)
99337diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
99338index ed8f9e70..2e627f2 100644
99339--- a/include/linux/scatterlist.h
99340+++ b/include/linux/scatterlist.h
99341@@ -1,6 +1,7 @@
99342 #ifndef _LINUX_SCATTERLIST_H
99343 #define _LINUX_SCATTERLIST_H
99344
99345+#include <linux/sched.h>
99346 #include <linux/string.h>
99347 #include <linux/bug.h>
99348 #include <linux/mm.h>
99349@@ -111,10 +112,17 @@ static inline struct page *sg_page(struct scatterlist *sg)
99350 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
99351 unsigned int buflen)
99352 {
99353+ const void *realbuf = buf;
99354+
99355+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99356+ if (object_starts_on_stack(buf))
99357+ realbuf = buf - current->stack + current->lowmem_stack;
99358+#endif
99359+
99360 #ifdef CONFIG_DEBUG_SG
99361- BUG_ON(!virt_addr_valid(buf));
99362+ BUG_ON(!virt_addr_valid(realbuf));
99363 #endif
99364- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
99365+ sg_set_page(sg, virt_to_page(realbuf), buflen, offset_in_page(realbuf));
99366 }
99367
99368 /*
99369diff --git a/include/linux/sched.h b/include/linux/sched.h
99370index 26a2e61..36bbf4b 100644
99371--- a/include/linux/sched.h
99372+++ b/include/linux/sched.h
99373@@ -132,6 +132,7 @@ struct fs_struct;
99374 struct perf_event_context;
99375 struct blk_plug;
99376 struct filename;
99377+struct linux_binprm;
99378
99379 #define VMACACHE_BITS 2
99380 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
99381@@ -413,7 +414,7 @@ extern char __sched_text_start[], __sched_text_end[];
99382 extern int in_sched_functions(unsigned long addr);
99383
99384 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
99385-extern signed long schedule_timeout(signed long timeout);
99386+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
99387 extern signed long schedule_timeout_interruptible(signed long timeout);
99388 extern signed long schedule_timeout_killable(signed long timeout);
99389 extern signed long schedule_timeout_uninterruptible(signed long timeout);
99390@@ -431,6 +432,19 @@ struct nsproxy;
99391 struct user_namespace;
99392
99393 #ifdef CONFIG_MMU
99394+
99395+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
99396+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
99397+#else
99398+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
99399+{
99400+ return 0;
99401+}
99402+#endif
99403+
99404+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
99405+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
99406+
99407 extern void arch_pick_mmap_layout(struct mm_struct *mm);
99408 extern unsigned long
99409 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
99410@@ -729,6 +743,17 @@ struct signal_struct {
99411 #ifdef CONFIG_TASKSTATS
99412 struct taskstats *stats;
99413 #endif
99414+
99415+#ifdef CONFIG_GRKERNSEC
99416+ u32 curr_ip;
99417+ u32 saved_ip;
99418+ u32 gr_saddr;
99419+ u32 gr_daddr;
99420+ u16 gr_sport;
99421+ u16 gr_dport;
99422+ u8 used_accept:1;
99423+#endif
99424+
99425 #ifdef CONFIG_AUDIT
99426 unsigned audit_tty;
99427 unsigned audit_tty_log_passwd;
99428@@ -755,7 +780,7 @@ struct signal_struct {
99429 struct mutex cred_guard_mutex; /* guard against foreign influences on
99430 * credential calculations
99431 * (notably. ptrace) */
99432-};
99433+} __randomize_layout;
99434
99435 /*
99436 * Bits in flags field of signal_struct.
99437@@ -808,6 +833,14 @@ struct user_struct {
99438 struct key *session_keyring; /* UID's default session keyring */
99439 #endif
99440
99441+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
99442+ unsigned char kernel_banned;
99443+#endif
99444+#ifdef CONFIG_GRKERNSEC_BRUTE
99445+ unsigned char suid_banned;
99446+ unsigned long suid_ban_expires;
99447+#endif
99448+
99449 /* Hash table maintenance information */
99450 struct hlist_node uidhash_node;
99451 kuid_t uid;
99452@@ -815,7 +848,7 @@ struct user_struct {
99453 #ifdef CONFIG_PERF_EVENTS
99454 atomic_long_t locked_vm;
99455 #endif
99456-};
99457+} __randomize_layout;
99458
99459 extern int uids_sysfs_init(void);
99460
99461@@ -1292,6 +1325,9 @@ enum perf_event_task_context {
99462 struct task_struct {
99463 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
99464 void *stack;
99465+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99466+ void *lowmem_stack;
99467+#endif
99468 atomic_t usage;
99469 unsigned int flags; /* per process flags, defined below */
99470 unsigned int ptrace;
99471@@ -1425,8 +1461,8 @@ struct task_struct {
99472 struct list_head thread_node;
99473
99474 struct completion *vfork_done; /* for vfork() */
99475- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
99476- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99477+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
99478+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99479
99480 cputime_t utime, stime, utimescaled, stimescaled;
99481 cputime_t gtime;
99482@@ -1451,11 +1487,6 @@ struct task_struct {
99483 struct task_cputime cputime_expires;
99484 struct list_head cpu_timers[3];
99485
99486-/* process credentials */
99487- const struct cred __rcu *real_cred; /* objective and real subjective task
99488- * credentials (COW) */
99489- const struct cred __rcu *cred; /* effective (overridable) subjective task
99490- * credentials (COW) */
99491 char comm[TASK_COMM_LEN]; /* executable name excluding path
99492 - access with [gs]et_task_comm (which lock
99493 it with task_lock())
99494@@ -1473,6 +1504,10 @@ struct task_struct {
99495 #endif
99496 /* CPU-specific state of this task */
99497 struct thread_struct thread;
99498+/* thread_info moved to task_struct */
99499+#ifdef CONFIG_X86
99500+ struct thread_info tinfo;
99501+#endif
99502 /* filesystem information */
99503 struct fs_struct *fs;
99504 /* open file information */
99505@@ -1547,6 +1582,10 @@ struct task_struct {
99506 gfp_t lockdep_reclaim_gfp;
99507 #endif
99508
99509+/* process credentials */
99510+ const struct cred __rcu *real_cred; /* objective and real subjective task
99511+ * credentials (COW) */
99512+
99513 /* journalling filesystem info */
99514 void *journal_info;
99515
99516@@ -1585,6 +1624,10 @@ struct task_struct {
99517 /* cg_list protected by css_set_lock and tsk->alloc_lock */
99518 struct list_head cg_list;
99519 #endif
99520+
99521+ const struct cred __rcu *cred; /* effective (overridable) subjective task
99522+ * credentials (COW) */
99523+
99524 #ifdef CONFIG_FUTEX
99525 struct robust_list_head __user *robust_list;
99526 #ifdef CONFIG_COMPAT
99527@@ -1696,7 +1739,7 @@ struct task_struct {
99528 * Number of functions that haven't been traced
99529 * because of depth overrun.
99530 */
99531- atomic_t trace_overrun;
99532+ atomic_unchecked_t trace_overrun;
99533 /* Pause for the tracing */
99534 atomic_t tracing_graph_pause;
99535 #endif
99536@@ -1724,7 +1767,78 @@ struct task_struct {
99537 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
99538 unsigned long task_state_change;
99539 #endif
99540-};
99541+
99542+#ifdef CONFIG_GRKERNSEC
99543+ /* grsecurity */
99544+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99545+ u64 exec_id;
99546+#endif
99547+#ifdef CONFIG_GRKERNSEC_SETXID
99548+ const struct cred *delayed_cred;
99549+#endif
99550+ struct dentry *gr_chroot_dentry;
99551+ struct acl_subject_label *acl;
99552+ struct acl_subject_label *tmpacl;
99553+ struct acl_role_label *role;
99554+ struct file *exec_file;
99555+ unsigned long brute_expires;
99556+ u16 acl_role_id;
99557+ u8 inherited;
99558+ /* is this the task that authenticated to the special role */
99559+ u8 acl_sp_role;
99560+ u8 is_writable;
99561+ u8 brute;
99562+ u8 gr_is_chrooted;
99563+#endif
99564+
99565+} __randomize_layout;
99566+
99567+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
99568+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
99569+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
99570+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
99571+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
99572+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
99573+
99574+#ifdef CONFIG_PAX_SOFTMODE
99575+extern int pax_softmode;
99576+#endif
99577+
99578+extern int pax_check_flags(unsigned long *);
99579+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
99580+
99581+/* if tsk != current then task_lock must be held on it */
99582+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
99583+static inline unsigned long pax_get_flags(struct task_struct *tsk)
99584+{
99585+ if (likely(tsk->mm))
99586+ return tsk->mm->pax_flags;
99587+ else
99588+ return 0UL;
99589+}
99590+
99591+/* if tsk != current then task_lock must be held on it */
99592+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
99593+{
99594+ if (likely(tsk->mm)) {
99595+ tsk->mm->pax_flags = flags;
99596+ return 0;
99597+ }
99598+ return -EINVAL;
99599+}
99600+#endif
99601+
99602+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
99603+extern void pax_set_initial_flags(struct linux_binprm *bprm);
99604+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
99605+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
99606+#endif
99607+
99608+struct path;
99609+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
99610+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
99611+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
99612+extern void pax_report_refcount_overflow(struct pt_regs *regs);
99613
99614 /* Future-safe accessor for struct task_struct's cpus_allowed. */
99615 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
99616@@ -1807,7 +1921,7 @@ struct pid_namespace;
99617 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
99618 struct pid_namespace *ns);
99619
99620-static inline pid_t task_pid_nr(struct task_struct *tsk)
99621+static inline pid_t task_pid_nr(const struct task_struct *tsk)
99622 {
99623 return tsk->pid;
99624 }
99625@@ -2175,6 +2289,25 @@ extern u64 sched_clock_cpu(int cpu);
99626
99627 extern void sched_clock_init(void);
99628
99629+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99630+static inline void populate_stack(void)
99631+{
99632+ struct task_struct *curtask = current;
99633+ int c;
99634+ int *ptr = curtask->stack;
99635+ int *end = curtask->stack + THREAD_SIZE;
99636+
99637+ while (ptr < end) {
99638+ c = *(volatile int *)ptr;
99639+ ptr += PAGE_SIZE/sizeof(int);
99640+ }
99641+}
99642+#else
99643+static inline void populate_stack(void)
99644+{
99645+}
99646+#endif
99647+
99648 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
99649 static inline void sched_clock_tick(void)
99650 {
99651@@ -2303,7 +2436,9 @@ extern void set_curr_task(int cpu, struct task_struct *p);
99652 void yield(void);
99653
99654 union thread_union {
99655+#ifndef CONFIG_X86
99656 struct thread_info thread_info;
99657+#endif
99658 unsigned long stack[THREAD_SIZE/sizeof(long)];
99659 };
99660
99661@@ -2336,6 +2471,7 @@ extern struct pid_namespace init_pid_ns;
99662 */
99663
99664 extern struct task_struct *find_task_by_vpid(pid_t nr);
99665+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
99666 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
99667 struct pid_namespace *ns);
99668
99669@@ -2500,7 +2636,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
99670 extern void exit_itimers(struct signal_struct *);
99671 extern void flush_itimer_signals(void);
99672
99673-extern void do_group_exit(int);
99674+extern __noreturn void do_group_exit(int);
99675
99676 extern int do_execve(struct filename *,
99677 const char __user * const __user *,
99678@@ -2721,9 +2857,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
99679 #define task_stack_end_corrupted(task) \
99680 (*(end_of_stack(task)) != STACK_END_MAGIC)
99681
99682-static inline int object_is_on_stack(void *obj)
99683+static inline int object_starts_on_stack(const void *obj)
99684 {
99685- void *stack = task_stack_page(current);
99686+ const void *stack = task_stack_page(current);
99687
99688 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
99689 }
99690diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
99691index 596a0e0..bea77ec 100644
99692--- a/include/linux/sched/sysctl.h
99693+++ b/include/linux/sched/sysctl.h
99694@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
99695 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
99696
99697 extern int sysctl_max_map_count;
99698+extern unsigned long sysctl_heap_stack_gap;
99699
99700 extern unsigned int sysctl_sched_latency;
99701 extern unsigned int sysctl_sched_min_granularity;
99702diff --git a/include/linux/security.h b/include/linux/security.h
99703index 18264ea..e0238e4 100644
99704--- a/include/linux/security.h
99705+++ b/include/linux/security.h
99706@@ -27,6 +27,7 @@
99707 #include <linux/slab.h>
99708 #include <linux/err.h>
99709 #include <linux/string.h>
99710+#include <linux/grsecurity.h>
99711
99712 struct linux_binprm;
99713 struct cred;
99714@@ -116,8 +117,6 @@ struct seq_file;
99715
99716 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
99717
99718-void reset_security_ops(void);
99719-
99720 #ifdef CONFIG_MMU
99721 extern unsigned long mmap_min_addr;
99722 extern unsigned long dac_mmap_min_addr;
99723@@ -1755,7 +1754,7 @@ struct security_operations {
99724 struct audit_context *actx);
99725 void (*audit_rule_free) (void *lsmrule);
99726 #endif /* CONFIG_AUDIT */
99727-};
99728+} __randomize_layout;
99729
99730 /* prototypes */
99731 extern int security_init(void);
99732diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
99733index dc368b8..e895209 100644
99734--- a/include/linux/semaphore.h
99735+++ b/include/linux/semaphore.h
99736@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
99737 }
99738
99739 extern void down(struct semaphore *sem);
99740-extern int __must_check down_interruptible(struct semaphore *sem);
99741+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
99742 extern int __must_check down_killable(struct semaphore *sem);
99743 extern int __must_check down_trylock(struct semaphore *sem);
99744 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
99745diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
99746index afbb1fd..e1d205d 100644
99747--- a/include/linux/seq_file.h
99748+++ b/include/linux/seq_file.h
99749@@ -27,6 +27,9 @@ struct seq_file {
99750 struct mutex lock;
99751 const struct seq_operations *op;
99752 int poll_event;
99753+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99754+ u64 exec_id;
99755+#endif
99756 #ifdef CONFIG_USER_NS
99757 struct user_namespace *user_ns;
99758 #endif
99759@@ -39,6 +42,7 @@ struct seq_operations {
99760 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
99761 int (*show) (struct seq_file *m, void *v);
99762 };
99763+typedef struct seq_operations __no_const seq_operations_no_const;
99764
99765 #define SEQ_SKIP 1
99766
99767@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
99768
99769 char *mangle_path(char *s, const char *p, const char *esc);
99770 int seq_open(struct file *, const struct seq_operations *);
99771+int seq_open_restrict(struct file *, const struct seq_operations *);
99772 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
99773 loff_t seq_lseek(struct file *, loff_t, int);
99774 int seq_release(struct inode *, struct file *);
99775@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
99776 const struct path *root, const char *esc);
99777
99778 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
99779+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
99780 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
99781 int single_release(struct inode *, struct file *);
99782 void *__seq_open_private(struct file *, const struct seq_operations *, int);
99783diff --git a/include/linux/shm.h b/include/linux/shm.h
99784index 6fb8016..ab4465e 100644
99785--- a/include/linux/shm.h
99786+++ b/include/linux/shm.h
99787@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
99788 /* The task created the shm object. NULL if the task is dead. */
99789 struct task_struct *shm_creator;
99790 struct list_head shm_clist; /* list by creator */
99791+#ifdef CONFIG_GRKERNSEC
99792+ u64 shm_createtime;
99793+ pid_t shm_lapid;
99794+#endif
99795 };
99796
99797 /* shm_mode upper byte flags */
99798diff --git a/include/linux/signal.h b/include/linux/signal.h
99799index ab1e039..ad4229e 100644
99800--- a/include/linux/signal.h
99801+++ b/include/linux/signal.h
99802@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
99803 * know it'll be handled, so that they don't get converted to
99804 * SIGKILL or just silently dropped.
99805 */
99806- kernel_sigaction(sig, (__force __sighandler_t)2);
99807+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
99808 }
99809
99810 static inline void disallow_signal(int sig)
99811diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
99812index f15154a..17b985a 100644
99813--- a/include/linux/skbuff.h
99814+++ b/include/linux/skbuff.h
99815@@ -776,7 +776,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
99816 int node);
99817 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
99818 struct sk_buff *build_skb(void *data, unsigned int frag_size);
99819-static inline struct sk_buff *alloc_skb(unsigned int size,
99820+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
99821 gfp_t priority)
99822 {
99823 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
99824@@ -1590,20 +1590,16 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i,
99825 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
99826
99827 /*
99828- * Propagate page->pfmemalloc to the skb if we can. The problem is
99829- * that not all callers have unique ownership of the page. If
99830- * pfmemalloc is set, we check the mapping as a mapping implies
99831- * page->index is set (index and pfmemalloc share space).
99832- * If it's a valid mapping, we cannot use page->pfmemalloc but we
99833- * do not lose pfmemalloc information as the pages would not be
99834- * allocated using __GFP_MEMALLOC.
99835+ * Propagate page pfmemalloc to the skb if we can. The problem is
99836+ * that not all callers have unique ownership of the page but rely
99837+ * on page_is_pfmemalloc doing the right thing(tm).
99838 */
99839 frag->page.p = page;
99840 frag->page_offset = off;
99841 skb_frag_size_set(frag, size);
99842
99843 page = compound_head(page);
99844- if (page->pfmemalloc && !page->mapping)
99845+ if (page_is_pfmemalloc(page))
99846 skb->pfmemalloc = true;
99847 }
99848
99849@@ -1971,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
99850 return skb->inner_transport_header - skb->inner_network_header;
99851 }
99852
99853-static inline int skb_network_offset(const struct sk_buff *skb)
99854+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
99855 {
99856 return skb_network_header(skb) - skb->data;
99857 }
99858@@ -2031,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
99859 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
99860 */
99861 #ifndef NET_SKB_PAD
99862-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
99863+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
99864 #endif
99865
99866 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
99867@@ -2250,7 +2246,7 @@ static inline struct page *dev_alloc_page(void)
99868 static inline void skb_propagate_pfmemalloc(struct page *page,
99869 struct sk_buff *skb)
99870 {
99871- if (page && page->pfmemalloc)
99872+ if (page_is_pfmemalloc(page))
99873 skb->pfmemalloc = true;
99874 }
99875
99876@@ -2673,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
99877 int *err);
99878 unsigned int datagram_poll(struct file *file, struct socket *sock,
99879 struct poll_table_struct *wait);
99880-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
99881+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
99882 struct iov_iter *to, int size);
99883-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
99884+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
99885 struct msghdr *msg, int size)
99886 {
99887 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
99888@@ -3197,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
99889 nf_bridge_put(skb->nf_bridge);
99890 skb->nf_bridge = NULL;
99891 #endif
99892+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
99893+ skb->nf_trace = 0;
99894+#endif
99895 }
99896
99897 static inline void nf_reset_trace(struct sk_buff *skb)
99898diff --git a/include/linux/slab.h b/include/linux/slab.h
99899index ffd24c8..cbbe7de 100644
99900--- a/include/linux/slab.h
99901+++ b/include/linux/slab.h
99902@@ -15,14 +15,29 @@
99903 #include <linux/types.h>
99904 #include <linux/workqueue.h>
99905
99906+#include <linux/err.h>
99907
99908 /*
99909 * Flags to pass to kmem_cache_create().
99910 * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
99911 */
99912 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
99913+
99914+#ifdef CONFIG_PAX_USERCOPY_SLABS
99915+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
99916+#else
99917+#define SLAB_USERCOPY 0x00000000UL
99918+#endif
99919+
99920 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
99921 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
99922+
99923+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99924+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
99925+#else
99926+#define SLAB_NO_SANITIZE 0x00000000UL
99927+#endif
99928+
99929 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
99930 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
99931 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
99932@@ -98,10 +113,13 @@
99933 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
99934 * Both make kfree a no-op.
99935 */
99936-#define ZERO_SIZE_PTR ((void *)16)
99937+#define ZERO_SIZE_PTR \
99938+({ \
99939+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
99940+ (void *)(-MAX_ERRNO-1L); \
99941+})
99942
99943-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
99944- (unsigned long)ZERO_SIZE_PTR)
99945+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
99946
99947 #include <linux/kmemleak.h>
99948 #include <linux/kasan.h>
99949@@ -143,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
99950 void kfree(const void *);
99951 void kzfree(const void *);
99952 size_t ksize(const void *);
99953+const char *check_heap_object(const void *ptr, unsigned long n);
99954+bool is_usercopy_object(const void *ptr);
99955
99956 /*
99957 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
99958@@ -235,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
99959 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
99960 #endif
99961
99962+#ifdef CONFIG_PAX_USERCOPY_SLABS
99963+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
99964+#endif
99965+
99966 /*
99967 * Figure out which kmalloc slab an allocation of a certain size
99968 * belongs to.
99969@@ -243,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
99970 * 2 = 120 .. 192 bytes
99971 * n = 2^(n-1) .. 2^n -1
99972 */
99973-static __always_inline int kmalloc_index(size_t size)
99974+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
99975 {
99976 if (!size)
99977 return 0;
99978@@ -286,15 +310,15 @@ static __always_inline int kmalloc_index(size_t size)
99979 }
99980 #endif /* !CONFIG_SLOB */
99981
99982-void *__kmalloc(size_t size, gfp_t flags);
99983+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
99984 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
99985 void kmem_cache_free(struct kmem_cache *, void *);
99986
99987 #ifdef CONFIG_NUMA
99988-void *__kmalloc_node(size_t size, gfp_t flags, int node);
99989+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
99990 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
99991 #else
99992-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
99993+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
99994 {
99995 return __kmalloc(size, flags);
99996 }
99997diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
99998index 33d0490..70a6313 100644
99999--- a/include/linux/slab_def.h
100000+++ b/include/linux/slab_def.h
100001@@ -40,7 +40,7 @@ struct kmem_cache {
100002 /* 4) cache creation/removal */
100003 const char *name;
100004 struct list_head list;
100005- int refcount;
100006+ atomic_t refcount;
100007 int object_size;
100008 int align;
100009
100010@@ -56,10 +56,14 @@ struct kmem_cache {
100011 unsigned long node_allocs;
100012 unsigned long node_frees;
100013 unsigned long node_overflow;
100014- atomic_t allochit;
100015- atomic_t allocmiss;
100016- atomic_t freehit;
100017- atomic_t freemiss;
100018+ atomic_unchecked_t allochit;
100019+ atomic_unchecked_t allocmiss;
100020+ atomic_unchecked_t freehit;
100021+ atomic_unchecked_t freemiss;
100022+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100023+ atomic_unchecked_t sanitized;
100024+ atomic_unchecked_t not_sanitized;
100025+#endif
100026
100027 /*
100028 * If debugging is enabled, then the allocator can add additional
100029diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
100030index 3388511..6252f90 100644
100031--- a/include/linux/slub_def.h
100032+++ b/include/linux/slub_def.h
100033@@ -74,7 +74,7 @@ struct kmem_cache {
100034 struct kmem_cache_order_objects max;
100035 struct kmem_cache_order_objects min;
100036 gfp_t allocflags; /* gfp flags to use on each alloc */
100037- int refcount; /* Refcount for slab cache destroy */
100038+ atomic_t refcount; /* Refcount for slab cache destroy */
100039 void (*ctor)(void *);
100040 int inuse; /* Offset to metadata */
100041 int align; /* Alignment */
100042diff --git a/include/linux/smp.h b/include/linux/smp.h
100043index c441407..f487b83 100644
100044--- a/include/linux/smp.h
100045+++ b/include/linux/smp.h
100046@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
100047 #endif
100048
100049 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
100050+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
100051 #define put_cpu() preempt_enable()
100052+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
100053
100054 /*
100055 * Callback to arch code if there's nosmp or maxcpus=0 on the
100056diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
100057index 083ac38..b23e3e8 100644
100058--- a/include/linux/sock_diag.h
100059+++ b/include/linux/sock_diag.h
100060@@ -11,7 +11,7 @@ struct sock;
100061 struct sock_diag_handler {
100062 __u8 family;
100063 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
100064-};
100065+} __do_const;
100066
100067 int sock_diag_register(const struct sock_diag_handler *h);
100068 void sock_diag_unregister(const struct sock_diag_handler *h);
100069diff --git a/include/linux/sonet.h b/include/linux/sonet.h
100070index 680f9a3..f13aeb0 100644
100071--- a/include/linux/sonet.h
100072+++ b/include/linux/sonet.h
100073@@ -7,7 +7,7 @@
100074 #include <uapi/linux/sonet.h>
100075
100076 struct k_sonet_stats {
100077-#define __HANDLE_ITEM(i) atomic_t i
100078+#define __HANDLE_ITEM(i) atomic_unchecked_t i
100079 __SONET_ITEMS
100080 #undef __HANDLE_ITEM
100081 };
100082diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
100083index 07d8e53..dc934c9 100644
100084--- a/include/linux/sunrpc/addr.h
100085+++ b/include/linux/sunrpc/addr.h
100086@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
100087 {
100088 switch (sap->sa_family) {
100089 case AF_INET:
100090- return ntohs(((struct sockaddr_in *)sap)->sin_port);
100091+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
100092 case AF_INET6:
100093- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
100094+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
100095 }
100096 return 0;
100097 }
100098@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
100099 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
100100 const struct sockaddr *src)
100101 {
100102- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
100103+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
100104 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
100105
100106 dsin->sin_family = ssin->sin_family;
100107@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
100108 if (sa->sa_family != AF_INET6)
100109 return 0;
100110
100111- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
100112+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
100113 }
100114
100115 #endif /* _LINUX_SUNRPC_ADDR_H */
100116diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
100117index 598ba80..d90cba6 100644
100118--- a/include/linux/sunrpc/clnt.h
100119+++ b/include/linux/sunrpc/clnt.h
100120@@ -100,7 +100,7 @@ struct rpc_procinfo {
100121 unsigned int p_timer; /* Which RTT timer to use */
100122 u32 p_statidx; /* Which procedure to account */
100123 const char * p_name; /* name of procedure */
100124-};
100125+} __do_const;
100126
100127 #ifdef __KERNEL__
100128
100129diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
100130index fae6fb9..023fbcd 100644
100131--- a/include/linux/sunrpc/svc.h
100132+++ b/include/linux/sunrpc/svc.h
100133@@ -420,7 +420,7 @@ struct svc_procedure {
100134 unsigned int pc_count; /* call count */
100135 unsigned int pc_cachetype; /* cache info (NFS) */
100136 unsigned int pc_xdrressize; /* maximum size of XDR reply */
100137-};
100138+} __do_const;
100139
100140 /*
100141 * Function prototypes.
100142diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
100143index df8edf8..d140fec 100644
100144--- a/include/linux/sunrpc/svc_rdma.h
100145+++ b/include/linux/sunrpc/svc_rdma.h
100146@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
100147 extern unsigned int svcrdma_max_requests;
100148 extern unsigned int svcrdma_max_req_size;
100149
100150-extern atomic_t rdma_stat_recv;
100151-extern atomic_t rdma_stat_read;
100152-extern atomic_t rdma_stat_write;
100153-extern atomic_t rdma_stat_sq_starve;
100154-extern atomic_t rdma_stat_rq_starve;
100155-extern atomic_t rdma_stat_rq_poll;
100156-extern atomic_t rdma_stat_rq_prod;
100157-extern atomic_t rdma_stat_sq_poll;
100158-extern atomic_t rdma_stat_sq_prod;
100159+extern atomic_unchecked_t rdma_stat_recv;
100160+extern atomic_unchecked_t rdma_stat_read;
100161+extern atomic_unchecked_t rdma_stat_write;
100162+extern atomic_unchecked_t rdma_stat_sq_starve;
100163+extern atomic_unchecked_t rdma_stat_rq_starve;
100164+extern atomic_unchecked_t rdma_stat_rq_poll;
100165+extern atomic_unchecked_t rdma_stat_rq_prod;
100166+extern atomic_unchecked_t rdma_stat_sq_poll;
100167+extern atomic_unchecked_t rdma_stat_sq_prod;
100168
100169 /*
100170 * Contexts are built when an RDMA request is created and are a
100171diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
100172index 8d71d65..f79586e 100644
100173--- a/include/linux/sunrpc/svcauth.h
100174+++ b/include/linux/sunrpc/svcauth.h
100175@@ -120,7 +120,7 @@ struct auth_ops {
100176 int (*release)(struct svc_rqst *rq);
100177 void (*domain_release)(struct auth_domain *);
100178 int (*set_client)(struct svc_rqst *rq);
100179-};
100180+} __do_const;
100181
100182 #define SVC_GARBAGE 1
100183 #define SVC_SYSERR 2
100184diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
100185index e7a018e..49f8b17 100644
100186--- a/include/linux/swiotlb.h
100187+++ b/include/linux/swiotlb.h
100188@@ -60,7 +60,8 @@ extern void
100189
100190 extern void
100191 swiotlb_free_coherent(struct device *hwdev, size_t size,
100192- void *vaddr, dma_addr_t dma_handle);
100193+ void *vaddr, dma_addr_t dma_handle,
100194+ struct dma_attrs *attrs);
100195
100196 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
100197 unsigned long offset, size_t size,
100198diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
100199index 76d1e38..200776e 100644
100200--- a/include/linux/syscalls.h
100201+++ b/include/linux/syscalls.h
100202@@ -102,7 +102,12 @@ union bpf_attr;
100203 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
100204 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
100205 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
100206-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
100207+#define __SC_LONG(t, a) __typeof__( \
100208+ __builtin_choose_expr( \
100209+ sizeof(t) > sizeof(int), \
100210+ (t) 0, \
100211+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
100212+ )) a
100213 #define __SC_CAST(t, a) (t) a
100214 #define __SC_ARGS(t, a) a
100215 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
100216@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
100217 asmlinkage long sys_fsync(unsigned int fd);
100218 asmlinkage long sys_fdatasync(unsigned int fd);
100219 asmlinkage long sys_bdflush(int func, long data);
100220-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
100221- char __user *type, unsigned long flags,
100222+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
100223+ const char __user *type, unsigned long flags,
100224 void __user *data);
100225-asmlinkage long sys_umount(char __user *name, int flags);
100226-asmlinkage long sys_oldumount(char __user *name);
100227+asmlinkage long sys_umount(const char __user *name, int flags);
100228+asmlinkage long sys_oldumount(const char __user *name);
100229 asmlinkage long sys_truncate(const char __user *path, long length);
100230 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
100231 asmlinkage long sys_stat(const char __user *filename,
100232@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
100233 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
100234 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
100235 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
100236- struct sockaddr __user *, int);
100237+ struct sockaddr __user *, int) __intentional_overflow(0);
100238 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
100239 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
100240 unsigned int vlen, unsigned flags);
100241@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
100242
100243 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
100244 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
100245- unsigned nsops);
100246+ long nsops);
100247 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
100248 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
100249- unsigned nsops,
100250+ long nsops,
100251 const struct timespec __user *timeout);
100252 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
100253 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
100254diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
100255index 27b3b0b..e093dd9 100644
100256--- a/include/linux/syscore_ops.h
100257+++ b/include/linux/syscore_ops.h
100258@@ -16,7 +16,7 @@ struct syscore_ops {
100259 int (*suspend)(void);
100260 void (*resume)(void);
100261 void (*shutdown)(void);
100262-};
100263+} __do_const;
100264
100265 extern void register_syscore_ops(struct syscore_ops *ops);
100266 extern void unregister_syscore_ops(struct syscore_ops *ops);
100267diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
100268index fa7bc29..0d96561 100644
100269--- a/include/linux/sysctl.h
100270+++ b/include/linux/sysctl.h
100271@@ -39,10 +39,16 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
100272
100273 extern int proc_dostring(struct ctl_table *, int,
100274 void __user *, size_t *, loff_t *);
100275+extern int proc_dostring_modpriv(struct ctl_table *, int,
100276+ void __user *, size_t *, loff_t *);
100277 extern int proc_dointvec(struct ctl_table *, int,
100278 void __user *, size_t *, loff_t *);
100279+extern int proc_dointvec_secure(struct ctl_table *, int,
100280+ void __user *, size_t *, loff_t *);
100281 extern int proc_dointvec_minmax(struct ctl_table *, int,
100282 void __user *, size_t *, loff_t *);
100283+extern int proc_dointvec_minmax_secure(struct ctl_table *, int,
100284+ void __user *, size_t *, loff_t *);
100285 extern int proc_dointvec_jiffies(struct ctl_table *, int,
100286 void __user *, size_t *, loff_t *);
100287 extern int proc_dointvec_userhz_jiffies(struct ctl_table *, int,
100288@@ -113,7 +119,8 @@ struct ctl_table
100289 struct ctl_table_poll *poll;
100290 void *extra1;
100291 void *extra2;
100292-};
100293+} __do_const __randomize_layout;
100294+typedef struct ctl_table __no_const ctl_table_no_const;
100295
100296 struct ctl_node {
100297 struct rb_node node;
100298diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
100299index 9f65758..487a6f1 100644
100300--- a/include/linux/sysfs.h
100301+++ b/include/linux/sysfs.h
100302@@ -34,7 +34,8 @@ struct attribute {
100303 struct lock_class_key *key;
100304 struct lock_class_key skey;
100305 #endif
100306-};
100307+} __do_const;
100308+typedef struct attribute __no_const attribute_no_const;
100309
100310 /**
100311 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
100312@@ -78,7 +79,8 @@ struct attribute_group {
100313 struct attribute *, int);
100314 struct attribute **attrs;
100315 struct bin_attribute **bin_attrs;
100316-};
100317+} __do_const;
100318+typedef struct attribute_group __no_const attribute_group_no_const;
100319
100320 /**
100321 * Use these macros to make defining attributes easier. See include/linux/device.h
100322@@ -152,7 +154,8 @@ struct bin_attribute {
100323 char *, loff_t, size_t);
100324 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
100325 struct vm_area_struct *vma);
100326-};
100327+} __do_const;
100328+typedef struct bin_attribute __no_const bin_attribute_no_const;
100329
100330 /**
100331 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
100332diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
100333index 387fa7d..3fcde6b 100644
100334--- a/include/linux/sysrq.h
100335+++ b/include/linux/sysrq.h
100336@@ -16,6 +16,7 @@
100337
100338 #include <linux/errno.h>
100339 #include <linux/types.h>
100340+#include <linux/compiler.h>
100341
100342 /* Possible values of bitmask for enabling sysrq functions */
100343 /* 0x0001 is reserved for enable everything */
100344@@ -33,7 +34,7 @@ struct sysrq_key_op {
100345 char *help_msg;
100346 char *action_msg;
100347 int enable_mask;
100348-};
100349+} __do_const;
100350
100351 #ifdef CONFIG_MAGIC_SYSRQ
100352
100353diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
100354index ff307b5..f1a4468 100644
100355--- a/include/linux/thread_info.h
100356+++ b/include/linux/thread_info.h
100357@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
100358 #error "no set_restore_sigmask() provided and default one won't work"
100359 #endif
100360
100361+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
100362+
100363+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
100364+{
100365+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
100366+}
100367+
100368 #endif /* __KERNEL__ */
100369
100370 #endif /* _LINUX_THREAD_INFO_H */
100371diff --git a/include/linux/tty.h b/include/linux/tty.h
100372index d76631f..de91e82 100644
100373--- a/include/linux/tty.h
100374+++ b/include/linux/tty.h
100375@@ -225,7 +225,7 @@ struct tty_port {
100376 const struct tty_port_operations *ops; /* Port operations */
100377 spinlock_t lock; /* Lock protecting tty field */
100378 int blocked_open; /* Waiting to open */
100379- int count; /* Usage count */
100380+ atomic_t count; /* Usage count */
100381 wait_queue_head_t open_wait; /* Open waiters */
100382 wait_queue_head_t close_wait; /* Close waiters */
100383 wait_queue_head_t delta_msr_wait; /* Modem status change */
100384@@ -313,7 +313,7 @@ struct tty_struct {
100385 /* If the tty has a pending do_SAK, queue it here - akpm */
100386 struct work_struct SAK_work;
100387 struct tty_port *port;
100388-};
100389+} __randomize_layout;
100390
100391 /* Each of a tty's open files has private_data pointing to tty_file_private */
100392 struct tty_file_private {
100393@@ -573,7 +573,7 @@ extern int tty_port_open(struct tty_port *port,
100394 struct tty_struct *tty, struct file *filp);
100395 static inline int tty_port_users(struct tty_port *port)
100396 {
100397- return port->count + port->blocked_open;
100398+ return atomic_read(&port->count) + port->blocked_open;
100399 }
100400
100401 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
100402diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
100403index 92e337c..f46757b 100644
100404--- a/include/linux/tty_driver.h
100405+++ b/include/linux/tty_driver.h
100406@@ -291,7 +291,7 @@ struct tty_operations {
100407 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
100408 #endif
100409 const struct file_operations *proc_fops;
100410-};
100411+} __do_const __randomize_layout;
100412
100413 struct tty_driver {
100414 int magic; /* magic number for this structure */
100415@@ -325,7 +325,7 @@ struct tty_driver {
100416
100417 const struct tty_operations *ops;
100418 struct list_head tty_drivers;
100419-};
100420+} __randomize_layout;
100421
100422 extern struct list_head tty_drivers;
100423
100424diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
100425index 00c9d68..bc0188b 100644
100426--- a/include/linux/tty_ldisc.h
100427+++ b/include/linux/tty_ldisc.h
100428@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
100429
100430 struct module *owner;
100431
100432- int refcount;
100433+ atomic_t refcount;
100434 };
100435
100436 struct tty_ldisc {
100437diff --git a/include/linux/types.h b/include/linux/types.h
100438index 8715287..1be77ee 100644
100439--- a/include/linux/types.h
100440+++ b/include/linux/types.h
100441@@ -176,10 +176,26 @@ typedef struct {
100442 int counter;
100443 } atomic_t;
100444
100445+#ifdef CONFIG_PAX_REFCOUNT
100446+typedef struct {
100447+ int counter;
100448+} atomic_unchecked_t;
100449+#else
100450+typedef atomic_t atomic_unchecked_t;
100451+#endif
100452+
100453 #ifdef CONFIG_64BIT
100454 typedef struct {
100455 long counter;
100456 } atomic64_t;
100457+
100458+#ifdef CONFIG_PAX_REFCOUNT
100459+typedef struct {
100460+ long counter;
100461+} atomic64_unchecked_t;
100462+#else
100463+typedef atomic64_t atomic64_unchecked_t;
100464+#endif
100465 #endif
100466
100467 struct list_head {
100468diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
100469index ecd3319..8a36ded 100644
100470--- a/include/linux/uaccess.h
100471+++ b/include/linux/uaccess.h
100472@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
100473 long ret; \
100474 mm_segment_t old_fs = get_fs(); \
100475 \
100476- set_fs(KERNEL_DS); \
100477 pagefault_disable(); \
100478- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
100479- pagefault_enable(); \
100480+ set_fs(KERNEL_DS); \
100481+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
100482 set_fs(old_fs); \
100483+ pagefault_enable(); \
100484 ret; \
100485 })
100486
100487diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
100488index 0383552..a0125dd 100644
100489--- a/include/linux/uidgid.h
100490+++ b/include/linux/uidgid.h
100491@@ -187,4 +187,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
100492
100493 #endif /* CONFIG_USER_NS */
100494
100495+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
100496+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
100497+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
100498+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
100499+
100500 #endif /* _LINUX_UIDGID_H */
100501diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
100502index 32c0e83..671eb35 100644
100503--- a/include/linux/uio_driver.h
100504+++ b/include/linux/uio_driver.h
100505@@ -67,7 +67,7 @@ struct uio_device {
100506 struct module *owner;
100507 struct device *dev;
100508 int minor;
100509- atomic_t event;
100510+ atomic_unchecked_t event;
100511 struct fasync_struct *async_queue;
100512 wait_queue_head_t wait;
100513 struct uio_info *info;
100514diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
100515index 99c1b4d..562e6f3 100644
100516--- a/include/linux/unaligned/access_ok.h
100517+++ b/include/linux/unaligned/access_ok.h
100518@@ -4,34 +4,34 @@
100519 #include <linux/kernel.h>
100520 #include <asm/byteorder.h>
100521
100522-static inline u16 get_unaligned_le16(const void *p)
100523+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
100524 {
100525- return le16_to_cpup((__le16 *)p);
100526+ return le16_to_cpup((const __le16 *)p);
100527 }
100528
100529-static inline u32 get_unaligned_le32(const void *p)
100530+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
100531 {
100532- return le32_to_cpup((__le32 *)p);
100533+ return le32_to_cpup((const __le32 *)p);
100534 }
100535
100536-static inline u64 get_unaligned_le64(const void *p)
100537+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
100538 {
100539- return le64_to_cpup((__le64 *)p);
100540+ return le64_to_cpup((const __le64 *)p);
100541 }
100542
100543-static inline u16 get_unaligned_be16(const void *p)
100544+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
100545 {
100546- return be16_to_cpup((__be16 *)p);
100547+ return be16_to_cpup((const __be16 *)p);
100548 }
100549
100550-static inline u32 get_unaligned_be32(const void *p)
100551+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
100552 {
100553- return be32_to_cpup((__be32 *)p);
100554+ return be32_to_cpup((const __be32 *)p);
100555 }
100556
100557-static inline u64 get_unaligned_be64(const void *p)
100558+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
100559 {
100560- return be64_to_cpup((__be64 *)p);
100561+ return be64_to_cpup((const __be64 *)p);
100562 }
100563
100564 static inline void put_unaligned_le16(u16 val, void *p)
100565diff --git a/include/linux/usb.h b/include/linux/usb.h
100566index 447fe29..9fc875f 100644
100567--- a/include/linux/usb.h
100568+++ b/include/linux/usb.h
100569@@ -592,7 +592,7 @@ struct usb_device {
100570 int maxchild;
100571
100572 u32 quirks;
100573- atomic_t urbnum;
100574+ atomic_unchecked_t urbnum;
100575
100576 unsigned long active_duration;
100577
100578@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
100579
100580 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
100581 __u8 request, __u8 requesttype, __u16 value, __u16 index,
100582- void *data, __u16 size, int timeout);
100583+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
100584 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
100585 void *data, int len, int *actual_length, int timeout);
100586 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
100587diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
100588index f06529c..dfeabd8 100644
100589--- a/include/linux/usb/renesas_usbhs.h
100590+++ b/include/linux/usb/renesas_usbhs.h
100591@@ -39,7 +39,7 @@ enum {
100592 */
100593 struct renesas_usbhs_driver_callback {
100594 int (*notify_hotplug)(struct platform_device *pdev);
100595-};
100596+} __no_const;
100597
100598 /*
100599 * callback functions for platform
100600diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
100601index 8297e5b..0dfae27 100644
100602--- a/include/linux/user_namespace.h
100603+++ b/include/linux/user_namespace.h
100604@@ -39,7 +39,7 @@ struct user_namespace {
100605 struct key *persistent_keyring_register;
100606 struct rw_semaphore persistent_keyring_register_sem;
100607 #endif
100608-};
100609+} __randomize_layout;
100610
100611 extern struct user_namespace init_user_ns;
100612
100613diff --git a/include/linux/utsname.h b/include/linux/utsname.h
100614index 5093f58..c103e58 100644
100615--- a/include/linux/utsname.h
100616+++ b/include/linux/utsname.h
100617@@ -25,7 +25,7 @@ struct uts_namespace {
100618 struct new_utsname name;
100619 struct user_namespace *user_ns;
100620 struct ns_common ns;
100621-};
100622+} __randomize_layout;
100623 extern struct uts_namespace init_uts_ns;
100624
100625 #ifdef CONFIG_UTS_NS
100626diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
100627index 6f8fbcf..4efc177 100644
100628--- a/include/linux/vermagic.h
100629+++ b/include/linux/vermagic.h
100630@@ -25,9 +25,42 @@
100631 #define MODULE_ARCH_VERMAGIC ""
100632 #endif
100633
100634+#ifdef CONFIG_PAX_REFCOUNT
100635+#define MODULE_PAX_REFCOUNT "REFCOUNT "
100636+#else
100637+#define MODULE_PAX_REFCOUNT ""
100638+#endif
100639+
100640+#ifdef CONSTIFY_PLUGIN
100641+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
100642+#else
100643+#define MODULE_CONSTIFY_PLUGIN ""
100644+#endif
100645+
100646+#ifdef STACKLEAK_PLUGIN
100647+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
100648+#else
100649+#define MODULE_STACKLEAK_PLUGIN ""
100650+#endif
100651+
100652+#ifdef RANDSTRUCT_PLUGIN
100653+#include <generated/randomize_layout_hash.h>
100654+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
100655+#else
100656+#define MODULE_RANDSTRUCT_PLUGIN
100657+#endif
100658+
100659+#ifdef CONFIG_GRKERNSEC
100660+#define MODULE_GRSEC "GRSEC "
100661+#else
100662+#define MODULE_GRSEC ""
100663+#endif
100664+
100665 #define VERMAGIC_STRING \
100666 UTS_RELEASE " " \
100667 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
100668 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
100669- MODULE_ARCH_VERMAGIC
100670+ MODULE_ARCH_VERMAGIC \
100671+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
100672+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
100673
100674diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
100675index b483abd..af305ad 100644
100676--- a/include/linux/vga_switcheroo.h
100677+++ b/include/linux/vga_switcheroo.h
100678@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
100679
100680 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
100681
100682-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
100683+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
100684 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
100685-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
100686+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
100687 #else
100688
100689 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
100690@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
100691
100692 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
100693
100694-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100695+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100696 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
100697-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100698+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100699
100700 #endif
100701 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
100702diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
100703index 0ec5983..d5888bb 100644
100704--- a/include/linux/vmalloc.h
100705+++ b/include/linux/vmalloc.h
100706@@ -18,6 +18,14 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
100707 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
100708 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
100709 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
100710+
100711+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100712+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
100713+#endif
100714+
100715+#define VM_USERCOPY 0x00000200 /* allocation intended for copies to userland */
100716+
100717+
100718 /* bits [20..32] reserved for arch specific ioremap internals */
100719
100720 /*
100721@@ -67,6 +75,7 @@ static inline void vmalloc_init(void)
100722 #endif
100723
100724 extern void *vmalloc(unsigned long size);
100725+extern void *vmalloc_usercopy(unsigned long size);
100726 extern void *vzalloc(unsigned long size);
100727 extern void *vmalloc_user(unsigned long size);
100728 extern void *vmalloc_node(unsigned long size, int node);
100729@@ -86,6 +95,10 @@ extern void *vmap(struct page **pages, unsigned int count,
100730 unsigned long flags, pgprot_t prot);
100731 extern void vunmap(const void *addr);
100732
100733+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100734+extern void unmap_process_stacks(struct task_struct *task);
100735+#endif
100736+
100737 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
100738 unsigned long uaddr, void *kaddr,
100739 unsigned long size);
100740@@ -150,7 +163,7 @@ extern void free_vm_area(struct vm_struct *area);
100741
100742 /* for /dev/kmem */
100743 extern long vread(char *buf, char *addr, unsigned long count);
100744-extern long vwrite(char *buf, char *addr, unsigned long count);
100745+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
100746
100747 /*
100748 * Internals. Dont't use..
100749diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
100750index 82e7db7..f8ce3d0 100644
100751--- a/include/linux/vmstat.h
100752+++ b/include/linux/vmstat.h
100753@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
100754 /*
100755 * Zone based page accounting with per cpu differentials.
100756 */
100757-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100758+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100759
100760 static inline void zone_page_state_add(long x, struct zone *zone,
100761 enum zone_stat_item item)
100762 {
100763- atomic_long_add(x, &zone->vm_stat[item]);
100764- atomic_long_add(x, &vm_stat[item]);
100765+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
100766+ atomic_long_add_unchecked(x, &vm_stat[item]);
100767 }
100768
100769-static inline unsigned long global_page_state(enum zone_stat_item item)
100770+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
100771 {
100772- long x = atomic_long_read(&vm_stat[item]);
100773+ long x = atomic_long_read_unchecked(&vm_stat[item]);
100774 #ifdef CONFIG_SMP
100775 if (x < 0)
100776 x = 0;
100777@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
100778 return x;
100779 }
100780
100781-static inline unsigned long zone_page_state(struct zone *zone,
100782+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
100783 enum zone_stat_item item)
100784 {
100785- long x = atomic_long_read(&zone->vm_stat[item]);
100786+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100787 #ifdef CONFIG_SMP
100788 if (x < 0)
100789 x = 0;
100790@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
100791 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
100792 enum zone_stat_item item)
100793 {
100794- long x = atomic_long_read(&zone->vm_stat[item]);
100795+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100796
100797 #ifdef CONFIG_SMP
100798 int cpu;
100799@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
100800
100801 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
100802 {
100803- atomic_long_inc(&zone->vm_stat[item]);
100804- atomic_long_inc(&vm_stat[item]);
100805+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
100806+ atomic_long_inc_unchecked(&vm_stat[item]);
100807 }
100808
100809 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
100810 {
100811- atomic_long_dec(&zone->vm_stat[item]);
100812- atomic_long_dec(&vm_stat[item]);
100813+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
100814+ atomic_long_dec_unchecked(&vm_stat[item]);
100815 }
100816
100817 static inline void __inc_zone_page_state(struct page *page,
100818diff --git a/include/linux/xattr.h b/include/linux/xattr.h
100819index 91b0a68..0e9adf6 100644
100820--- a/include/linux/xattr.h
100821+++ b/include/linux/xattr.h
100822@@ -28,7 +28,7 @@ struct xattr_handler {
100823 size_t size, int handler_flags);
100824 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
100825 size_t size, int flags, int handler_flags);
100826-};
100827+} __do_const;
100828
100829 struct xattr {
100830 const char *name;
100831@@ -37,6 +37,9 @@ struct xattr {
100832 };
100833
100834 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
100835+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
100836+ssize_t pax_getxattr(struct dentry *, void *, size_t);
100837+#endif
100838 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
100839 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
100840 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
100841diff --git a/include/linux/zlib.h b/include/linux/zlib.h
100842index 92dbbd3..13ab0b3 100644
100843--- a/include/linux/zlib.h
100844+++ b/include/linux/zlib.h
100845@@ -31,6 +31,7 @@
100846 #define _ZLIB_H
100847
100848 #include <linux/zconf.h>
100849+#include <linux/compiler.h>
100850
100851 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
100852 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
100853@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
100854
100855 /* basic functions */
100856
100857-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
100858+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
100859 /*
100860 Returns the number of bytes that needs to be allocated for a per-
100861 stream workspace with the specified parameters. A pointer to this
100862diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
100863index acbcd2f..c3abe84 100644
100864--- a/include/media/v4l2-dev.h
100865+++ b/include/media/v4l2-dev.h
100866@@ -74,7 +74,7 @@ struct v4l2_file_operations {
100867 int (*mmap) (struct file *, struct vm_area_struct *);
100868 int (*open) (struct file *);
100869 int (*release) (struct file *);
100870-};
100871+} __do_const;
100872
100873 /*
100874 * Newer version of video_device, handled by videodev2.c
100875diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
100876index 9c58157..d86ebf5 100644
100877--- a/include/media/v4l2-device.h
100878+++ b/include/media/v4l2-device.h
100879@@ -93,7 +93,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
100880 this function returns 0. If the name ends with a digit (e.g. cx18),
100881 then the name will be set to cx18-0 since cx180 looks really odd. */
100882 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
100883- atomic_t *instance);
100884+ atomic_unchecked_t *instance);
100885
100886 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
100887 Since the parent disappears this ensures that v4l2_dev doesn't have an
100888diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
100889index 5122b5e..598b440 100644
100890--- a/include/net/9p/transport.h
100891+++ b/include/net/9p/transport.h
100892@@ -62,7 +62,7 @@ struct p9_trans_module {
100893 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
100894 int (*zc_request)(struct p9_client *, struct p9_req_t *,
100895 struct iov_iter *, struct iov_iter *, int , int, int);
100896-};
100897+} __do_const;
100898
100899 void v9fs_register_trans(struct p9_trans_module *m);
100900 void v9fs_unregister_trans(struct p9_trans_module *m);
100901diff --git a/include/net/af_unix.h b/include/net/af_unix.h
100902index a175ba4..196eb8242 100644
100903--- a/include/net/af_unix.h
100904+++ b/include/net/af_unix.h
100905@@ -36,7 +36,7 @@ struct unix_skb_parms {
100906 u32 secid; /* Security ID */
100907 #endif
100908 u32 consumed;
100909-};
100910+} __randomize_layout;
100911
100912 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
100913 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
100914diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
100915index 2239a37..a83461f 100644
100916--- a/include/net/bluetooth/l2cap.h
100917+++ b/include/net/bluetooth/l2cap.h
100918@@ -609,7 +609,7 @@ struct l2cap_ops {
100919 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
100920 unsigned long hdr_len,
100921 unsigned long len, int nb);
100922-};
100923+} __do_const;
100924
100925 struct l2cap_conn {
100926 struct hci_conn *hcon;
100927diff --git a/include/net/bonding.h b/include/net/bonding.h
100928index 78ed135..2f53667 100644
100929--- a/include/net/bonding.h
100930+++ b/include/net/bonding.h
100931@@ -658,7 +658,7 @@ extern struct rtnl_link_ops bond_link_ops;
100932
100933 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
100934 {
100935- atomic_long_inc(&dev->tx_dropped);
100936+ atomic_long_inc_unchecked(&dev->tx_dropped);
100937 dev_kfree_skb_any(skb);
100938 }
100939
100940diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
100941index f2ae33d..c457cf0 100644
100942--- a/include/net/caif/cfctrl.h
100943+++ b/include/net/caif/cfctrl.h
100944@@ -52,7 +52,7 @@ struct cfctrl_rsp {
100945 void (*radioset_rsp)(void);
100946 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
100947 struct cflayer *client_layer);
100948-};
100949+} __no_const;
100950
100951 /* Link Setup Parameters for CAIF-Links. */
100952 struct cfctrl_link_param {
100953@@ -101,8 +101,8 @@ struct cfctrl_request_info {
100954 struct cfctrl {
100955 struct cfsrvl serv;
100956 struct cfctrl_rsp res;
100957- atomic_t req_seq_no;
100958- atomic_t rsp_seq_no;
100959+ atomic_unchecked_t req_seq_no;
100960+ atomic_unchecked_t rsp_seq_no;
100961 struct list_head list;
100962 /* Protects from simultaneous access to first_req list */
100963 spinlock_t info_list_lock;
100964diff --git a/include/net/flow.h b/include/net/flow.h
100965index 8109a15..504466d 100644
100966--- a/include/net/flow.h
100967+++ b/include/net/flow.h
100968@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
100969
100970 void flow_cache_flush(struct net *net);
100971 void flow_cache_flush_deferred(struct net *net);
100972-extern atomic_t flow_cache_genid;
100973+extern atomic_unchecked_t flow_cache_genid;
100974
100975 #endif
100976diff --git a/include/net/genetlink.h b/include/net/genetlink.h
100977index a9af1cc..1f3fa7b 100644
100978--- a/include/net/genetlink.h
100979+++ b/include/net/genetlink.h
100980@@ -128,7 +128,7 @@ struct genl_ops {
100981 u8 cmd;
100982 u8 internal_flags;
100983 u8 flags;
100984-};
100985+} __do_const;
100986
100987 int __genl_register_family(struct genl_family *family);
100988
100989diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
100990index 0f712c0..cd762c4 100644
100991--- a/include/net/gro_cells.h
100992+++ b/include/net/gro_cells.h
100993@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
100994 cell = this_cpu_ptr(gcells->cells);
100995
100996 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
100997- atomic_long_inc(&dev->rx_dropped);
100998+ atomic_long_inc_unchecked(&dev->rx_dropped);
100999 kfree_skb(skb);
101000 return;
101001 }
101002diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
101003index 0320bbb..938789c 100644
101004--- a/include/net/inet_connection_sock.h
101005+++ b/include/net/inet_connection_sock.h
101006@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
101007 int (*bind_conflict)(const struct sock *sk,
101008 const struct inet_bind_bucket *tb, bool relax);
101009 void (*mtu_reduced)(struct sock *sk);
101010-};
101011+} __do_const;
101012
101013 /** inet_connection_sock - INET connection oriented sock
101014 *
101015diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
101016index 8d17655..2f3246d 100644
101017--- a/include/net/inet_frag.h
101018+++ b/include/net/inet_frag.h
101019@@ -21,13 +21,11 @@ struct netns_frags {
101020 * @INET_FRAG_FIRST_IN: first fragment has arrived
101021 * @INET_FRAG_LAST_IN: final fragment has arrived
101022 * @INET_FRAG_COMPLETE: frag queue has been processed and is due for destruction
101023- * @INET_FRAG_EVICTED: frag queue is being evicted
101024 */
101025 enum {
101026 INET_FRAG_FIRST_IN = BIT(0),
101027 INET_FRAG_LAST_IN = BIT(1),
101028 INET_FRAG_COMPLETE = BIT(2),
101029- INET_FRAG_EVICTED = BIT(3)
101030 };
101031
101032 /**
101033@@ -45,6 +43,7 @@ enum {
101034 * @flags: fragment queue flags
101035 * @max_size: (ipv4 only) maximum received fragment size with IP_DF set
101036 * @net: namespace that this frag belongs to
101037+ * @list_evictor: list of queues to forcefully evict (e.g. due to low memory)
101038 */
101039 struct inet_frag_queue {
101040 spinlock_t lock;
101041@@ -59,6 +58,7 @@ struct inet_frag_queue {
101042 __u8 flags;
101043 u16 max_size;
101044 struct netns_frags *net;
101045+ struct hlist_node list_evictor;
101046 };
101047
101048 #define INETFRAGS_HASHSZ 1024
101049@@ -125,6 +125,11 @@ static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f
101050 inet_frag_destroy(q, f);
101051 }
101052
101053+static inline bool inet_frag_evicting(struct inet_frag_queue *q)
101054+{
101055+ return !hlist_unhashed(&q->list_evictor);
101056+}
101057+
101058 /* Memory Tracking Functions. */
101059
101060 /* The default percpu_counter batch size is not big enough to scale to
101061@@ -139,14 +144,14 @@ static inline int frag_mem_limit(struct netns_frags *nf)
101062 return percpu_counter_read(&nf->mem);
101063 }
101064
101065-static inline void sub_frag_mem_limit(struct inet_frag_queue *q, int i)
101066+static inline void sub_frag_mem_limit(struct netns_frags *nf, int i)
101067 {
101068- __percpu_counter_add(&q->net->mem, -i, frag_percpu_counter_batch);
101069+ __percpu_counter_add(&nf->mem, -i, frag_percpu_counter_batch);
101070 }
101071
101072-static inline void add_frag_mem_limit(struct inet_frag_queue *q, int i)
101073+static inline void add_frag_mem_limit(struct netns_frags *nf, int i)
101074 {
101075- __percpu_counter_add(&q->net->mem, i, frag_percpu_counter_batch);
101076+ __percpu_counter_add(&nf->mem, i, frag_percpu_counter_batch);
101077 }
101078
101079 static inline void init_frag_mem_limit(struct netns_frags *nf)
101080diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
101081index d5332dd..10a5c3c 100644
101082--- a/include/net/inetpeer.h
101083+++ b/include/net/inetpeer.h
101084@@ -48,7 +48,7 @@ struct inet_peer {
101085 */
101086 union {
101087 struct {
101088- atomic_t rid; /* Frag reception counter */
101089+ atomic_unchecked_t rid; /* Frag reception counter */
101090 };
101091 struct rcu_head rcu;
101092 struct inet_peer *gc_next;
101093diff --git a/include/net/ip.h b/include/net/ip.h
101094index d14af7e..52816c2 100644
101095--- a/include/net/ip.h
101096+++ b/include/net/ip.h
101097@@ -318,7 +318,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
101098 }
101099 }
101100
101101-u32 ip_idents_reserve(u32 hash, int segs);
101102+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
101103 void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);
101104
101105 static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb,
101106diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
101107index 54271ed..eb7e0e6 100644
101108--- a/include/net/ip_fib.h
101109+++ b/include/net/ip_fib.h
101110@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
101111
101112 #define FIB_RES_SADDR(net, res) \
101113 ((FIB_RES_NH(res).nh_saddr_genid == \
101114- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
101115+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
101116 FIB_RES_NH(res).nh_saddr : \
101117 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
101118 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
101119diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
101120index 4e3731e..a242e28 100644
101121--- a/include/net/ip_vs.h
101122+++ b/include/net/ip_vs.h
101123@@ -551,7 +551,7 @@ struct ip_vs_conn {
101124 struct ip_vs_conn *control; /* Master control connection */
101125 atomic_t n_control; /* Number of controlled ones */
101126 struct ip_vs_dest *dest; /* real server */
101127- atomic_t in_pkts; /* incoming packet counter */
101128+ atomic_unchecked_t in_pkts; /* incoming packet counter */
101129
101130 /* Packet transmitter for different forwarding methods. If it
101131 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
101132@@ -699,7 +699,7 @@ struct ip_vs_dest {
101133 __be16 port; /* port number of the server */
101134 union nf_inet_addr addr; /* IP address of the server */
101135 volatile unsigned int flags; /* dest status flags */
101136- atomic_t conn_flags; /* flags to copy to conn */
101137+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
101138 atomic_t weight; /* server weight */
101139
101140 atomic_t refcnt; /* reference counter */
101141@@ -946,11 +946,11 @@ struct netns_ipvs {
101142 /* ip_vs_lblc */
101143 int sysctl_lblc_expiration;
101144 struct ctl_table_header *lblc_ctl_header;
101145- struct ctl_table *lblc_ctl_table;
101146+ ctl_table_no_const *lblc_ctl_table;
101147 /* ip_vs_lblcr */
101148 int sysctl_lblcr_expiration;
101149 struct ctl_table_header *lblcr_ctl_header;
101150- struct ctl_table *lblcr_ctl_table;
101151+ ctl_table_no_const *lblcr_ctl_table;
101152 /* ip_vs_est */
101153 struct list_head est_list; /* estimator list */
101154 spinlock_t est_lock;
101155diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
101156index 8d4f588..2e37ad2 100644
101157--- a/include/net/irda/ircomm_tty.h
101158+++ b/include/net/irda/ircomm_tty.h
101159@@ -33,6 +33,7 @@
101160 #include <linux/termios.h>
101161 #include <linux/timer.h>
101162 #include <linux/tty.h> /* struct tty_struct */
101163+#include <asm/local.h>
101164
101165 #include <net/irda/irias_object.h>
101166 #include <net/irda/ircomm_core.h>
101167diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
101168index 714cc9a..ea05f3e 100644
101169--- a/include/net/iucv/af_iucv.h
101170+++ b/include/net/iucv/af_iucv.h
101171@@ -149,7 +149,7 @@ struct iucv_skb_cb {
101172 struct iucv_sock_list {
101173 struct hlist_head head;
101174 rwlock_t lock;
101175- atomic_t autobind_name;
101176+ atomic_unchecked_t autobind_name;
101177 };
101178
101179 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
101180diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
101181index f3be818..bf46196 100644
101182--- a/include/net/llc_c_ac.h
101183+++ b/include/net/llc_c_ac.h
101184@@ -87,7 +87,7 @@
101185 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
101186 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
101187
101188-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101189+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101190
101191 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
101192 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
101193diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
101194index 3948cf1..83b28c4 100644
101195--- a/include/net/llc_c_ev.h
101196+++ b/include/net/llc_c_ev.h
101197@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
101198 return (struct llc_conn_state_ev *)skb->cb;
101199 }
101200
101201-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101202-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101203+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101204+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101205
101206 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
101207 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
101208diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
101209index 48f3f89..0e92c50 100644
101210--- a/include/net/llc_c_st.h
101211+++ b/include/net/llc_c_st.h
101212@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
101213 u8 next_state;
101214 const llc_conn_ev_qfyr_t *ev_qualifiers;
101215 const llc_conn_action_t *ev_actions;
101216-};
101217+} __do_const;
101218
101219 struct llc_conn_state {
101220 u8 current_state;
101221diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
101222index a61b98c..aade1eb 100644
101223--- a/include/net/llc_s_ac.h
101224+++ b/include/net/llc_s_ac.h
101225@@ -23,7 +23,7 @@
101226 #define SAP_ACT_TEST_IND 9
101227
101228 /* All action functions must look like this */
101229-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101230+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101231
101232 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
101233 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
101234diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
101235index c4359e2..76dbc4a 100644
101236--- a/include/net/llc_s_st.h
101237+++ b/include/net/llc_s_st.h
101238@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
101239 llc_sap_ev_t ev;
101240 u8 next_state;
101241 const llc_sap_action_t *ev_actions;
101242-};
101243+} __do_const;
101244
101245 struct llc_sap_state {
101246 u8 curr_state;
101247diff --git a/include/net/mac80211.h b/include/net/mac80211.h
101248index fc57f6b..9c1fdb2 100644
101249--- a/include/net/mac80211.h
101250+++ b/include/net/mac80211.h
101251@@ -5104,7 +5104,7 @@ struct rate_control_ops {
101252 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
101253
101254 u32 (*get_expected_throughput)(void *priv_sta);
101255-};
101256+} __do_const;
101257
101258 static inline int rate_supported(struct ieee80211_sta *sta,
101259 enum ieee80211_band band,
101260diff --git a/include/net/neighbour.h b/include/net/neighbour.h
101261index bd33e66..6508d00 100644
101262--- a/include/net/neighbour.h
101263+++ b/include/net/neighbour.h
101264@@ -162,7 +162,7 @@ struct neigh_ops {
101265 void (*error_report)(struct neighbour *, struct sk_buff *);
101266 int (*output)(struct neighbour *, struct sk_buff *);
101267 int (*connected_output)(struct neighbour *, struct sk_buff *);
101268-};
101269+} __do_const;
101270
101271 struct pneigh_entry {
101272 struct pneigh_entry *next;
101273@@ -216,7 +216,7 @@ struct neigh_table {
101274 struct neigh_statistics __percpu *stats;
101275 struct neigh_hash_table __rcu *nht;
101276 struct pneigh_entry **phash_buckets;
101277-};
101278+} __randomize_layout;
101279
101280 enum {
101281 NEIGH_ARP_TABLE = 0,
101282diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
101283index f733656..54053db 100644
101284--- a/include/net/net_namespace.h
101285+++ b/include/net/net_namespace.h
101286@@ -132,8 +132,8 @@ struct net {
101287 struct netns_mpls mpls;
101288 #endif
101289 struct sock *diag_nlsk;
101290- atomic_t fnhe_genid;
101291-};
101292+ atomic_unchecked_t fnhe_genid;
101293+} __randomize_layout;
101294
101295 #include <linux/seq_file_net.h>
101296
101297@@ -268,7 +268,11 @@ static inline struct net *read_pnet(const possible_net_t *pnet)
101298 #define __net_init __init
101299 #define __net_exit __exit_refok
101300 #define __net_initdata __initdata
101301+#ifdef CONSTIFY_PLUGIN
101302 #define __net_initconst __initconst
101303+#else
101304+#define __net_initconst __initdata
101305+#endif
101306 #endif
101307
101308 int peernet2id(struct net *net, struct net *peer);
101309@@ -281,7 +285,7 @@ struct pernet_operations {
101310 void (*exit_batch)(struct list_head *net_exit_list);
101311 int *id;
101312 size_t size;
101313-};
101314+} __do_const;
101315
101316 /*
101317 * Use these carefully. If you implement a network device and it
101318@@ -329,12 +333,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
101319
101320 static inline int rt_genid_ipv4(struct net *net)
101321 {
101322- return atomic_read(&net->ipv4.rt_genid);
101323+ return atomic_read_unchecked(&net->ipv4.rt_genid);
101324 }
101325
101326 static inline void rt_genid_bump_ipv4(struct net *net)
101327 {
101328- atomic_inc(&net->ipv4.rt_genid);
101329+ atomic_inc_unchecked(&net->ipv4.rt_genid);
101330 }
101331
101332 extern void (*__fib6_flush_trees)(struct net *net);
101333@@ -361,12 +365,12 @@ static inline void rt_genid_bump_all(struct net *net)
101334
101335 static inline int fnhe_genid(struct net *net)
101336 {
101337- return atomic_read(&net->fnhe_genid);
101338+ return atomic_read_unchecked(&net->fnhe_genid);
101339 }
101340
101341 static inline void fnhe_genid_bump(struct net *net)
101342 {
101343- atomic_inc(&net->fnhe_genid);
101344+ atomic_inc_unchecked(&net->fnhe_genid);
101345 }
101346
101347 #endif /* __NET_NET_NAMESPACE_H */
101348diff --git a/include/net/netlink.h b/include/net/netlink.h
101349index 2a5dbcc..8243656 100644
101350--- a/include/net/netlink.h
101351+++ b/include/net/netlink.h
101352@@ -521,7 +521,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
101353 {
101354 if (mark) {
101355 WARN_ON((unsigned char *) mark < skb->data);
101356- skb_trim(skb, (unsigned char *) mark - skb->data);
101357+ skb_trim(skb, (const unsigned char *) mark - skb->data);
101358 }
101359 }
101360
101361diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
101362index 29d6a94..235d3d84 100644
101363--- a/include/net/netns/conntrack.h
101364+++ b/include/net/netns/conntrack.h
101365@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
101366 struct nf_proto_net {
101367 #ifdef CONFIG_SYSCTL
101368 struct ctl_table_header *ctl_table_header;
101369- struct ctl_table *ctl_table;
101370+ ctl_table_no_const *ctl_table;
101371 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
101372 struct ctl_table_header *ctl_compat_header;
101373- struct ctl_table *ctl_compat_table;
101374+ ctl_table_no_const *ctl_compat_table;
101375 #endif
101376 #endif
101377 unsigned int users;
101378@@ -60,7 +60,7 @@ struct nf_ip_net {
101379 struct nf_icmp_net icmpv6;
101380 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
101381 struct ctl_table_header *ctl_table_header;
101382- struct ctl_table *ctl_table;
101383+ ctl_table_no_const *ctl_table;
101384 #endif
101385 };
101386
101387diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
101388index 614a49b..0b94386 100644
101389--- a/include/net/netns/ipv4.h
101390+++ b/include/net/netns/ipv4.h
101391@@ -90,7 +90,7 @@ struct netns_ipv4 {
101392
101393 struct ping_group_range ping_group_range;
101394
101395- atomic_t dev_addr_genid;
101396+ atomic_unchecked_t dev_addr_genid;
101397
101398 #ifdef CONFIG_SYSCTL
101399 unsigned long *sysctl_local_reserved_ports;
101400@@ -104,6 +104,6 @@ struct netns_ipv4 {
101401 struct fib_rules_ops *mr_rules_ops;
101402 #endif
101403 #endif
101404- atomic_t rt_genid;
101405+ atomic_unchecked_t rt_genid;
101406 };
101407 #endif
101408diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
101409index d2527bf..2c802d5 100644
101410--- a/include/net/netns/ipv6.h
101411+++ b/include/net/netns/ipv6.h
101412@@ -78,8 +78,8 @@ struct netns_ipv6 {
101413 struct fib_rules_ops *mr6_rules_ops;
101414 #endif
101415 #endif
101416- atomic_t dev_addr_genid;
101417- atomic_t fib6_sernum;
101418+ atomic_unchecked_t dev_addr_genid;
101419+ atomic_unchecked_t fib6_sernum;
101420 };
101421
101422 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
101423diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
101424index 730d82a..045f2c4 100644
101425--- a/include/net/netns/xfrm.h
101426+++ b/include/net/netns/xfrm.h
101427@@ -78,7 +78,7 @@ struct netns_xfrm {
101428
101429 /* flow cache part */
101430 struct flow_cache flow_cache_global;
101431- atomic_t flow_cache_genid;
101432+ atomic_unchecked_t flow_cache_genid;
101433 struct list_head flow_cache_gc_list;
101434 spinlock_t flow_cache_gc_lock;
101435 struct work_struct flow_cache_gc_work;
101436diff --git a/include/net/ping.h b/include/net/ping.h
101437index ac80cb4..ec1ed09 100644
101438--- a/include/net/ping.h
101439+++ b/include/net/ping.h
101440@@ -54,7 +54,7 @@ struct ping_iter_state {
101441
101442 extern struct proto ping_prot;
101443 #if IS_ENABLED(CONFIG_IPV6)
101444-extern struct pingv6_ops pingv6_ops;
101445+extern struct pingv6_ops *pingv6_ops;
101446 #endif
101447
101448 struct pingfakehdr {
101449diff --git a/include/net/protocol.h b/include/net/protocol.h
101450index d6fcc1f..ca277058 100644
101451--- a/include/net/protocol.h
101452+++ b/include/net/protocol.h
101453@@ -49,7 +49,7 @@ struct net_protocol {
101454 * socket lookup?
101455 */
101456 icmp_strict_tag_validation:1;
101457-};
101458+} __do_const;
101459
101460 #if IS_ENABLED(CONFIG_IPV6)
101461 struct inet6_protocol {
101462@@ -62,7 +62,7 @@ struct inet6_protocol {
101463 u8 type, u8 code, int offset,
101464 __be32 info);
101465 unsigned int flags; /* INET6_PROTO_xxx */
101466-};
101467+} __do_const;
101468
101469 #define INET6_PROTO_NOPOLICY 0x1
101470 #define INET6_PROTO_FINAL 0x2
101471diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
101472index 343d922..7959cde 100644
101473--- a/include/net/rtnetlink.h
101474+++ b/include/net/rtnetlink.h
101475@@ -95,7 +95,7 @@ struct rtnl_link_ops {
101476 const struct net_device *dev,
101477 const struct net_device *slave_dev);
101478 struct net *(*get_link_net)(const struct net_device *dev);
101479-};
101480+} __do_const;
101481
101482 int __rtnl_link_register(struct rtnl_link_ops *ops);
101483 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
101484diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
101485index 4a5b9a3..ca27d73 100644
101486--- a/include/net/sctp/checksum.h
101487+++ b/include/net/sctp/checksum.h
101488@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
101489 unsigned int offset)
101490 {
101491 struct sctphdr *sh = sctp_hdr(skb);
101492- __le32 ret, old = sh->checksum;
101493- const struct skb_checksum_ops ops = {
101494+ __le32 ret, old = sh->checksum;
101495+ static const struct skb_checksum_ops ops = {
101496 .update = sctp_csum_update,
101497 .combine = sctp_csum_combine,
101498 };
101499diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
101500index 487ef34..d457f98 100644
101501--- a/include/net/sctp/sm.h
101502+++ b/include/net/sctp/sm.h
101503@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
101504 typedef struct {
101505 sctp_state_fn_t *fn;
101506 const char *name;
101507-} sctp_sm_table_entry_t;
101508+} __do_const sctp_sm_table_entry_t;
101509
101510 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
101511 * currently in use.
101512@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
101513 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
101514
101515 /* Extern declarations for major data structures. */
101516-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101517+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101518
101519
101520 /* Get the size of a DATA chunk payload. */
101521diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
101522index 495c87e..5b327ff 100644
101523--- a/include/net/sctp/structs.h
101524+++ b/include/net/sctp/structs.h
101525@@ -513,7 +513,7 @@ struct sctp_pf {
101526 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
101527 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
101528 struct sctp_af *af;
101529-};
101530+} __do_const;
101531
101532
101533 /* Structure to track chunk fragments that have been acked, but peer
101534diff --git a/include/net/sock.h b/include/net/sock.h
101535index 3a4898e..67456ac 100644
101536--- a/include/net/sock.h
101537+++ b/include/net/sock.h
101538@@ -363,7 +363,7 @@ struct sock {
101539 unsigned int sk_napi_id;
101540 unsigned int sk_ll_usec;
101541 #endif
101542- atomic_t sk_drops;
101543+ atomic_unchecked_t sk_drops;
101544 int sk_rcvbuf;
101545
101546 struct sk_filter __rcu *sk_filter;
101547@@ -1039,7 +1039,7 @@ struct proto {
101548 void (*destroy_cgroup)(struct mem_cgroup *memcg);
101549 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
101550 #endif
101551-};
101552+} __randomize_layout;
101553
101554 /*
101555 * Bits in struct cg_proto.flags
101556@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
101557 page_counter_uncharge(&prot->memory_allocated, amt);
101558 }
101559
101560-static inline long
101561+static inline long __intentional_overflow(-1)
101562 sk_memory_allocated(const struct sock *sk)
101563 {
101564 struct proto *prot = sk->sk_prot;
101565@@ -1777,7 +1777,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
101566 }
101567
101568 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
101569- struct iov_iter *from, char *to,
101570+ struct iov_iter *from, unsigned char *to,
101571 int copy, int offset)
101572 {
101573 if (skb->ip_summed == CHECKSUM_NONE) {
101574@@ -2024,7 +2024,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
101575 }
101576 }
101577
101578-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101579+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101580
101581 /**
101582 * sk_page_frag - return an appropriate page_frag
101583@@ -2099,7 +2099,7 @@ struct sock_skb_cb {
101584 static inline void
101585 sock_skb_set_dropcount(const struct sock *sk, struct sk_buff *skb)
101586 {
101587- SOCK_SKB_CB(skb)->dropcount = atomic_read(&sk->sk_drops);
101588+ SOCK_SKB_CB(skb)->dropcount = atomic_read_unchecked(&sk->sk_drops);
101589 }
101590
101591 void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
101592diff --git a/include/net/tcp.h b/include/net/tcp.h
101593index 6d204f3..d5a8ff0 100644
101594--- a/include/net/tcp.h
101595+++ b/include/net/tcp.h
101596@@ -523,7 +523,7 @@ void tcp_retransmit_timer(struct sock *sk);
101597 void tcp_xmit_retransmit_queue(struct sock *);
101598 void tcp_simple_retransmit(struct sock *);
101599 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
101600-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101601+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101602
101603 void tcp_send_probe0(struct sock *);
101604 void tcp_send_partial(struct sock *);
101605@@ -699,8 +699,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
101606 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
101607 */
101608 struct tcp_skb_cb {
101609- __u32 seq; /* Starting sequence number */
101610- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
101611+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
101612+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
101613 union {
101614 /* Note : tcp_tw_isn is used in input path only
101615 * (isn chosen by tcp_timewait_state_process())
101616@@ -725,7 +725,7 @@ struct tcp_skb_cb {
101617
101618 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
101619 /* 1 byte hole */
101620- __u32 ack_seq; /* Sequence number ACK'd */
101621+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
101622 union {
101623 struct inet_skb_parm h4;
101624 #if IS_ENABLED(CONFIG_IPV6)
101625diff --git a/include/net/xfrm.h b/include/net/xfrm.h
101626index 36ac102..6e8b34b 100644
101627--- a/include/net/xfrm.h
101628+++ b/include/net/xfrm.h
101629@@ -283,7 +283,6 @@ struct xfrm_dst;
101630 struct xfrm_policy_afinfo {
101631 unsigned short family;
101632 struct dst_ops *dst_ops;
101633- void (*garbage_collect)(struct net *net);
101634 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
101635 const xfrm_address_t *saddr,
101636 const xfrm_address_t *daddr);
101637@@ -301,7 +300,7 @@ struct xfrm_policy_afinfo {
101638 struct net_device *dev,
101639 const struct flowi *fl);
101640 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
101641-};
101642+} __do_const;
101643
101644 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
101645 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
101646@@ -340,7 +339,7 @@ struct xfrm_state_afinfo {
101647 int (*transport_finish)(struct sk_buff *skb,
101648 int async);
101649 void (*local_error)(struct sk_buff *skb, u32 mtu);
101650-};
101651+} __do_const;
101652
101653 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
101654 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
101655@@ -435,7 +434,7 @@ struct xfrm_mode {
101656 struct module *owner;
101657 unsigned int encap;
101658 int flags;
101659-};
101660+} __do_const;
101661
101662 /* Flags for xfrm_mode. */
101663 enum {
101664@@ -530,7 +529,7 @@ struct xfrm_policy {
101665 struct timer_list timer;
101666
101667 struct flow_cache_object flo;
101668- atomic_t genid;
101669+ atomic_unchecked_t genid;
101670 u32 priority;
101671 u32 index;
101672 struct xfrm_mark mark;
101673@@ -1163,6 +1162,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
101674 }
101675
101676 void xfrm_garbage_collect(struct net *net);
101677+void xfrm_garbage_collect_deferred(struct net *net);
101678
101679 #else
101680
101681@@ -1201,6 +1201,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
101682 static inline void xfrm_garbage_collect(struct net *net)
101683 {
101684 }
101685+static inline void xfrm_garbage_collect_deferred(struct net *net)
101686+{
101687+}
101688 #endif
101689
101690 static __inline__
101691diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
101692index 1017e0b..227aa4d 100644
101693--- a/include/rdma/iw_cm.h
101694+++ b/include/rdma/iw_cm.h
101695@@ -122,7 +122,7 @@ struct iw_cm_verbs {
101696 int backlog);
101697
101698 int (*destroy_listen)(struct iw_cm_id *cm_id);
101699-};
101700+} __no_const;
101701
101702 /**
101703 * iw_create_cm_id - Create an IW CM identifier.
101704diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
101705index 93d14da..734b3d8 100644
101706--- a/include/scsi/libfc.h
101707+++ b/include/scsi/libfc.h
101708@@ -771,6 +771,7 @@ struct libfc_function_template {
101709 */
101710 void (*disc_stop_final) (struct fc_lport *);
101711 };
101712+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
101713
101714 /**
101715 * struct fc_disc - Discovery context
101716@@ -875,7 +876,7 @@ struct fc_lport {
101717 struct fc_vport *vport;
101718
101719 /* Operational Information */
101720- struct libfc_function_template tt;
101721+ libfc_function_template_no_const tt;
101722 u8 link_up;
101723 u8 qfull;
101724 enum fc_lport_state state;
101725diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
101726index a4c9336..d6f8f34 100644
101727--- a/include/scsi/scsi_device.h
101728+++ b/include/scsi/scsi_device.h
101729@@ -185,9 +185,9 @@ struct scsi_device {
101730 unsigned int max_device_blocked; /* what device_blocked counts down from */
101731 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
101732
101733- atomic_t iorequest_cnt;
101734- atomic_t iodone_cnt;
101735- atomic_t ioerr_cnt;
101736+ atomic_unchecked_t iorequest_cnt;
101737+ atomic_unchecked_t iodone_cnt;
101738+ atomic_unchecked_t ioerr_cnt;
101739
101740 struct device sdev_gendev,
101741 sdev_dev;
101742diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
101743index 891a658..fcd68df 100644
101744--- a/include/scsi/scsi_driver.h
101745+++ b/include/scsi/scsi_driver.h
101746@@ -14,7 +14,7 @@ struct scsi_driver {
101747 void (*rescan)(struct device *);
101748 int (*init_command)(struct scsi_cmnd *);
101749 void (*uninit_command)(struct scsi_cmnd *);
101750- int (*done)(struct scsi_cmnd *);
101751+ unsigned int (*done)(struct scsi_cmnd *);
101752 int (*eh_action)(struct scsi_cmnd *, int);
101753 };
101754 #define to_scsi_driver(drv) \
101755diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
101756index 784bc2c..855a04c 100644
101757--- a/include/scsi/scsi_transport_fc.h
101758+++ b/include/scsi/scsi_transport_fc.h
101759@@ -757,7 +757,8 @@ struct fc_function_template {
101760 unsigned long show_host_system_hostname:1;
101761
101762 unsigned long disable_target_scan:1;
101763-};
101764+} __do_const;
101765+typedef struct fc_function_template __no_const fc_function_template_no_const;
101766
101767
101768 /**
101769diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
101770index fa1d055..3647940 100644
101771--- a/include/sound/compress_driver.h
101772+++ b/include/sound/compress_driver.h
101773@@ -130,7 +130,7 @@ struct snd_compr_ops {
101774 struct snd_compr_caps *caps);
101775 int (*get_codec_caps) (struct snd_compr_stream *stream,
101776 struct snd_compr_codec_caps *codec);
101777-};
101778+} __no_const;
101779
101780 /**
101781 * struct snd_compr: Compressed device
101782diff --git a/include/sound/soc.h b/include/sound/soc.h
101783index f6226914..e919a2e 100644
101784--- a/include/sound/soc.h
101785+++ b/include/sound/soc.h
101786@@ -870,7 +870,7 @@ struct snd_soc_codec_driver {
101787 enum snd_soc_dapm_type, int);
101788
101789 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
101790-};
101791+} __do_const;
101792
101793 /* SoC platform interface */
101794 struct snd_soc_platform_driver {
101795@@ -897,7 +897,7 @@ struct snd_soc_platform_driver {
101796 const struct snd_compr_ops *compr_ops;
101797
101798 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
101799-};
101800+} __do_const;
101801
101802 struct snd_soc_dai_link_component {
101803 const char *name;
101804diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
101805index 480e9f8..2d59c93 100644
101806--- a/include/target/target_core_base.h
101807+++ b/include/target/target_core_base.h
101808@@ -767,7 +767,7 @@ struct se_device {
101809 atomic_long_t write_bytes;
101810 /* Active commands on this virtual SE device */
101811 atomic_t simple_cmds;
101812- atomic_t dev_ordered_id;
101813+ atomic_unchecked_t dev_ordered_id;
101814 atomic_t dev_ordered_sync;
101815 atomic_t dev_qf_count;
101816 int export_count;
101817diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
101818new file mode 100644
101819index 0000000..fb634b7
101820--- /dev/null
101821+++ b/include/trace/events/fs.h
101822@@ -0,0 +1,53 @@
101823+#undef TRACE_SYSTEM
101824+#define TRACE_SYSTEM fs
101825+
101826+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
101827+#define _TRACE_FS_H
101828+
101829+#include <linux/fs.h>
101830+#include <linux/tracepoint.h>
101831+
101832+TRACE_EVENT(do_sys_open,
101833+
101834+ TP_PROTO(const char *filename, int flags, int mode),
101835+
101836+ TP_ARGS(filename, flags, mode),
101837+
101838+ TP_STRUCT__entry(
101839+ __string( filename, filename )
101840+ __field( int, flags )
101841+ __field( int, mode )
101842+ ),
101843+
101844+ TP_fast_assign(
101845+ __assign_str(filename, filename);
101846+ __entry->flags = flags;
101847+ __entry->mode = mode;
101848+ ),
101849+
101850+ TP_printk("\"%s\" %x %o",
101851+ __get_str(filename), __entry->flags, __entry->mode)
101852+);
101853+
101854+TRACE_EVENT(open_exec,
101855+
101856+ TP_PROTO(const char *filename),
101857+
101858+ TP_ARGS(filename),
101859+
101860+ TP_STRUCT__entry(
101861+ __string( filename, filename )
101862+ ),
101863+
101864+ TP_fast_assign(
101865+ __assign_str(filename, filename);
101866+ ),
101867+
101868+ TP_printk("\"%s\"",
101869+ __get_str(filename))
101870+);
101871+
101872+#endif /* _TRACE_FS_H */
101873+
101874+/* This part must be outside protection */
101875+#include <trace/define_trace.h>
101876diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
101877index ff8f6c0..6b6bae3 100644
101878--- a/include/trace/events/irq.h
101879+++ b/include/trace/events/irq.h
101880@@ -51,7 +51,7 @@ SOFTIRQ_NAME_LIST
101881 */
101882 TRACE_EVENT(irq_handler_entry,
101883
101884- TP_PROTO(int irq, struct irqaction *action),
101885+ TP_PROTO(int irq, const struct irqaction *action),
101886
101887 TP_ARGS(irq, action),
101888
101889@@ -81,7 +81,7 @@ TRACE_EVENT(irq_handler_entry,
101890 */
101891 TRACE_EVENT(irq_handler_exit,
101892
101893- TP_PROTO(int irq, struct irqaction *action, int ret),
101894+ TP_PROTO(int irq, const struct irqaction *action, int ret),
101895
101896 TP_ARGS(irq, action, ret),
101897
101898diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
101899index a7e41fb..c115957 100644
101900--- a/include/uapi/drm/i915_drm.h
101901+++ b/include/uapi/drm/i915_drm.h
101902@@ -350,6 +350,7 @@ typedef struct drm_i915_irq_wait {
101903 #define I915_PARAM_REVISION 32
101904 #define I915_PARAM_SUBSLICE_TOTAL 33
101905 #define I915_PARAM_EU_TOTAL 34
101906+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
101907
101908 typedef struct drm_i915_getparam {
101909 int param;
101910diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
101911index 7caf44c..23c6f27 100644
101912--- a/include/uapi/linux/a.out.h
101913+++ b/include/uapi/linux/a.out.h
101914@@ -39,6 +39,14 @@ enum machine_type {
101915 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
101916 };
101917
101918+/* Constants for the N_FLAGS field */
101919+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
101920+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
101921+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
101922+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
101923+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
101924+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
101925+
101926 #if !defined (N_MAGIC)
101927 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
101928 #endif
101929diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
101930index 22b6ad3..aeba37e 100644
101931--- a/include/uapi/linux/bcache.h
101932+++ b/include/uapi/linux/bcache.h
101933@@ -5,6 +5,7 @@
101934 * Bcache on disk data structures
101935 */
101936
101937+#include <linux/compiler.h>
101938 #include <asm/types.h>
101939
101940 #define BITMASK(name, type, field, offset, size) \
101941@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
101942 /* Btree keys - all units are in sectors */
101943
101944 struct bkey {
101945- __u64 high;
101946- __u64 low;
101947+ __u64 high __intentional_overflow(-1);
101948+ __u64 low __intentional_overflow(-1);
101949 __u64 ptr[];
101950 };
101951
101952diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
101953index d876736..ccce5c0 100644
101954--- a/include/uapi/linux/byteorder/little_endian.h
101955+++ b/include/uapi/linux/byteorder/little_endian.h
101956@@ -42,51 +42,51 @@
101957
101958 static inline __le64 __cpu_to_le64p(const __u64 *p)
101959 {
101960- return (__force __le64)*p;
101961+ return (__force const __le64)*p;
101962 }
101963-static inline __u64 __le64_to_cpup(const __le64 *p)
101964+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
101965 {
101966- return (__force __u64)*p;
101967+ return (__force const __u64)*p;
101968 }
101969 static inline __le32 __cpu_to_le32p(const __u32 *p)
101970 {
101971- return (__force __le32)*p;
101972+ return (__force const __le32)*p;
101973 }
101974 static inline __u32 __le32_to_cpup(const __le32 *p)
101975 {
101976- return (__force __u32)*p;
101977+ return (__force const __u32)*p;
101978 }
101979 static inline __le16 __cpu_to_le16p(const __u16 *p)
101980 {
101981- return (__force __le16)*p;
101982+ return (__force const __le16)*p;
101983 }
101984 static inline __u16 __le16_to_cpup(const __le16 *p)
101985 {
101986- return (__force __u16)*p;
101987+ return (__force const __u16)*p;
101988 }
101989 static inline __be64 __cpu_to_be64p(const __u64 *p)
101990 {
101991- return (__force __be64)__swab64p(p);
101992+ return (__force const __be64)__swab64p(p);
101993 }
101994 static inline __u64 __be64_to_cpup(const __be64 *p)
101995 {
101996- return __swab64p((__u64 *)p);
101997+ return __swab64p((const __u64 *)p);
101998 }
101999 static inline __be32 __cpu_to_be32p(const __u32 *p)
102000 {
102001- return (__force __be32)__swab32p(p);
102002+ return (__force const __be32)__swab32p(p);
102003 }
102004-static inline __u32 __be32_to_cpup(const __be32 *p)
102005+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
102006 {
102007- return __swab32p((__u32 *)p);
102008+ return __swab32p((const __u32 *)p);
102009 }
102010 static inline __be16 __cpu_to_be16p(const __u16 *p)
102011 {
102012- return (__force __be16)__swab16p(p);
102013+ return (__force const __be16)__swab16p(p);
102014 }
102015 static inline __u16 __be16_to_cpup(const __be16 *p)
102016 {
102017- return __swab16p((__u16 *)p);
102018+ return __swab16p((const __u16 *)p);
102019 }
102020 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
102021 #define __le64_to_cpus(x) do { (void)(x); } while (0)
102022diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
102023index 71e1d0e..6cc9caf 100644
102024--- a/include/uapi/linux/elf.h
102025+++ b/include/uapi/linux/elf.h
102026@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
102027 #define PT_GNU_EH_FRAME 0x6474e550
102028
102029 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
102030+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
102031+
102032+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
102033+
102034+/* Constants for the e_flags field */
102035+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
102036+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
102037+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
102038+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
102039+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
102040+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
102041
102042 /*
102043 * Extended Numbering
102044@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
102045 #define DT_DEBUG 21
102046 #define DT_TEXTREL 22
102047 #define DT_JMPREL 23
102048+#define DT_FLAGS 30
102049+ #define DF_TEXTREL 0x00000004
102050 #define DT_ENCODING 32
102051 #define OLD_DT_LOOS 0x60000000
102052 #define DT_LOOS 0x6000000d
102053@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
102054 #define PF_W 0x2
102055 #define PF_X 0x1
102056
102057+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
102058+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
102059+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
102060+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
102061+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
102062+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
102063+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
102064+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
102065+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
102066+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
102067+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
102068+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
102069+
102070 typedef struct elf32_phdr{
102071 Elf32_Word p_type;
102072 Elf32_Off p_offset;
102073@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
102074 #define EI_OSABI 7
102075 #define EI_PAD 8
102076
102077+#define EI_PAX 14
102078+
102079 #define ELFMAG0 0x7f /* EI_MAG */
102080 #define ELFMAG1 'E'
102081 #define ELFMAG2 'L'
102082diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
102083index aa169c4..6a2771d 100644
102084--- a/include/uapi/linux/personality.h
102085+++ b/include/uapi/linux/personality.h
102086@@ -30,6 +30,7 @@ enum {
102087 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
102088 ADDR_NO_RANDOMIZE | \
102089 ADDR_COMPAT_LAYOUT | \
102090+ ADDR_LIMIT_3GB | \
102091 MMAP_PAGE_ZERO)
102092
102093 /*
102094diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
102095index 7530e74..e714828 100644
102096--- a/include/uapi/linux/screen_info.h
102097+++ b/include/uapi/linux/screen_info.h
102098@@ -43,7 +43,8 @@ struct screen_info {
102099 __u16 pages; /* 0x32 */
102100 __u16 vesa_attributes; /* 0x34 */
102101 __u32 capabilities; /* 0x36 */
102102- __u8 _reserved[6]; /* 0x3a */
102103+ __u16 vesapm_size; /* 0x3a */
102104+ __u8 _reserved[4]; /* 0x3c */
102105 } __attribute__((packed));
102106
102107 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
102108diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
102109index 0e011eb..82681b1 100644
102110--- a/include/uapi/linux/swab.h
102111+++ b/include/uapi/linux/swab.h
102112@@ -43,7 +43,7 @@
102113 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
102114 */
102115
102116-static inline __attribute_const__ __u16 __fswab16(__u16 val)
102117+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
102118 {
102119 #ifdef __HAVE_BUILTIN_BSWAP16__
102120 return __builtin_bswap16(val);
102121@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
102122 #endif
102123 }
102124
102125-static inline __attribute_const__ __u32 __fswab32(__u32 val)
102126+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
102127 {
102128 #ifdef __HAVE_BUILTIN_BSWAP32__
102129 return __builtin_bswap32(val);
102130@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
102131 #endif
102132 }
102133
102134-static inline __attribute_const__ __u64 __fswab64(__u64 val)
102135+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
102136 {
102137 #ifdef __HAVE_BUILTIN_BSWAP64__
102138 return __builtin_bswap64(val);
102139diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
102140index 1590c49..5eab462 100644
102141--- a/include/uapi/linux/xattr.h
102142+++ b/include/uapi/linux/xattr.h
102143@@ -73,5 +73,9 @@
102144 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
102145 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
102146
102147+/* User namespace */
102148+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
102149+#define XATTR_PAX_FLAGS_SUFFIX "flags"
102150+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
102151
102152 #endif /* _UAPI_LINUX_XATTR_H */
102153diff --git a/include/video/udlfb.h b/include/video/udlfb.h
102154index f9466fa..f4e2b81 100644
102155--- a/include/video/udlfb.h
102156+++ b/include/video/udlfb.h
102157@@ -53,10 +53,10 @@ struct dlfb_data {
102158 u32 pseudo_palette[256];
102159 int blank_mode; /*one of FB_BLANK_ */
102160 /* blit-only rendering path metrics, exposed through sysfs */
102161- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102162- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
102163- atomic_t bytes_sent; /* to usb, after compression including overhead */
102164- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
102165+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102166+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
102167+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
102168+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
102169 };
102170
102171 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
102172diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
102173index 30f5362..8ed8ac9 100644
102174--- a/include/video/uvesafb.h
102175+++ b/include/video/uvesafb.h
102176@@ -122,6 +122,7 @@ struct uvesafb_par {
102177 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
102178 u8 pmi_setpal; /* PMI for palette changes */
102179 u16 *pmi_base; /* protected mode interface location */
102180+ u8 *pmi_code; /* protected mode code location */
102181 void *pmi_start;
102182 void *pmi_pal;
102183 u8 *vbe_state_orig; /*
102184diff --git a/init/Kconfig b/init/Kconfig
102185index dc24dec..b77638f 100644
102186--- a/init/Kconfig
102187+++ b/init/Kconfig
102188@@ -1145,6 +1145,7 @@ endif # CGROUPS
102189
102190 config CHECKPOINT_RESTORE
102191 bool "Checkpoint/restore support" if EXPERT
102192+ depends on !GRKERNSEC
102193 default n
102194 help
102195 Enables additional kernel features in a sake of checkpoint/restore.
102196@@ -1670,7 +1671,7 @@ config SLUB_DEBUG
102197
102198 config COMPAT_BRK
102199 bool "Disable heap randomization"
102200- default y
102201+ default n
102202 help
102203 Randomizing heap placement makes heap exploits harder, but it
102204 also breaks ancient binaries (including anything libc5 based).
102205@@ -2001,7 +2002,7 @@ config INIT_ALL_POSSIBLE
102206 config STOP_MACHINE
102207 bool
102208 default y
102209- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
102210+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
102211 help
102212 Need stop_machine() primitive.
102213
102214diff --git a/init/Makefile b/init/Makefile
102215index 7bc47ee..6da2dc7 100644
102216--- a/init/Makefile
102217+++ b/init/Makefile
102218@@ -2,6 +2,9 @@
102219 # Makefile for the linux kernel.
102220 #
102221
102222+ccflags-y := $(GCC_PLUGINS_CFLAGS)
102223+asflags-y := $(GCC_PLUGINS_AFLAGS)
102224+
102225 obj-y := main.o version.o mounts.o
102226 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
102227 obj-y += noinitramfs.o
102228diff --git a/init/do_mounts.c b/init/do_mounts.c
102229index a95bbdb..82c48fd 100644
102230--- a/init/do_mounts.c
102231+++ b/init/do_mounts.c
102232@@ -363,11 +363,11 @@ static void __init get_fs_names(char *page)
102233 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
102234 {
102235 struct super_block *s;
102236- int err = sys_mount(name, "/root", fs, flags, data);
102237+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
102238 if (err)
102239 return err;
102240
102241- sys_chdir("/root");
102242+ sys_chdir((const char __force_user *)"/root");
102243 s = current->fs->pwd.dentry->d_sb;
102244 ROOT_DEV = s->s_dev;
102245 printk(KERN_INFO
102246@@ -490,18 +490,18 @@ void __init change_floppy(char *fmt, ...)
102247 va_start(args, fmt);
102248 vsprintf(buf, fmt, args);
102249 va_end(args);
102250- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
102251+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
102252 if (fd >= 0) {
102253 sys_ioctl(fd, FDEJECT, 0);
102254 sys_close(fd);
102255 }
102256 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
102257- fd = sys_open("/dev/console", O_RDWR, 0);
102258+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
102259 if (fd >= 0) {
102260 sys_ioctl(fd, TCGETS, (long)&termios);
102261 termios.c_lflag &= ~ICANON;
102262 sys_ioctl(fd, TCSETSF, (long)&termios);
102263- sys_read(fd, &c, 1);
102264+ sys_read(fd, (char __user *)&c, 1);
102265 termios.c_lflag |= ICANON;
102266 sys_ioctl(fd, TCSETSF, (long)&termios);
102267 sys_close(fd);
102268@@ -595,8 +595,8 @@ void __init prepare_namespace(void)
102269 mount_root();
102270 out:
102271 devtmpfs_mount("dev");
102272- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102273- sys_chroot(".");
102274+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102275+ sys_chroot((const char __force_user *)".");
102276 }
102277
102278 static bool is_tmpfs;
102279diff --git a/init/do_mounts.h b/init/do_mounts.h
102280index f5b978a..69dbfe8 100644
102281--- a/init/do_mounts.h
102282+++ b/init/do_mounts.h
102283@@ -15,15 +15,15 @@ extern int root_mountflags;
102284
102285 static inline int create_dev(char *name, dev_t dev)
102286 {
102287- sys_unlink(name);
102288- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
102289+ sys_unlink((char __force_user *)name);
102290+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
102291 }
102292
102293 #if BITS_PER_LONG == 32
102294 static inline u32 bstat(char *name)
102295 {
102296 struct stat64 stat;
102297- if (sys_stat64(name, &stat) != 0)
102298+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
102299 return 0;
102300 if (!S_ISBLK(stat.st_mode))
102301 return 0;
102302@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
102303 static inline u32 bstat(char *name)
102304 {
102305 struct stat stat;
102306- if (sys_newstat(name, &stat) != 0)
102307+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
102308 return 0;
102309 if (!S_ISBLK(stat.st_mode))
102310 return 0;
102311diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
102312index 3e0878e..8a9d7a0 100644
102313--- a/init/do_mounts_initrd.c
102314+++ b/init/do_mounts_initrd.c
102315@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
102316 {
102317 sys_unshare(CLONE_FS | CLONE_FILES);
102318 /* stdin/stdout/stderr for /linuxrc */
102319- sys_open("/dev/console", O_RDWR, 0);
102320+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
102321 sys_dup(0);
102322 sys_dup(0);
102323 /* move initrd over / and chdir/chroot in initrd root */
102324- sys_chdir("/root");
102325- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102326- sys_chroot(".");
102327+ sys_chdir((const char __force_user *)"/root");
102328+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102329+ sys_chroot((const char __force_user *)".");
102330 sys_setsid();
102331 return 0;
102332 }
102333@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
102334 create_dev("/dev/root.old", Root_RAM0);
102335 /* mount initrd on rootfs' /root */
102336 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
102337- sys_mkdir("/old", 0700);
102338- sys_chdir("/old");
102339+ sys_mkdir((const char __force_user *)"/old", 0700);
102340+ sys_chdir((const char __force_user *)"/old");
102341
102342 /* try loading default modules from initrd */
102343 load_default_modules();
102344@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
102345 current->flags &= ~PF_FREEZER_SKIP;
102346
102347 /* move initrd to rootfs' /old */
102348- sys_mount("..", ".", NULL, MS_MOVE, NULL);
102349+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
102350 /* switch root and cwd back to / of rootfs */
102351- sys_chroot("..");
102352+ sys_chroot((const char __force_user *)"..");
102353
102354 if (new_decode_dev(real_root_dev) == Root_RAM0) {
102355- sys_chdir("/old");
102356+ sys_chdir((const char __force_user *)"/old");
102357 return;
102358 }
102359
102360- sys_chdir("/");
102361+ sys_chdir((const char __force_user *)"/");
102362 ROOT_DEV = new_decode_dev(real_root_dev);
102363 mount_root();
102364
102365 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
102366- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
102367+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
102368 if (!error)
102369 printk("okay\n");
102370 else {
102371- int fd = sys_open("/dev/root.old", O_RDWR, 0);
102372+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
102373 if (error == -ENOENT)
102374 printk("/initrd does not exist. Ignored.\n");
102375 else
102376 printk("failed\n");
102377 printk(KERN_NOTICE "Unmounting old root\n");
102378- sys_umount("/old", MNT_DETACH);
102379+ sys_umount((char __force_user *)"/old", MNT_DETACH);
102380 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
102381 if (fd < 0) {
102382 error = fd;
102383@@ -127,11 +127,11 @@ int __init initrd_load(void)
102384 * mounted in the normal path.
102385 */
102386 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
102387- sys_unlink("/initrd.image");
102388+ sys_unlink((const char __force_user *)"/initrd.image");
102389 handle_initrd();
102390 return 1;
102391 }
102392 }
102393- sys_unlink("/initrd.image");
102394+ sys_unlink((const char __force_user *)"/initrd.image");
102395 return 0;
102396 }
102397diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
102398index 8cb6db5..d729f50 100644
102399--- a/init/do_mounts_md.c
102400+++ b/init/do_mounts_md.c
102401@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
102402 partitioned ? "_d" : "", minor,
102403 md_setup_args[ent].device_names);
102404
102405- fd = sys_open(name, 0, 0);
102406+ fd = sys_open((char __force_user *)name, 0, 0);
102407 if (fd < 0) {
102408 printk(KERN_ERR "md: open failed - cannot start "
102409 "array %s\n", name);
102410@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
102411 * array without it
102412 */
102413 sys_close(fd);
102414- fd = sys_open(name, 0, 0);
102415+ fd = sys_open((char __force_user *)name, 0, 0);
102416 sys_ioctl(fd, BLKRRPART, 0);
102417 }
102418 sys_close(fd);
102419@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
102420
102421 wait_for_device_probe();
102422
102423- fd = sys_open("/dev/md0", 0, 0);
102424+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
102425 if (fd >= 0) {
102426 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
102427 sys_close(fd);
102428diff --git a/init/init_task.c b/init/init_task.c
102429index ba0a7f36..2bcf1d5 100644
102430--- a/init/init_task.c
102431+++ b/init/init_task.c
102432@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
102433 * Initial thread structure. Alignment of this is handled by a special
102434 * linker map entry.
102435 */
102436+#ifdef CONFIG_X86
102437+union thread_union init_thread_union __init_task_data;
102438+#else
102439 union thread_union init_thread_union __init_task_data =
102440 { INIT_THREAD_INFO(init_task) };
102441+#endif
102442diff --git a/init/initramfs.c b/init/initramfs.c
102443index ad1bd77..dca2c1b 100644
102444--- a/init/initramfs.c
102445+++ b/init/initramfs.c
102446@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
102447
102448 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
102449 while (count) {
102450- ssize_t rv = sys_write(fd, p, count);
102451+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
102452
102453 if (rv < 0) {
102454 if (rv == -EINTR || rv == -EAGAIN)
102455@@ -107,7 +107,7 @@ static void __init free_hash(void)
102456 }
102457 }
102458
102459-static long __init do_utime(char *filename, time_t mtime)
102460+static long __init do_utime(char __force_user *filename, time_t mtime)
102461 {
102462 struct timespec t[2];
102463
102464@@ -142,7 +142,7 @@ static void __init dir_utime(void)
102465 struct dir_entry *de, *tmp;
102466 list_for_each_entry_safe(de, tmp, &dir_list, list) {
102467 list_del(&de->list);
102468- do_utime(de->name, de->mtime);
102469+ do_utime((char __force_user *)de->name, de->mtime);
102470 kfree(de->name);
102471 kfree(de);
102472 }
102473@@ -304,7 +304,7 @@ static int __init maybe_link(void)
102474 if (nlink >= 2) {
102475 char *old = find_link(major, minor, ino, mode, collected);
102476 if (old)
102477- return (sys_link(old, collected) < 0) ? -1 : 1;
102478+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
102479 }
102480 return 0;
102481 }
102482@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
102483 {
102484 struct stat st;
102485
102486- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
102487+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
102488 if (S_ISDIR(st.st_mode))
102489- sys_rmdir(path);
102490+ sys_rmdir((char __force_user *)path);
102491 else
102492- sys_unlink(path);
102493+ sys_unlink((char __force_user *)path);
102494 }
102495 }
102496
102497@@ -338,7 +338,7 @@ static int __init do_name(void)
102498 int openflags = O_WRONLY|O_CREAT;
102499 if (ml != 1)
102500 openflags |= O_TRUNC;
102501- wfd = sys_open(collected, openflags, mode);
102502+ wfd = sys_open((char __force_user *)collected, openflags, mode);
102503
102504 if (wfd >= 0) {
102505 sys_fchown(wfd, uid, gid);
102506@@ -350,17 +350,17 @@ static int __init do_name(void)
102507 }
102508 }
102509 } else if (S_ISDIR(mode)) {
102510- sys_mkdir(collected, mode);
102511- sys_chown(collected, uid, gid);
102512- sys_chmod(collected, mode);
102513+ sys_mkdir((char __force_user *)collected, mode);
102514+ sys_chown((char __force_user *)collected, uid, gid);
102515+ sys_chmod((char __force_user *)collected, mode);
102516 dir_add(collected, mtime);
102517 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
102518 S_ISFIFO(mode) || S_ISSOCK(mode)) {
102519 if (maybe_link() == 0) {
102520- sys_mknod(collected, mode, rdev);
102521- sys_chown(collected, uid, gid);
102522- sys_chmod(collected, mode);
102523- do_utime(collected, mtime);
102524+ sys_mknod((char __force_user *)collected, mode, rdev);
102525+ sys_chown((char __force_user *)collected, uid, gid);
102526+ sys_chmod((char __force_user *)collected, mode);
102527+ do_utime((char __force_user *)collected, mtime);
102528 }
102529 }
102530 return 0;
102531@@ -372,7 +372,7 @@ static int __init do_copy(void)
102532 if (xwrite(wfd, victim, body_len) != body_len)
102533 error("write error");
102534 sys_close(wfd);
102535- do_utime(vcollected, mtime);
102536+ do_utime((char __force_user *)vcollected, mtime);
102537 kfree(vcollected);
102538 eat(body_len);
102539 state = SkipIt;
102540@@ -390,9 +390,9 @@ static int __init do_symlink(void)
102541 {
102542 collected[N_ALIGN(name_len) + body_len] = '\0';
102543 clean_path(collected, 0);
102544- sys_symlink(collected + N_ALIGN(name_len), collected);
102545- sys_lchown(collected, uid, gid);
102546- do_utime(collected, mtime);
102547+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
102548+ sys_lchown((char __force_user *)collected, uid, gid);
102549+ do_utime((char __force_user *)collected, mtime);
102550 state = SkipIt;
102551 next_state = Reset;
102552 return 0;
102553diff --git a/init/main.c b/init/main.c
102554index 2a89545..58711ee 100644
102555--- a/init/main.c
102556+++ b/init/main.c
102557@@ -97,6 +97,8 @@ extern void radix_tree_init(void);
102558 static inline void mark_rodata_ro(void) { }
102559 #endif
102560
102561+extern void grsecurity_init(void);
102562+
102563 /*
102564 * Debug helper: via this flag we know that we are in 'early bootup code'
102565 * where only the boot processor is running with IRQ disabled. This means
102566@@ -158,6 +160,37 @@ static int __init set_reset_devices(char *str)
102567
102568 __setup("reset_devices", set_reset_devices);
102569
102570+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
102571+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
102572+static int __init setup_grsec_proc_gid(char *str)
102573+{
102574+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
102575+ return 1;
102576+}
102577+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
102578+#endif
102579+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
102580+int grsec_enable_sysfs_restrict = 1;
102581+static int __init setup_grsec_sysfs_restrict(char *str)
102582+{
102583+ if (!simple_strtol(str, NULL, 0))
102584+ grsec_enable_sysfs_restrict = 0;
102585+ return 1;
102586+}
102587+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
102588+#endif
102589+
102590+#ifdef CONFIG_PAX_SOFTMODE
102591+int pax_softmode;
102592+
102593+static int __init setup_pax_softmode(char *str)
102594+{
102595+ get_option(&str, &pax_softmode);
102596+ return 1;
102597+}
102598+__setup("pax_softmode=", setup_pax_softmode);
102599+#endif
102600+
102601 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
102602 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
102603 static const char *panic_later, *panic_param;
102604@@ -726,7 +759,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
102605 struct blacklist_entry *entry;
102606 char *fn_name;
102607
102608- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
102609+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
102610 if (!fn_name)
102611 return false;
102612
102613@@ -778,7 +811,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
102614 {
102615 int count = preempt_count();
102616 int ret;
102617- char msgbuf[64];
102618+ const char *msg1 = "", *msg2 = "";
102619
102620 if (initcall_blacklisted(fn))
102621 return -EPERM;
102622@@ -788,18 +821,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
102623 else
102624 ret = fn();
102625
102626- msgbuf[0] = 0;
102627-
102628 if (preempt_count() != count) {
102629- sprintf(msgbuf, "preemption imbalance ");
102630+ msg1 = " preemption imbalance";
102631 preempt_count_set(count);
102632 }
102633 if (irqs_disabled()) {
102634- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
102635+ msg2 = " disabled interrupts";
102636 local_irq_enable();
102637 }
102638- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
102639+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
102640
102641+ add_latent_entropy();
102642 return ret;
102643 }
102644
102645@@ -905,8 +937,8 @@ static int run_init_process(const char *init_filename)
102646 {
102647 argv_init[0] = init_filename;
102648 return do_execve(getname_kernel(init_filename),
102649- (const char __user *const __user *)argv_init,
102650- (const char __user *const __user *)envp_init);
102651+ (const char __user *const __force_user *)argv_init,
102652+ (const char __user *const __force_user *)envp_init);
102653 }
102654
102655 static int try_to_run_init_process(const char *init_filename)
102656@@ -923,6 +955,10 @@ static int try_to_run_init_process(const char *init_filename)
102657 return ret;
102658 }
102659
102660+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102661+extern int gr_init_ran;
102662+#endif
102663+
102664 static noinline void __init kernel_init_freeable(void);
102665
102666 static int __ref kernel_init(void *unused)
102667@@ -947,6 +983,11 @@ static int __ref kernel_init(void *unused)
102668 ramdisk_execute_command, ret);
102669 }
102670
102671+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102672+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
102673+ gr_init_ran = 1;
102674+#endif
102675+
102676 /*
102677 * We try each of these until one succeeds.
102678 *
102679@@ -1002,7 +1043,7 @@ static noinline void __init kernel_init_freeable(void)
102680 do_basic_setup();
102681
102682 /* Open the /dev/console on the rootfs, this should never fail */
102683- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
102684+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
102685 pr_err("Warning: unable to open an initial console.\n");
102686
102687 (void) sys_dup(0);
102688@@ -1015,11 +1056,13 @@ static noinline void __init kernel_init_freeable(void)
102689 if (!ramdisk_execute_command)
102690 ramdisk_execute_command = "/init";
102691
102692- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
102693+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
102694 ramdisk_execute_command = NULL;
102695 prepare_namespace();
102696 }
102697
102698+ grsecurity_init();
102699+
102700 /*
102701 * Ok, we have completed the initial bootup, and
102702 * we're essentially up and running. Get rid of the
102703diff --git a/ipc/compat.c b/ipc/compat.c
102704index 9b3c85f..5266b0f 100644
102705--- a/ipc/compat.c
102706+++ b/ipc/compat.c
102707@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
102708 COMPAT_SHMLBA);
102709 if (err < 0)
102710 return err;
102711- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
102712+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
102713 }
102714 case SHMDT:
102715 return sys_shmdt(compat_ptr(ptr));
102716@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
102717 }
102718
102719 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
102720- unsigned, nsops,
102721+ compat_long_t, nsops,
102722 const struct compat_timespec __user *, timeout)
102723 {
102724 struct timespec __user *ts64;
102725diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
102726index 8ad93c2..efd80f8 100644
102727--- a/ipc/ipc_sysctl.c
102728+++ b/ipc/ipc_sysctl.c
102729@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
102730 static int proc_ipc_dointvec(struct ctl_table *table, int write,
102731 void __user *buffer, size_t *lenp, loff_t *ppos)
102732 {
102733- struct ctl_table ipc_table;
102734+ ctl_table_no_const ipc_table;
102735
102736 memcpy(&ipc_table, table, sizeof(ipc_table));
102737 ipc_table.data = get_ipc(table);
102738@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
102739 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
102740 void __user *buffer, size_t *lenp, loff_t *ppos)
102741 {
102742- struct ctl_table ipc_table;
102743+ ctl_table_no_const ipc_table;
102744
102745 memcpy(&ipc_table, table, sizeof(ipc_table));
102746 ipc_table.data = get_ipc(table);
102747@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
102748 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
102749 void __user *buffer, size_t *lenp, loff_t *ppos)
102750 {
102751- struct ctl_table ipc_table;
102752+ ctl_table_no_const ipc_table;
102753 memcpy(&ipc_table, table, sizeof(ipc_table));
102754 ipc_table.data = get_ipc(table);
102755
102756@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
102757 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
102758 void __user *buffer, size_t *lenp, loff_t *ppos)
102759 {
102760- struct ctl_table ipc_table;
102761+ ctl_table_no_const ipc_table;
102762 int dummy = 0;
102763
102764 memcpy(&ipc_table, table, sizeof(ipc_table));
102765diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
102766index 68d4e95..1477ded 100644
102767--- a/ipc/mq_sysctl.c
102768+++ b/ipc/mq_sysctl.c
102769@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
102770 static int proc_mq_dointvec(struct ctl_table *table, int write,
102771 void __user *buffer, size_t *lenp, loff_t *ppos)
102772 {
102773- struct ctl_table mq_table;
102774+ ctl_table_no_const mq_table;
102775 memcpy(&mq_table, table, sizeof(mq_table));
102776 mq_table.data = get_mq(table);
102777
102778@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
102779 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
102780 void __user *buffer, size_t *lenp, loff_t *ppos)
102781 {
102782- struct ctl_table mq_table;
102783+ ctl_table_no_const mq_table;
102784 memcpy(&mq_table, table, sizeof(mq_table));
102785 mq_table.data = get_mq(table);
102786
102787diff --git a/ipc/mqueue.c b/ipc/mqueue.c
102788index c3fc5c2..1f32fe2 100644
102789--- a/ipc/mqueue.c
102790+++ b/ipc/mqueue.c
102791@@ -275,6 +275,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
102792 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
102793 info->attr.mq_msgsize);
102794
102795+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
102796 spin_lock(&mq_lock);
102797 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
102798 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
102799diff --git a/ipc/sem.c b/ipc/sem.c
102800index c50aa57..07e9531 100644
102801--- a/ipc/sem.c
102802+++ b/ipc/sem.c
102803@@ -1790,7 +1790,7 @@ static int get_queue_result(struct sem_queue *q)
102804 }
102805
102806 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
102807- unsigned, nsops, const struct timespec __user *, timeout)
102808+ long, nsops, const struct timespec __user *, timeout)
102809 {
102810 int error = -EINVAL;
102811 struct sem_array *sma;
102812@@ -2025,7 +2025,7 @@ out_free:
102813 }
102814
102815 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
102816- unsigned, nsops)
102817+ long, nsops)
102818 {
102819 return sys_semtimedop(semid, tsops, nsops, NULL);
102820 }
102821diff --git a/ipc/shm.c b/ipc/shm.c
102822index 6d76707..b646bbe 100644
102823--- a/ipc/shm.c
102824+++ b/ipc/shm.c
102825@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
102826 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
102827 #endif
102828
102829+#ifdef CONFIG_GRKERNSEC
102830+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102831+ const u64 shm_createtime, const kuid_t cuid,
102832+ const int shmid);
102833+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102834+ const u64 shm_createtime);
102835+#endif
102836+
102837 void shm_init_ns(struct ipc_namespace *ns)
102838 {
102839 ns->shm_ctlmax = SHMMAX;
102840@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
102841 shp->shm_lprid = 0;
102842 shp->shm_atim = shp->shm_dtim = 0;
102843 shp->shm_ctim = get_seconds();
102844+#ifdef CONFIG_GRKERNSEC
102845+ shp->shm_createtime = ktime_get_ns();
102846+#endif
102847 shp->shm_segsz = size;
102848 shp->shm_nattch = 0;
102849 shp->shm_file = file;
102850@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102851 f_mode = FMODE_READ | FMODE_WRITE;
102852 }
102853 if (shmflg & SHM_EXEC) {
102854+
102855+#ifdef CONFIG_PAX_MPROTECT
102856+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
102857+ goto out;
102858+#endif
102859+
102860 prot |= PROT_EXEC;
102861 acc_mode |= S_IXUGO;
102862 }
102863@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102864 if (err)
102865 goto out_unlock;
102866
102867+#ifdef CONFIG_GRKERNSEC
102868+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
102869+ shp->shm_perm.cuid, shmid) ||
102870+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
102871+ err = -EACCES;
102872+ goto out_unlock;
102873+ }
102874+#endif
102875+
102876 ipc_lock_object(&shp->shm_perm);
102877
102878 /* check if shm_destroy() is tearing down shp */
102879@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102880 path = shp->shm_file->f_path;
102881 path_get(&path);
102882 shp->shm_nattch++;
102883+#ifdef CONFIG_GRKERNSEC
102884+ shp->shm_lapid = current->pid;
102885+#endif
102886 size = i_size_read(d_inode(path.dentry));
102887 ipc_unlock_object(&shp->shm_perm);
102888 rcu_read_unlock();
102889diff --git a/ipc/util.c b/ipc/util.c
102890index ff3323e..d6d63d1 100644
102891--- a/ipc/util.c
102892+++ b/ipc/util.c
102893@@ -71,6 +71,8 @@ struct ipc_proc_iface {
102894 int (*show)(struct seq_file *, void *);
102895 };
102896
102897+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
102898+
102899 /**
102900 * ipc_init - initialise ipc subsystem
102901 *
102902@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
102903 granted_mode >>= 6;
102904 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
102905 granted_mode >>= 3;
102906+
102907+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
102908+ return -1;
102909+
102910 /* is there some bit set in requested_mode but not in granted_mode? */
102911 if ((requested_mode & ~granted_mode & 0007) &&
102912 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
102913diff --git a/kernel/audit.c b/kernel/audit.c
102914index 1c13e42..6c171ab 100644
102915--- a/kernel/audit.c
102916+++ b/kernel/audit.c
102917@@ -124,7 +124,7 @@ u32 audit_sig_sid = 0;
102918 3) suppressed due to audit_rate_limit
102919 4) suppressed due to audit_backlog_limit
102920 */
102921-static atomic_t audit_lost = ATOMIC_INIT(0);
102922+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
102923
102924 /* The netlink socket. */
102925 static struct sock *audit_sock;
102926@@ -258,7 +258,7 @@ void audit_log_lost(const char *message)
102927 unsigned long now;
102928 int print;
102929
102930- atomic_inc(&audit_lost);
102931+ atomic_inc_unchecked(&audit_lost);
102932
102933 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
102934
102935@@ -275,7 +275,7 @@ void audit_log_lost(const char *message)
102936 if (print) {
102937 if (printk_ratelimit())
102938 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
102939- atomic_read(&audit_lost),
102940+ atomic_read_unchecked(&audit_lost),
102941 audit_rate_limit,
102942 audit_backlog_limit);
102943 audit_panic(message);
102944@@ -833,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
102945 s.pid = audit_pid;
102946 s.rate_limit = audit_rate_limit;
102947 s.backlog_limit = audit_backlog_limit;
102948- s.lost = atomic_read(&audit_lost);
102949+ s.lost = atomic_read_unchecked(&audit_lost);
102950 s.backlog = skb_queue_len(&audit_skb_queue);
102951 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
102952 s.backlog_wait_time = audit_backlog_wait_time_master;
102953diff --git a/kernel/auditsc.c b/kernel/auditsc.c
102954index 9fb9d1c..afb1610 100644
102955--- a/kernel/auditsc.c
102956+++ b/kernel/auditsc.c
102957@@ -1023,7 +1023,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
102958 * for strings that are too long, we should not have created
102959 * any.
102960 */
102961- if (unlikely((len == -1) || len > MAX_ARG_STRLEN - 1)) {
102962+ if (unlikely(len > MAX_ARG_STRLEN - 1)) {
102963 WARN_ON(1);
102964 send_sig(SIGKILL, current, 0);
102965 return -1;
102966@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
102967 }
102968
102969 /* global counter which is incremented every time something logs in */
102970-static atomic_t session_id = ATOMIC_INIT(0);
102971+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
102972
102973 static int audit_set_loginuid_perm(kuid_t loginuid)
102974 {
102975@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
102976
102977 /* are we setting or clearing? */
102978 if (uid_valid(loginuid))
102979- sessionid = (unsigned int)atomic_inc_return(&session_id);
102980+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
102981
102982 task->sessionid = sessionid;
102983 task->loginuid = loginuid;
102984diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
102985index 54f0e7f..fed997b 100644
102986--- a/kernel/bpf/core.c
102987+++ b/kernel/bpf/core.c
102988@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
102989 * random section of illegal instructions.
102990 */
102991 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
102992- hdr = module_alloc(size);
102993+ hdr = module_alloc_exec(size);
102994 if (hdr == NULL)
102995 return NULL;
102996
102997 /* Fill space with illegal/arch-dep instructions. */
102998 bpf_fill_ill_insns(hdr, size);
102999
103000+ pax_open_kernel();
103001 hdr->pages = size / PAGE_SIZE;
103002+ pax_close_kernel();
103003+
103004 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
103005 PAGE_SIZE - sizeof(*hdr));
103006 start = (prandom_u32() % hole) & ~(alignment - 1);
103007@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
103008
103009 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
103010 {
103011- module_memfree(hdr);
103012+ module_memfree_exec(hdr);
103013 }
103014 #endif /* CONFIG_BPF_JIT */
103015
103016diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
103017index 3bae6c5..59ea175 100644
103018--- a/kernel/bpf/syscall.c
103019+++ b/kernel/bpf/syscall.c
103020@@ -554,11 +554,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
103021 int err;
103022
103023 /* the syscall is limited to root temporarily. This restriction will be
103024- * lifted when security audit is clean. Note that eBPF+tracing must have
103025- * this restriction, since it may pass kernel data to user space
103026+ * lifted by upstream when a half-assed security audit is clean. Note
103027+ * that eBPF+tracing must have this restriction, since it may pass
103028+ * kernel data to user space
103029 */
103030 if (!capable(CAP_SYS_ADMIN))
103031 return -EPERM;
103032+#ifdef CONFIG_GRKERNSEC
103033+ return -EPERM;
103034+#endif
103035
103036 if (!access_ok(VERIFY_READ, uattr, 1))
103037 return -EFAULT;
103038diff --git a/kernel/capability.c b/kernel/capability.c
103039index 45432b5..988f1e4 100644
103040--- a/kernel/capability.c
103041+++ b/kernel/capability.c
103042@@ -193,6 +193,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
103043 * before modification is attempted and the application
103044 * fails.
103045 */
103046+ if (tocopy > ARRAY_SIZE(kdata))
103047+ return -EFAULT;
103048+
103049 if (copy_to_user(dataptr, kdata, tocopy
103050 * sizeof(struct __user_cap_data_struct))) {
103051 return -EFAULT;
103052@@ -298,10 +301,11 @@ bool has_ns_capability(struct task_struct *t,
103053 int ret;
103054
103055 rcu_read_lock();
103056- ret = security_capable(__task_cred(t), ns, cap);
103057+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
103058+ gr_task_is_capable(t, __task_cred(t), cap);
103059 rcu_read_unlock();
103060
103061- return (ret == 0);
103062+ return ret;
103063 }
103064
103065 /**
103066@@ -338,10 +342,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
103067 int ret;
103068
103069 rcu_read_lock();
103070- ret = security_capable_noaudit(__task_cred(t), ns, cap);
103071+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
103072 rcu_read_unlock();
103073
103074- return (ret == 0);
103075+ return ret;
103076 }
103077
103078 /**
103079@@ -379,7 +383,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
103080 BUG();
103081 }
103082
103083- if (security_capable(current_cred(), ns, cap) == 0) {
103084+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
103085 current->flags |= PF_SUPERPRIV;
103086 return true;
103087 }
103088@@ -387,6 +391,20 @@ bool ns_capable(struct user_namespace *ns, int cap)
103089 }
103090 EXPORT_SYMBOL(ns_capable);
103091
103092+bool ns_capable_nolog(struct user_namespace *ns, int cap)
103093+{
103094+ if (unlikely(!cap_valid(cap))) {
103095+ pr_crit("capable_nolog() called with invalid cap=%u\n", cap);
103096+ BUG();
103097+ }
103098+
103099+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
103100+ current->flags |= PF_SUPERPRIV;
103101+ return true;
103102+ }
103103+ return false;
103104+}
103105+EXPORT_SYMBOL(ns_capable_nolog);
103106
103107 /**
103108 * capable - Determine if the current task has a superior capability in effect
103109@@ -403,6 +421,13 @@ bool capable(int cap)
103110 return ns_capable(&init_user_ns, cap);
103111 }
103112 EXPORT_SYMBOL(capable);
103113+
103114+bool capable_nolog(int cap)
103115+{
103116+ return ns_capable_nolog(&init_user_ns, cap);
103117+}
103118+EXPORT_SYMBOL(capable_nolog);
103119+
103120 #endif /* CONFIG_MULTIUSER */
103121
103122 /**
103123@@ -447,3 +472,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
103124 kgid_has_mapping(ns, inode->i_gid);
103125 }
103126 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
103127+
103128+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
103129+{
103130+ struct user_namespace *ns = current_user_ns();
103131+
103132+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
103133+ kgid_has_mapping(ns, inode->i_gid);
103134+}
103135+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
103136diff --git a/kernel/cgroup.c b/kernel/cgroup.c
103137index e8a5491..ab4bfa3 100644
103138--- a/kernel/cgroup.c
103139+++ b/kernel/cgroup.c
103140@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
103141 if (!pathbuf || !agentbuf)
103142 goto out;
103143
103144+ if (agentbuf[0] == '\0')
103145+ goto out;
103146+
103147 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
103148 if (!path)
103149 goto out;
103150@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
103151 struct task_struct *task;
103152 int count = 0;
103153
103154- seq_printf(seq, "css_set %p\n", cset);
103155+ seq_printf(seq, "css_set %pK\n", cset);
103156
103157 list_for_each_entry(task, &cset->tasks, cg_list) {
103158 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
103159diff --git a/kernel/compat.c b/kernel/compat.c
103160index 333d364..762ec00 100644
103161--- a/kernel/compat.c
103162+++ b/kernel/compat.c
103163@@ -13,6 +13,7 @@
103164
103165 #include <linux/linkage.h>
103166 #include <linux/compat.h>
103167+#include <linux/module.h>
103168 #include <linux/errno.h>
103169 #include <linux/time.h>
103170 #include <linux/signal.h>
103171@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
103172 mm_segment_t oldfs;
103173 long ret;
103174
103175- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
103176+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
103177 oldfs = get_fs();
103178 set_fs(KERNEL_DS);
103179 ret = hrtimer_nanosleep_restart(restart);
103180@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
103181 oldfs = get_fs();
103182 set_fs(KERNEL_DS);
103183 ret = hrtimer_nanosleep(&tu,
103184- rmtp ? (struct timespec __user *)&rmt : NULL,
103185+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
103186 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
103187 set_fs(oldfs);
103188
103189@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
103190 mm_segment_t old_fs = get_fs();
103191
103192 set_fs(KERNEL_DS);
103193- ret = sys_sigpending((old_sigset_t __user *) &s);
103194+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
103195 set_fs(old_fs);
103196 if (ret == 0)
103197 ret = put_user(s, set);
103198@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
103199 mm_segment_t old_fs = get_fs();
103200
103201 set_fs(KERNEL_DS);
103202- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
103203+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
103204 set_fs(old_fs);
103205
103206 if (!ret) {
103207@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
103208 set_fs (KERNEL_DS);
103209 ret = sys_wait4(pid,
103210 (stat_addr ?
103211- (unsigned int __user *) &status : NULL),
103212- options, (struct rusage __user *) &r);
103213+ (unsigned int __force_user *) &status : NULL),
103214+ options, (struct rusage __force_user *) &r);
103215 set_fs (old_fs);
103216
103217 if (ret > 0) {
103218@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
103219 memset(&info, 0, sizeof(info));
103220
103221 set_fs(KERNEL_DS);
103222- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
103223- uru ? (struct rusage __user *)&ru : NULL);
103224+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
103225+ uru ? (struct rusage __force_user *)&ru : NULL);
103226 set_fs(old_fs);
103227
103228 if ((ret < 0) || (info.si_signo == 0))
103229@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
103230 oldfs = get_fs();
103231 set_fs(KERNEL_DS);
103232 err = sys_timer_settime(timer_id, flags,
103233- (struct itimerspec __user *) &newts,
103234- (struct itimerspec __user *) &oldts);
103235+ (struct itimerspec __force_user *) &newts,
103236+ (struct itimerspec __force_user *) &oldts);
103237 set_fs(oldfs);
103238 if (!err && old && put_compat_itimerspec(old, &oldts))
103239 return -EFAULT;
103240@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
103241 oldfs = get_fs();
103242 set_fs(KERNEL_DS);
103243 err = sys_timer_gettime(timer_id,
103244- (struct itimerspec __user *) &ts);
103245+ (struct itimerspec __force_user *) &ts);
103246 set_fs(oldfs);
103247 if (!err && put_compat_itimerspec(setting, &ts))
103248 return -EFAULT;
103249@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
103250 oldfs = get_fs();
103251 set_fs(KERNEL_DS);
103252 err = sys_clock_settime(which_clock,
103253- (struct timespec __user *) &ts);
103254+ (struct timespec __force_user *) &ts);
103255 set_fs(oldfs);
103256 return err;
103257 }
103258@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
103259 oldfs = get_fs();
103260 set_fs(KERNEL_DS);
103261 err = sys_clock_gettime(which_clock,
103262- (struct timespec __user *) &ts);
103263+ (struct timespec __force_user *) &ts);
103264 set_fs(oldfs);
103265 if (!err && compat_put_timespec(&ts, tp))
103266 return -EFAULT;
103267@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
103268
103269 oldfs = get_fs();
103270 set_fs(KERNEL_DS);
103271- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
103272+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
103273 set_fs(oldfs);
103274
103275 err = compat_put_timex(utp, &txc);
103276@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
103277 oldfs = get_fs();
103278 set_fs(KERNEL_DS);
103279 err = sys_clock_getres(which_clock,
103280- (struct timespec __user *) &ts);
103281+ (struct timespec __force_user *) &ts);
103282 set_fs(oldfs);
103283 if (!err && tp && compat_put_timespec(&ts, tp))
103284 return -EFAULT;
103285@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
103286 struct timespec tu;
103287 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
103288
103289- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
103290+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
103291 oldfs = get_fs();
103292 set_fs(KERNEL_DS);
103293 err = clock_nanosleep_restart(restart);
103294@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
103295 oldfs = get_fs();
103296 set_fs(KERNEL_DS);
103297 err = sys_clock_nanosleep(which_clock, flags,
103298- (struct timespec __user *) &in,
103299- (struct timespec __user *) &out);
103300+ (struct timespec __force_user *) &in,
103301+ (struct timespec __force_user *) &out);
103302 set_fs(oldfs);
103303
103304 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
103305@@ -1147,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
103306 mm_segment_t old_fs = get_fs();
103307
103308 set_fs(KERNEL_DS);
103309- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
103310+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
103311 set_fs(old_fs);
103312 if (compat_put_timespec(&t, interval))
103313 return -EFAULT;
103314diff --git a/kernel/configs.c b/kernel/configs.c
103315index c18b1f1..b9a0132 100644
103316--- a/kernel/configs.c
103317+++ b/kernel/configs.c
103318@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
103319 struct proc_dir_entry *entry;
103320
103321 /* create the current config file */
103322+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
103323+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
103324+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
103325+ &ikconfig_file_ops);
103326+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
103327+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
103328+ &ikconfig_file_ops);
103329+#endif
103330+#else
103331 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
103332 &ikconfig_file_ops);
103333+#endif
103334+
103335 if (!entry)
103336 return -ENOMEM;
103337
103338diff --git a/kernel/cred.c b/kernel/cred.c
103339index ec1c076..7da8a0e 100644
103340--- a/kernel/cred.c
103341+++ b/kernel/cred.c
103342@@ -167,6 +167,15 @@ void exit_creds(struct task_struct *tsk)
103343 validate_creds(cred);
103344 alter_cred_subscribers(cred, -1);
103345 put_cred(cred);
103346+
103347+#ifdef CONFIG_GRKERNSEC_SETXID
103348+ cred = (struct cred *) tsk->delayed_cred;
103349+ if (cred != NULL) {
103350+ tsk->delayed_cred = NULL;
103351+ validate_creds(cred);
103352+ put_cred(cred);
103353+ }
103354+#endif
103355 }
103356
103357 /**
103358@@ -414,7 +423,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
103359 * Always returns 0 thus allowing this function to be tail-called at the end
103360 * of, say, sys_setgid().
103361 */
103362-int commit_creds(struct cred *new)
103363+static int __commit_creds(struct cred *new)
103364 {
103365 struct task_struct *task = current;
103366 const struct cred *old = task->real_cred;
103367@@ -433,6 +442,8 @@ int commit_creds(struct cred *new)
103368
103369 get_cred(new); /* we will require a ref for the subj creds too */
103370
103371+ gr_set_role_label(task, new->uid, new->gid);
103372+
103373 /* dumpability changes */
103374 if (!uid_eq(old->euid, new->euid) ||
103375 !gid_eq(old->egid, new->egid) ||
103376@@ -482,6 +493,105 @@ int commit_creds(struct cred *new)
103377 put_cred(old);
103378 return 0;
103379 }
103380+#ifdef CONFIG_GRKERNSEC_SETXID
103381+extern int set_user(struct cred *new);
103382+
103383+void gr_delayed_cred_worker(void)
103384+{
103385+ const struct cred *new = current->delayed_cred;
103386+ struct cred *ncred;
103387+
103388+ current->delayed_cred = NULL;
103389+
103390+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
103391+ // from doing get_cred on it when queueing this
103392+ put_cred(new);
103393+ return;
103394+ } else if (new == NULL)
103395+ return;
103396+
103397+ ncred = prepare_creds();
103398+ if (!ncred)
103399+ goto die;
103400+ // uids
103401+ ncred->uid = new->uid;
103402+ ncred->euid = new->euid;
103403+ ncred->suid = new->suid;
103404+ ncred->fsuid = new->fsuid;
103405+ // gids
103406+ ncred->gid = new->gid;
103407+ ncred->egid = new->egid;
103408+ ncred->sgid = new->sgid;
103409+ ncred->fsgid = new->fsgid;
103410+ // groups
103411+ set_groups(ncred, new->group_info);
103412+ // caps
103413+ ncred->securebits = new->securebits;
103414+ ncred->cap_inheritable = new->cap_inheritable;
103415+ ncred->cap_permitted = new->cap_permitted;
103416+ ncred->cap_effective = new->cap_effective;
103417+ ncred->cap_bset = new->cap_bset;
103418+
103419+ if (set_user(ncred)) {
103420+ abort_creds(ncred);
103421+ goto die;
103422+ }
103423+
103424+ // from doing get_cred on it when queueing this
103425+ put_cred(new);
103426+
103427+ __commit_creds(ncred);
103428+ return;
103429+die:
103430+ // from doing get_cred on it when queueing this
103431+ put_cred(new);
103432+ do_group_exit(SIGKILL);
103433+}
103434+#endif
103435+
103436+int commit_creds(struct cred *new)
103437+{
103438+#ifdef CONFIG_GRKERNSEC_SETXID
103439+ int ret;
103440+ int schedule_it = 0;
103441+ struct task_struct *t;
103442+ unsigned oldsecurebits = current_cred()->securebits;
103443+
103444+ /* we won't get called with tasklist_lock held for writing
103445+ and interrupts disabled as the cred struct in that case is
103446+ init_cred
103447+ */
103448+ if (grsec_enable_setxid && !current_is_single_threaded() &&
103449+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
103450+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
103451+ schedule_it = 1;
103452+ }
103453+ ret = __commit_creds(new);
103454+ if (schedule_it) {
103455+ rcu_read_lock();
103456+ read_lock(&tasklist_lock);
103457+ for (t = next_thread(current); t != current;
103458+ t = next_thread(t)) {
103459+ /* we'll check if the thread has uid 0 in
103460+ * the delayed worker routine
103461+ */
103462+ if (task_securebits(t) == oldsecurebits &&
103463+ t->delayed_cred == NULL) {
103464+ t->delayed_cred = get_cred(new);
103465+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
103466+ set_tsk_need_resched(t);
103467+ }
103468+ }
103469+ read_unlock(&tasklist_lock);
103470+ rcu_read_unlock();
103471+ }
103472+
103473+ return ret;
103474+#else
103475+ return __commit_creds(new);
103476+#endif
103477+}
103478+
103479 EXPORT_SYMBOL(commit_creds);
103480
103481 /**
103482diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
103483index 0874e2e..5b32cc9 100644
103484--- a/kernel/debug/debug_core.c
103485+++ b/kernel/debug/debug_core.c
103486@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
103487 */
103488 static atomic_t masters_in_kgdb;
103489 static atomic_t slaves_in_kgdb;
103490-static atomic_t kgdb_break_tasklet_var;
103491+static atomic_unchecked_t kgdb_break_tasklet_var;
103492 atomic_t kgdb_setting_breakpoint;
103493
103494 struct task_struct *kgdb_usethread;
103495@@ -137,7 +137,7 @@ int kgdb_single_step;
103496 static pid_t kgdb_sstep_pid;
103497
103498 /* to keep track of the CPU which is doing the single stepping*/
103499-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103500+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103501
103502 /*
103503 * If you are debugging a problem where roundup (the collection of
103504@@ -552,7 +552,7 @@ return_normal:
103505 * kernel will only try for the value of sstep_tries before
103506 * giving up and continuing on.
103507 */
103508- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
103509+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
103510 (kgdb_info[cpu].task &&
103511 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
103512 atomic_set(&kgdb_active, -1);
103513@@ -654,8 +654,8 @@ cpu_master_loop:
103514 }
103515
103516 kgdb_restore:
103517- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
103518- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
103519+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
103520+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
103521 if (kgdb_info[sstep_cpu].task)
103522 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
103523 else
103524@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
103525 static void kgdb_tasklet_bpt(unsigned long ing)
103526 {
103527 kgdb_breakpoint();
103528- atomic_set(&kgdb_break_tasklet_var, 0);
103529+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
103530 }
103531
103532 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
103533
103534 void kgdb_schedule_breakpoint(void)
103535 {
103536- if (atomic_read(&kgdb_break_tasklet_var) ||
103537+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
103538 atomic_read(&kgdb_active) != -1 ||
103539 atomic_read(&kgdb_setting_breakpoint))
103540 return;
103541- atomic_inc(&kgdb_break_tasklet_var);
103542+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
103543 tasklet_schedule(&kgdb_tasklet_breakpoint);
103544 }
103545 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
103546diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
103547index 41213454..861e178 100644
103548--- a/kernel/debug/kdb/kdb_main.c
103549+++ b/kernel/debug/kdb/kdb_main.c
103550@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
103551 continue;
103552
103553 kdb_printf("%-20s%8u 0x%p ", mod->name,
103554- mod->core_size, (void *)mod);
103555+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
103556 #ifdef CONFIG_MODULE_UNLOAD
103557 kdb_printf("%4d ", module_refcount(mod));
103558 #endif
103559@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
103560 kdb_printf(" (Loading)");
103561 else
103562 kdb_printf(" (Live)");
103563- kdb_printf(" 0x%p", mod->module_core);
103564+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
103565
103566 #ifdef CONFIG_MODULE_UNLOAD
103567 {
103568diff --git a/kernel/events/core.c b/kernel/events/core.c
103569index 9481749..5fbec5b 100644
103570--- a/kernel/events/core.c
103571+++ b/kernel/events/core.c
103572@@ -172,8 +172,15 @@ static struct srcu_struct pmus_srcu;
103573 * 0 - disallow raw tracepoint access for unpriv
103574 * 1 - disallow cpu events for unpriv
103575 * 2 - disallow kernel profiling for unpriv
103576+ * 3 - disallow all unpriv perf event use
103577 */
103578-int sysctl_perf_event_paranoid __read_mostly = 1;
103579+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103580+int sysctl_perf_event_legitimately_concerned __read_only = 3;
103581+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
103582+int sysctl_perf_event_legitimately_concerned __read_only = 2;
103583+#else
103584+int sysctl_perf_event_legitimately_concerned __read_only = 1;
103585+#endif
103586
103587 /* Minimum for 512 kiB + 1 user control page */
103588 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
103589@@ -199,7 +206,7 @@ void update_perf_cpu_limits(void)
103590
103591 tmp *= sysctl_perf_cpu_time_max_percent;
103592 do_div(tmp, 100);
103593- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
103594+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
103595 }
103596
103597 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
103598@@ -305,7 +312,7 @@ void perf_sample_event_took(u64 sample_len_ns)
103599 }
103600 }
103601
103602-static atomic64_t perf_event_id;
103603+static atomic64_unchecked_t perf_event_id;
103604
103605 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
103606 enum event_type_t event_type);
103607@@ -3771,9 +3778,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
103608 mutex_lock(&event->child_mutex);
103609 total += perf_event_read(event);
103610 *enabled += event->total_time_enabled +
103611- atomic64_read(&event->child_total_time_enabled);
103612+ atomic64_read_unchecked(&event->child_total_time_enabled);
103613 *running += event->total_time_running +
103614- atomic64_read(&event->child_total_time_running);
103615+ atomic64_read_unchecked(&event->child_total_time_running);
103616
103617 list_for_each_entry(child, &event->child_list, child_list) {
103618 total += perf_event_read(child);
103619@@ -4303,10 +4310,10 @@ void perf_event_update_userpage(struct perf_event *event)
103620 userpg->offset -= local64_read(&event->hw.prev_count);
103621
103622 userpg->time_enabled = enabled +
103623- atomic64_read(&event->child_total_time_enabled);
103624+ atomic64_read_unchecked(&event->child_total_time_enabled);
103625
103626 userpg->time_running = running +
103627- atomic64_read(&event->child_total_time_running);
103628+ atomic64_read_unchecked(&event->child_total_time_running);
103629
103630 arch_perf_update_userpage(event, userpg, now);
103631
103632@@ -4989,7 +4996,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
103633
103634 /* Data. */
103635 sp = perf_user_stack_pointer(regs);
103636- rem = __output_copy_user(handle, (void *) sp, dump_size);
103637+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
103638 dyn_size = dump_size - rem;
103639
103640 perf_output_skip(handle, rem);
103641@@ -5080,11 +5087,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
103642 values[n++] = perf_event_count(event);
103643 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
103644 values[n++] = enabled +
103645- atomic64_read(&event->child_total_time_enabled);
103646+ atomic64_read_unchecked(&event->child_total_time_enabled);
103647 }
103648 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
103649 values[n++] = running +
103650- atomic64_read(&event->child_total_time_running);
103651+ atomic64_read_unchecked(&event->child_total_time_running);
103652 }
103653 if (read_format & PERF_FORMAT_ID)
103654 values[n++] = primary_event_id(event);
103655@@ -7576,7 +7583,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
103656 event->parent = parent_event;
103657
103658 event->ns = get_pid_ns(task_active_pid_ns(current));
103659- event->id = atomic64_inc_return(&perf_event_id);
103660+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
103661
103662 event->state = PERF_EVENT_STATE_INACTIVE;
103663
103664@@ -7935,6 +7942,11 @@ SYSCALL_DEFINE5(perf_event_open,
103665 if (flags & ~PERF_FLAG_ALL)
103666 return -EINVAL;
103667
103668+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103669+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
103670+ return -EACCES;
103671+#endif
103672+
103673 err = perf_copy_attr(attr_uptr, &attr);
103674 if (err)
103675 return err;
103676@@ -8383,10 +8395,10 @@ static void sync_child_event(struct perf_event *child_event,
103677 /*
103678 * Add back the child's count to the parent's count:
103679 */
103680- atomic64_add(child_val, &parent_event->child_count);
103681- atomic64_add(child_event->total_time_enabled,
103682+ atomic64_add_unchecked(child_val, &parent_event->child_count);
103683+ atomic64_add_unchecked(child_event->total_time_enabled,
103684 &parent_event->child_total_time_enabled);
103685- atomic64_add(child_event->total_time_running,
103686+ atomic64_add_unchecked(child_event->total_time_running,
103687 &parent_event->child_total_time_running);
103688
103689 /*
103690diff --git a/kernel/events/internal.h b/kernel/events/internal.h
103691index 9f6ce9b..e4f2cbb 100644
103692--- a/kernel/events/internal.h
103693+++ b/kernel/events/internal.h
103694@@ -114,10 +114,10 @@ static inline unsigned long perf_aux_size(struct ring_buffer *rb)
103695 return rb->aux_nr_pages << PAGE_SHIFT;
103696 }
103697
103698-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
103699+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
103700 static inline unsigned long \
103701 func_name(struct perf_output_handle *handle, \
103702- const void *buf, unsigned long len) \
103703+ const void user *buf, unsigned long len) \
103704 { \
103705 unsigned long size, written; \
103706 \
103707@@ -150,7 +150,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
103708 return 0;
103709 }
103710
103711-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
103712+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
103713
103714 static inline unsigned long
103715 memcpy_skip(void *dst, const void *src, unsigned long n)
103716@@ -158,7 +158,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
103717 return 0;
103718 }
103719
103720-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
103721+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
103722
103723 #ifndef arch_perf_out_copy_user
103724 #define arch_perf_out_copy_user arch_perf_out_copy_user
103725@@ -176,7 +176,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
103726 }
103727 #endif
103728
103729-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
103730+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
103731
103732 /* Callchain handling */
103733 extern struct perf_callchain_entry *
103734diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
103735index cb346f2..e4dc317 100644
103736--- a/kernel/events/uprobes.c
103737+++ b/kernel/events/uprobes.c
103738@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
103739 {
103740 struct page *page;
103741 uprobe_opcode_t opcode;
103742- int result;
103743+ long result;
103744
103745 pagefault_disable();
103746 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
103747diff --git a/kernel/exit.c b/kernel/exit.c
103748index 22fcc05..5f07dbc 100644
103749--- a/kernel/exit.c
103750+++ b/kernel/exit.c
103751@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
103752 struct task_struct *leader;
103753 int zap_leader;
103754 repeat:
103755+#ifdef CONFIG_NET
103756+ gr_del_task_from_ip_table(p);
103757+#endif
103758+
103759 /* don't need to get the RCU readlock here - the process is dead and
103760 * can't be modifying its own credentials. But shut RCU-lockdep up */
103761 rcu_read_lock();
103762@@ -656,6 +660,8 @@ void do_exit(long code)
103763 int group_dead;
103764 TASKS_RCU(int tasks_rcu_i);
103765
103766+ set_fs(USER_DS);
103767+
103768 profile_task_exit(tsk);
103769
103770 WARN_ON(blk_needs_flush_plug(tsk));
103771@@ -672,7 +678,6 @@ void do_exit(long code)
103772 * mm_release()->clear_child_tid() from writing to a user-controlled
103773 * kernel address.
103774 */
103775- set_fs(USER_DS);
103776
103777 ptrace_event(PTRACE_EVENT_EXIT, code);
103778
103779@@ -730,6 +735,9 @@ void do_exit(long code)
103780 tsk->exit_code = code;
103781 taskstats_exit(tsk, group_dead);
103782
103783+ gr_acl_handle_psacct(tsk, code);
103784+ gr_acl_handle_exit();
103785+
103786 exit_mm(tsk);
103787
103788 if (group_dead)
103789@@ -847,7 +855,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
103790 * Take down every thread in the group. This is called by fatal signals
103791 * as well as by sys_exit_group (below).
103792 */
103793-void
103794+__noreturn void
103795 do_group_exit(int exit_code)
103796 {
103797 struct signal_struct *sig = current->signal;
103798diff --git a/kernel/fork.c b/kernel/fork.c
103799index 03c1eaa..461be4c 100644
103800--- a/kernel/fork.c
103801+++ b/kernel/fork.c
103802@@ -188,12 +188,54 @@ static void free_thread_info(struct thread_info *ti)
103803 void thread_info_cache_init(void)
103804 {
103805 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
103806- THREAD_SIZE, 0, NULL);
103807+ THREAD_SIZE, SLAB_USERCOPY, NULL);
103808 BUG_ON(thread_info_cache == NULL);
103809 }
103810 # endif
103811 #endif
103812
103813+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103814+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
103815+ int node, void **lowmem_stack)
103816+{
103817+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
103818+ void *ret = NULL;
103819+ unsigned int i;
103820+
103821+ *lowmem_stack = alloc_thread_info_node(tsk, node);
103822+ if (*lowmem_stack == NULL)
103823+ goto out;
103824+
103825+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
103826+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
103827+
103828+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
103829+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
103830+ if (ret == NULL) {
103831+ free_thread_info(*lowmem_stack);
103832+ *lowmem_stack = NULL;
103833+ }
103834+
103835+out:
103836+ return ret;
103837+}
103838+
103839+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
103840+{
103841+ unmap_process_stacks(tsk);
103842+}
103843+#else
103844+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
103845+ int node, void **lowmem_stack)
103846+{
103847+ return alloc_thread_info_node(tsk, node);
103848+}
103849+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
103850+{
103851+ free_thread_info(ti);
103852+}
103853+#endif
103854+
103855 /* SLAB cache for signal_struct structures (tsk->signal) */
103856 static struct kmem_cache *signal_cachep;
103857
103858@@ -212,18 +254,22 @@ struct kmem_cache *vm_area_cachep;
103859 /* SLAB cache for mm_struct structures (tsk->mm) */
103860 static struct kmem_cache *mm_cachep;
103861
103862-static void account_kernel_stack(struct thread_info *ti, int account)
103863+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
103864 {
103865+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103866+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
103867+#else
103868 struct zone *zone = page_zone(virt_to_page(ti));
103869+#endif
103870
103871 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
103872 }
103873
103874 void free_task(struct task_struct *tsk)
103875 {
103876- account_kernel_stack(tsk->stack, -1);
103877+ account_kernel_stack(tsk, tsk->stack, -1);
103878 arch_release_thread_info(tsk->stack);
103879- free_thread_info(tsk->stack);
103880+ gr_free_thread_info(tsk, tsk->stack);
103881 rt_mutex_debug_task_free(tsk);
103882 ftrace_graph_exit_task(tsk);
103883 put_seccomp_filter(tsk);
103884@@ -329,6 +375,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103885 {
103886 struct task_struct *tsk;
103887 struct thread_info *ti;
103888+ void *lowmem_stack;
103889 int node = tsk_fork_get_node(orig);
103890 int err;
103891
103892@@ -336,7 +383,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103893 if (!tsk)
103894 return NULL;
103895
103896- ti = alloc_thread_info_node(tsk, node);
103897+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
103898 if (!ti)
103899 goto free_tsk;
103900
103901@@ -345,6 +392,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103902 goto free_ti;
103903
103904 tsk->stack = ti;
103905+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103906+ tsk->lowmem_stack = lowmem_stack;
103907+#endif
103908 #ifdef CONFIG_SECCOMP
103909 /*
103910 * We must handle setting up seccomp filters once we're under
103911@@ -361,7 +411,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103912 set_task_stack_end_magic(tsk);
103913
103914 #ifdef CONFIG_CC_STACKPROTECTOR
103915- tsk->stack_canary = get_random_int();
103916+ tsk->stack_canary = pax_get_random_long();
103917 #endif
103918
103919 /*
103920@@ -375,24 +425,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103921 tsk->splice_pipe = NULL;
103922 tsk->task_frag.page = NULL;
103923
103924- account_kernel_stack(ti, 1);
103925+ account_kernel_stack(tsk, ti, 1);
103926
103927 return tsk;
103928
103929 free_ti:
103930- free_thread_info(ti);
103931+ gr_free_thread_info(tsk, ti);
103932 free_tsk:
103933 free_task_struct(tsk);
103934 return NULL;
103935 }
103936
103937 #ifdef CONFIG_MMU
103938-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
103939+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
103940+{
103941+ struct vm_area_struct *tmp;
103942+ unsigned long charge;
103943+ struct file *file;
103944+ int retval;
103945+
103946+ charge = 0;
103947+ if (mpnt->vm_flags & VM_ACCOUNT) {
103948+ unsigned long len = vma_pages(mpnt);
103949+
103950+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
103951+ goto fail_nomem;
103952+ charge = len;
103953+ }
103954+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
103955+ if (!tmp)
103956+ goto fail_nomem;
103957+ *tmp = *mpnt;
103958+ tmp->vm_mm = mm;
103959+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
103960+ retval = vma_dup_policy(mpnt, tmp);
103961+ if (retval)
103962+ goto fail_nomem_policy;
103963+ if (anon_vma_fork(tmp, mpnt))
103964+ goto fail_nomem_anon_vma_fork;
103965+ tmp->vm_flags &= ~VM_LOCKED;
103966+ tmp->vm_next = tmp->vm_prev = NULL;
103967+ tmp->vm_mirror = NULL;
103968+ file = tmp->vm_file;
103969+ if (file) {
103970+ struct inode *inode = file_inode(file);
103971+ struct address_space *mapping = file->f_mapping;
103972+
103973+ get_file(file);
103974+ if (tmp->vm_flags & VM_DENYWRITE)
103975+ atomic_dec(&inode->i_writecount);
103976+ i_mmap_lock_write(mapping);
103977+ if (tmp->vm_flags & VM_SHARED)
103978+ atomic_inc(&mapping->i_mmap_writable);
103979+ flush_dcache_mmap_lock(mapping);
103980+ /* insert tmp into the share list, just after mpnt */
103981+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
103982+ flush_dcache_mmap_unlock(mapping);
103983+ i_mmap_unlock_write(mapping);
103984+ }
103985+
103986+ /*
103987+ * Clear hugetlb-related page reserves for children. This only
103988+ * affects MAP_PRIVATE mappings. Faults generated by the child
103989+ * are not guaranteed to succeed, even if read-only
103990+ */
103991+ if (is_vm_hugetlb_page(tmp))
103992+ reset_vma_resv_huge_pages(tmp);
103993+
103994+ return tmp;
103995+
103996+fail_nomem_anon_vma_fork:
103997+ mpol_put(vma_policy(tmp));
103998+fail_nomem_policy:
103999+ kmem_cache_free(vm_area_cachep, tmp);
104000+fail_nomem:
104001+ vm_unacct_memory(charge);
104002+ return NULL;
104003+}
104004+
104005+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104006 {
104007 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
104008 struct rb_node **rb_link, *rb_parent;
104009 int retval;
104010- unsigned long charge;
104011
104012 uprobe_start_dup_mmap();
104013 down_write(&oldmm->mmap_sem);
104014@@ -423,51 +538,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104015
104016 prev = NULL;
104017 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
104018- struct file *file;
104019-
104020 if (mpnt->vm_flags & VM_DONTCOPY) {
104021 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
104022 -vma_pages(mpnt));
104023 continue;
104024 }
104025- charge = 0;
104026- if (mpnt->vm_flags & VM_ACCOUNT) {
104027- unsigned long len = vma_pages(mpnt);
104028-
104029- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104030- goto fail_nomem;
104031- charge = len;
104032- }
104033- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104034- if (!tmp)
104035- goto fail_nomem;
104036- *tmp = *mpnt;
104037- INIT_LIST_HEAD(&tmp->anon_vma_chain);
104038- retval = vma_dup_policy(mpnt, tmp);
104039- if (retval)
104040- goto fail_nomem_policy;
104041- tmp->vm_mm = mm;
104042- if (anon_vma_fork(tmp, mpnt))
104043- goto fail_nomem_anon_vma_fork;
104044- tmp->vm_flags &= ~VM_LOCKED;
104045- tmp->vm_next = tmp->vm_prev = NULL;
104046- file = tmp->vm_file;
104047- if (file) {
104048- struct inode *inode = file_inode(file);
104049- struct address_space *mapping = file->f_mapping;
104050-
104051- get_file(file);
104052- if (tmp->vm_flags & VM_DENYWRITE)
104053- atomic_dec(&inode->i_writecount);
104054- i_mmap_lock_write(mapping);
104055- if (tmp->vm_flags & VM_SHARED)
104056- atomic_inc(&mapping->i_mmap_writable);
104057- flush_dcache_mmap_lock(mapping);
104058- /* insert tmp into the share list, just after mpnt */
104059- vma_interval_tree_insert_after(tmp, mpnt,
104060- &mapping->i_mmap);
104061- flush_dcache_mmap_unlock(mapping);
104062- i_mmap_unlock_write(mapping);
104063+ tmp = dup_vma(mm, oldmm, mpnt);
104064+ if (!tmp) {
104065+ retval = -ENOMEM;
104066+ goto out;
104067 }
104068
104069 /*
104070@@ -499,6 +578,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104071 if (retval)
104072 goto out;
104073 }
104074+
104075+#ifdef CONFIG_PAX_SEGMEXEC
104076+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
104077+ struct vm_area_struct *mpnt_m;
104078+
104079+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
104080+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
104081+
104082+ if (!mpnt->vm_mirror)
104083+ continue;
104084+
104085+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
104086+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
104087+ mpnt->vm_mirror = mpnt_m;
104088+ } else {
104089+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
104090+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
104091+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
104092+ mpnt->vm_mirror->vm_mirror = mpnt;
104093+ }
104094+ }
104095+ BUG_ON(mpnt_m);
104096+ }
104097+#endif
104098+
104099 /* a new mm has just been created */
104100 arch_dup_mmap(oldmm, mm);
104101 retval = 0;
104102@@ -508,14 +612,6 @@ out:
104103 up_write(&oldmm->mmap_sem);
104104 uprobe_end_dup_mmap();
104105 return retval;
104106-fail_nomem_anon_vma_fork:
104107- mpol_put(vma_policy(tmp));
104108-fail_nomem_policy:
104109- kmem_cache_free(vm_area_cachep, tmp);
104110-fail_nomem:
104111- retval = -ENOMEM;
104112- vm_unacct_memory(charge);
104113- goto out;
104114 }
104115
104116 static inline int mm_alloc_pgd(struct mm_struct *mm)
104117@@ -790,8 +886,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
104118 return ERR_PTR(err);
104119
104120 mm = get_task_mm(task);
104121- if (mm && mm != current->mm &&
104122- !ptrace_may_access(task, mode)) {
104123+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
104124+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
104125 mmput(mm);
104126 mm = ERR_PTR(-EACCES);
104127 }
104128@@ -992,13 +1088,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
104129 spin_unlock(&fs->lock);
104130 return -EAGAIN;
104131 }
104132- fs->users++;
104133+ atomic_inc(&fs->users);
104134 spin_unlock(&fs->lock);
104135 return 0;
104136 }
104137 tsk->fs = copy_fs_struct(fs);
104138 if (!tsk->fs)
104139 return -ENOMEM;
104140+ /* Carry through gr_chroot_dentry and is_chrooted instead
104141+ of recomputing it here. Already copied when the task struct
104142+ is duplicated. This allows pivot_root to not be treated as
104143+ a chroot
104144+ */
104145+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
104146+
104147 return 0;
104148 }
104149
104150@@ -1236,7 +1339,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
104151 * parts of the process environment (as per the clone
104152 * flags). The actual kick-off is left to the caller.
104153 */
104154-static struct task_struct *copy_process(unsigned long clone_flags,
104155+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
104156 unsigned long stack_start,
104157 unsigned long stack_size,
104158 int __user *child_tidptr,
104159@@ -1307,6 +1410,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104160 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
104161 #endif
104162 retval = -EAGAIN;
104163+
104164+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
104165+
104166 if (atomic_read(&p->real_cred->user->processes) >=
104167 task_rlimit(p, RLIMIT_NPROC)) {
104168 if (p->real_cred->user != INIT_USER &&
104169@@ -1554,6 +1660,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104170 goto bad_fork_free_pid;
104171 }
104172
104173+ /* synchronizes with gr_set_acls()
104174+ we need to call this past the point of no return for fork()
104175+ */
104176+ gr_copy_label(p);
104177+
104178 if (likely(p->pid)) {
104179 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
104180
104181@@ -1643,6 +1754,8 @@ bad_fork_cleanup_count:
104182 bad_fork_free:
104183 free_task(p);
104184 fork_out:
104185+ gr_log_forkfail(retval);
104186+
104187 return ERR_PTR(retval);
104188 }
104189
104190@@ -1704,6 +1817,7 @@ long do_fork(unsigned long clone_flags,
104191
104192 p = copy_process(clone_flags, stack_start, stack_size,
104193 child_tidptr, NULL, trace);
104194+ add_latent_entropy();
104195 /*
104196 * Do this prior waking up the new thread - the thread pointer
104197 * might get invalid after that point, if the thread exits quickly.
104198@@ -1720,6 +1834,8 @@ long do_fork(unsigned long clone_flags,
104199 if (clone_flags & CLONE_PARENT_SETTID)
104200 put_user(nr, parent_tidptr);
104201
104202+ gr_handle_brute_check();
104203+
104204 if (clone_flags & CLONE_VFORK) {
104205 p->vfork_done = &vfork;
104206 init_completion(&vfork);
104207@@ -1838,7 +1954,7 @@ void __init proc_caches_init(void)
104208 mm_cachep = kmem_cache_create("mm_struct",
104209 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
104210 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
104211- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
104212+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
104213 mmap_init();
104214 nsproxy_cache_init();
104215 }
104216@@ -1878,7 +1994,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
104217 return 0;
104218
104219 /* don't need lock here; in the worst case we'll do useless copy */
104220- if (fs->users == 1)
104221+ if (atomic_read(&fs->users) == 1)
104222 return 0;
104223
104224 *new_fsp = copy_fs_struct(fs);
104225@@ -1990,7 +2106,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
104226 fs = current->fs;
104227 spin_lock(&fs->lock);
104228 current->fs = new_fs;
104229- if (--fs->users)
104230+ gr_set_chroot_entries(current, &current->fs->root);
104231+ if (atomic_dec_return(&fs->users))
104232 new_fs = NULL;
104233 else
104234 new_fs = fs;
104235@@ -2054,7 +2171,7 @@ int unshare_files(struct files_struct **displaced)
104236 int sysctl_max_threads(struct ctl_table *table, int write,
104237 void __user *buffer, size_t *lenp, loff_t *ppos)
104238 {
104239- struct ctl_table t;
104240+ ctl_table_no_const t;
104241 int ret;
104242 int threads = max_threads;
104243 int min = MIN_THREADS;
104244diff --git a/kernel/futex.c b/kernel/futex.c
104245index 2579e40..c33f33e 100644
104246--- a/kernel/futex.c
104247+++ b/kernel/futex.c
104248@@ -201,7 +201,7 @@ struct futex_pi_state {
104249 atomic_t refcount;
104250
104251 union futex_key key;
104252-};
104253+} __randomize_layout;
104254
104255 /**
104256 * struct futex_q - The hashed futex queue entry, one per waiting task
104257@@ -235,7 +235,7 @@ struct futex_q {
104258 struct rt_mutex_waiter *rt_waiter;
104259 union futex_key *requeue_pi_key;
104260 u32 bitset;
104261-};
104262+} __randomize_layout;
104263
104264 static const struct futex_q futex_q_init = {
104265 /* list gets initialized in queue_me()*/
104266@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
104267 struct page *page, *page_head;
104268 int err, ro = 0;
104269
104270+#ifdef CONFIG_PAX_SEGMEXEC
104271+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
104272+ return -EFAULT;
104273+#endif
104274+
104275 /*
104276 * The futex address must be "naturally" aligned.
104277 */
104278@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
104279
104280 static int get_futex_value_locked(u32 *dest, u32 __user *from)
104281 {
104282- int ret;
104283+ unsigned long ret;
104284
104285 pagefault_disable();
104286 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
104287@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
104288 {
104289 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
104290 u32 curval;
104291+ mm_segment_t oldfs;
104292
104293 /*
104294 * This will fail and we want it. Some arch implementations do
104295@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
104296 * implementation, the non-functional ones will return
104297 * -ENOSYS.
104298 */
104299+ oldfs = get_fs();
104300+ set_fs(USER_DS);
104301 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
104302 futex_cmpxchg_enabled = 1;
104303+ set_fs(oldfs);
104304 #endif
104305 }
104306
104307diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
104308index 55c8c93..9ba7ad6 100644
104309--- a/kernel/futex_compat.c
104310+++ b/kernel/futex_compat.c
104311@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
104312 return 0;
104313 }
104314
104315-static void __user *futex_uaddr(struct robust_list __user *entry,
104316+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
104317 compat_long_t futex_offset)
104318 {
104319 compat_uptr_t base = ptr_to_compat(entry);
104320diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
104321index a744098..539f7b6 100644
104322--- a/kernel/gcov/base.c
104323+++ b/kernel/gcov/base.c
104324@@ -117,11 +117,6 @@ void gcov_enable_events(void)
104325 }
104326
104327 #ifdef CONFIG_MODULES
104328-static inline int within(void *addr, void *start, unsigned long size)
104329-{
104330- return ((addr >= start) && (addr < start + size));
104331-}
104332-
104333 /* Update list and generate events when modules are unloaded. */
104334 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104335 void *data)
104336@@ -136,7 +131,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104337
104338 /* Remove entries located in module from linked list. */
104339 while ((info = gcov_info_next(info))) {
104340- if (within(info, mod->module_core, mod->core_size)) {
104341+ if (within_module_core_rw((unsigned long)info, mod)) {
104342 gcov_info_unlink(prev, info);
104343 if (gcov_events_enabled)
104344 gcov_event(GCOV_REMOVE, info);
104345diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
104346index e68932b..2247e06 100644
104347--- a/kernel/irq/manage.c
104348+++ b/kernel/irq/manage.c
104349@@ -906,7 +906,7 @@ static int irq_thread(void *data)
104350
104351 action_ret = handler_fn(desc, action);
104352 if (action_ret == IRQ_HANDLED)
104353- atomic_inc(&desc->threads_handled);
104354+ atomic_inc_unchecked(&desc->threads_handled);
104355
104356 wake_threads_waitq(desc);
104357 }
104358diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
104359index e2514b0..de3dfe0 100644
104360--- a/kernel/irq/spurious.c
104361+++ b/kernel/irq/spurious.c
104362@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
104363 * count. We just care about the count being
104364 * different than the one we saw before.
104365 */
104366- handled = atomic_read(&desc->threads_handled);
104367+ handled = atomic_read_unchecked(&desc->threads_handled);
104368 handled |= SPURIOUS_DEFERRED;
104369 if (handled != desc->threads_handled_last) {
104370 action_ret = IRQ_HANDLED;
104371diff --git a/kernel/jump_label.c b/kernel/jump_label.c
104372index 9019f15..9a3c42e 100644
104373--- a/kernel/jump_label.c
104374+++ b/kernel/jump_label.c
104375@@ -14,6 +14,7 @@
104376 #include <linux/err.h>
104377 #include <linux/static_key.h>
104378 #include <linux/jump_label_ratelimit.h>
104379+#include <linux/mm.h>
104380
104381 #ifdef HAVE_JUMP_LABEL
104382
104383@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
104384
104385 size = (((unsigned long)stop - (unsigned long)start)
104386 / sizeof(struct jump_entry));
104387+ pax_open_kernel();
104388 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
104389+ pax_close_kernel();
104390 }
104391
104392 static void jump_label_update(struct static_key *key, int enable);
104393@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
104394 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
104395 struct jump_entry *iter;
104396
104397+ pax_open_kernel();
104398 for (iter = iter_start; iter < iter_stop; iter++) {
104399 if (within_module_init(iter->code, mod))
104400 iter->code = 0;
104401 }
104402+ pax_close_kernel();
104403 }
104404
104405 static int
104406diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
104407index 5c5987f..bc502b0 100644
104408--- a/kernel/kallsyms.c
104409+++ b/kernel/kallsyms.c
104410@@ -11,6 +11,9 @@
104411 * Changed the compression method from stem compression to "table lookup"
104412 * compression (see scripts/kallsyms.c for a more complete description)
104413 */
104414+#ifdef CONFIG_GRKERNSEC_HIDESYM
104415+#define __INCLUDED_BY_HIDESYM 1
104416+#endif
104417 #include <linux/kallsyms.h>
104418 #include <linux/module.h>
104419 #include <linux/init.h>
104420@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
104421
104422 static inline int is_kernel_inittext(unsigned long addr)
104423 {
104424+ if (system_state != SYSTEM_BOOTING)
104425+ return 0;
104426+
104427 if (addr >= (unsigned long)_sinittext
104428 && addr <= (unsigned long)_einittext)
104429 return 1;
104430 return 0;
104431 }
104432
104433+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104434+#ifdef CONFIG_MODULES
104435+static inline int is_module_text(unsigned long addr)
104436+{
104437+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
104438+ return 1;
104439+
104440+ addr = ktla_ktva(addr);
104441+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
104442+}
104443+#else
104444+static inline int is_module_text(unsigned long addr)
104445+{
104446+ return 0;
104447+}
104448+#endif
104449+#endif
104450+
104451 static inline int is_kernel_text(unsigned long addr)
104452 {
104453 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
104454@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
104455
104456 static inline int is_kernel(unsigned long addr)
104457 {
104458+
104459+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104460+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
104461+ return 1;
104462+
104463+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
104464+#else
104465 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
104466+#endif
104467+
104468 return 1;
104469 return in_gate_area_no_mm(addr);
104470 }
104471
104472 static int is_ksym_addr(unsigned long addr)
104473 {
104474+
104475+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104476+ if (is_module_text(addr))
104477+ return 0;
104478+#endif
104479+
104480 if (all_var)
104481 return is_kernel(addr);
104482
104483@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
104484
104485 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
104486 {
104487- iter->name[0] = '\0';
104488 iter->nameoff = get_symbol_offset(new_pos);
104489 iter->pos = new_pos;
104490 }
104491@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
104492 {
104493 struct kallsym_iter *iter = m->private;
104494
104495+#ifdef CONFIG_GRKERNSEC_HIDESYM
104496+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
104497+ return 0;
104498+#endif
104499+
104500 /* Some debugging symbols have no name. Ignore them. */
104501 if (!iter->name[0])
104502 return 0;
104503@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
104504 */
104505 type = iter->exported ? toupper(iter->type) :
104506 tolower(iter->type);
104507+
104508 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
104509 type, iter->name, iter->module_name);
104510 } else
104511diff --git a/kernel/kcmp.c b/kernel/kcmp.c
104512index 0aa69ea..a7fcafb 100644
104513--- a/kernel/kcmp.c
104514+++ b/kernel/kcmp.c
104515@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
104516 struct task_struct *task1, *task2;
104517 int ret;
104518
104519+#ifdef CONFIG_GRKERNSEC
104520+ return -ENOSYS;
104521+#endif
104522+
104523 rcu_read_lock();
104524
104525 /*
104526diff --git a/kernel/kexec.c b/kernel/kexec.c
104527index 7a36fdc..de8c4ed 100644
104528--- a/kernel/kexec.c
104529+++ b/kernel/kexec.c
104530@@ -1232,7 +1232,7 @@ static int kimage_load_segment(struct kimage *image,
104531 */
104532 struct kimage *kexec_image;
104533 struct kimage *kexec_crash_image;
104534-int kexec_load_disabled;
104535+int kexec_load_disabled __read_only;
104536
104537 static DEFINE_MUTEX(kexec_mutex);
104538
104539@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
104540 compat_ulong_t, flags)
104541 {
104542 struct compat_kexec_segment in;
104543- struct kexec_segment out, __user *ksegments;
104544+ struct kexec_segment out;
104545+ struct kexec_segment __user *ksegments;
104546 unsigned long i, result;
104547
104548 /* Don't allow clients that don't understand the native
104549diff --git a/kernel/kmod.c b/kernel/kmod.c
104550index 2777f40..a689506 100644
104551--- a/kernel/kmod.c
104552+++ b/kernel/kmod.c
104553@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
104554 kfree(info->argv);
104555 }
104556
104557-static int call_modprobe(char *module_name, int wait)
104558+static int call_modprobe(char *module_name, char *module_param, int wait)
104559 {
104560 struct subprocess_info *info;
104561 static char *envp[] = {
104562@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
104563 NULL
104564 };
104565
104566- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
104567+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
104568 if (!argv)
104569 goto out;
104570
104571@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
104572 argv[1] = "-q";
104573 argv[2] = "--";
104574 argv[3] = module_name; /* check free_modprobe_argv() */
104575- argv[4] = NULL;
104576+ argv[4] = module_param;
104577+ argv[5] = NULL;
104578
104579 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
104580 NULL, free_modprobe_argv, NULL);
104581@@ -122,9 +123,8 @@ out:
104582 * If module auto-loading support is disabled then this function
104583 * becomes a no-operation.
104584 */
104585-int __request_module(bool wait, const char *fmt, ...)
104586+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
104587 {
104588- va_list args;
104589 char module_name[MODULE_NAME_LEN];
104590 unsigned int max_modprobes;
104591 int ret;
104592@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
104593 if (!modprobe_path[0])
104594 return 0;
104595
104596- va_start(args, fmt);
104597- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
104598- va_end(args);
104599+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
104600 if (ret >= MODULE_NAME_LEN)
104601 return -ENAMETOOLONG;
104602
104603@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
104604 if (ret)
104605 return ret;
104606
104607+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104608+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104609+ /* hack to workaround consolekit/udisks stupidity */
104610+ read_lock(&tasklist_lock);
104611+ if (!strcmp(current->comm, "mount") &&
104612+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
104613+ read_unlock(&tasklist_lock);
104614+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
104615+ return -EPERM;
104616+ }
104617+ read_unlock(&tasklist_lock);
104618+ }
104619+#endif
104620+
104621 /* If modprobe needs a service that is in a module, we get a recursive
104622 * loop. Limit the number of running kmod threads to max_threads/2 or
104623 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
104624@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
104625
104626 trace_module_request(module_name, wait, _RET_IP_);
104627
104628- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104629+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104630
104631 atomic_dec(&kmod_concurrent);
104632 return ret;
104633 }
104634+
104635+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
104636+{
104637+ va_list args;
104638+ int ret;
104639+
104640+ va_start(args, fmt);
104641+ ret = ____request_module(wait, module_param, fmt, args);
104642+ va_end(args);
104643+
104644+ return ret;
104645+}
104646+
104647+int __request_module(bool wait, const char *fmt, ...)
104648+{
104649+ va_list args;
104650+ int ret;
104651+
104652+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104653+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104654+ char module_param[MODULE_NAME_LEN];
104655+
104656+ memset(module_param, 0, sizeof(module_param));
104657+
104658+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
104659+
104660+ va_start(args, fmt);
104661+ ret = ____request_module(wait, module_param, fmt, args);
104662+ va_end(args);
104663+
104664+ return ret;
104665+ }
104666+#endif
104667+
104668+ va_start(args, fmt);
104669+ ret = ____request_module(wait, NULL, fmt, args);
104670+ va_end(args);
104671+
104672+ return ret;
104673+}
104674+
104675 EXPORT_SYMBOL(__request_module);
104676 #endif /* CONFIG_MODULES */
104677
104678 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
104679 {
104680+#ifdef CONFIG_GRKERNSEC
104681+ kfree(info->path);
104682+ info->path = info->origpath;
104683+#endif
104684 if (info->cleanup)
104685 (*info->cleanup)(info);
104686 kfree(info);
104687@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
104688 */
104689 set_user_nice(current, 0);
104690
104691+#ifdef CONFIG_GRKERNSEC
104692+ /* this is race-free as far as userland is concerned as we copied
104693+ out the path to be used prior to this point and are now operating
104694+ on that copy
104695+ */
104696+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
104697+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
104698+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
104699+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
104700+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
104701+ retval = -EPERM;
104702+ goto out;
104703+ }
104704+#endif
104705+
104706 retval = -ENOMEM;
104707 new = prepare_kernel_cred(current);
104708 if (!new)
104709@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
104710 commit_creds(new);
104711
104712 retval = do_execve(getname_kernel(sub_info->path),
104713- (const char __user *const __user *)sub_info->argv,
104714- (const char __user *const __user *)sub_info->envp);
104715+ (const char __user *const __force_user *)sub_info->argv,
104716+ (const char __user *const __force_user *)sub_info->envp);
104717 out:
104718 sub_info->retval = retval;
104719 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
104720@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
104721 *
104722 * Thus the __user pointer cast is valid here.
104723 */
104724- sys_wait4(pid, (int __user *)&ret, 0, NULL);
104725+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
104726
104727 /*
104728 * If ret is 0, either ____call_usermodehelper failed and the
104729@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
104730 goto out;
104731
104732 INIT_WORK(&sub_info->work, __call_usermodehelper);
104733+#ifdef CONFIG_GRKERNSEC
104734+ sub_info->origpath = path;
104735+ sub_info->path = kstrdup(path, gfp_mask);
104736+#else
104737 sub_info->path = path;
104738+#endif
104739 sub_info->argv = argv;
104740 sub_info->envp = envp;
104741
104742@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
104743 static int proc_cap_handler(struct ctl_table *table, int write,
104744 void __user *buffer, size_t *lenp, loff_t *ppos)
104745 {
104746- struct ctl_table t;
104747+ ctl_table_no_const t;
104748 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
104749 kernel_cap_t new_cap;
104750 int err, i;
104751diff --git a/kernel/kprobes.c b/kernel/kprobes.c
104752index c90e417..e6c515d 100644
104753--- a/kernel/kprobes.c
104754+++ b/kernel/kprobes.c
104755@@ -31,6 +31,9 @@
104756 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
104757 * <prasanna@in.ibm.com> added function-return probes.
104758 */
104759+#ifdef CONFIG_GRKERNSEC_HIDESYM
104760+#define __INCLUDED_BY_HIDESYM 1
104761+#endif
104762 #include <linux/kprobes.h>
104763 #include <linux/hash.h>
104764 #include <linux/init.h>
104765@@ -122,12 +125,12 @@ enum kprobe_slot_state {
104766
104767 static void *alloc_insn_page(void)
104768 {
104769- return module_alloc(PAGE_SIZE);
104770+ return module_alloc_exec(PAGE_SIZE);
104771 }
104772
104773 static void free_insn_page(void *page)
104774 {
104775- module_memfree(page);
104776+ module_memfree_exec(page);
104777 }
104778
104779 struct kprobe_insn_cache kprobe_insn_slots = {
104780@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
104781 kprobe_type = "k";
104782
104783 if (sym)
104784- seq_printf(pi, "%p %s %s+0x%x %s ",
104785+ seq_printf(pi, "%pK %s %s+0x%x %s ",
104786 p->addr, kprobe_type, sym, offset,
104787 (modname ? modname : " "));
104788 else
104789- seq_printf(pi, "%p %s %p ",
104790+ seq_printf(pi, "%pK %s %pK ",
104791 p->addr, kprobe_type, p->addr);
104792
104793 if (!pp)
104794diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
104795index 6683cce..daf8999 100644
104796--- a/kernel/ksysfs.c
104797+++ b/kernel/ksysfs.c
104798@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
104799 {
104800 if (count+1 > UEVENT_HELPER_PATH_LEN)
104801 return -ENOENT;
104802+ if (!capable(CAP_SYS_ADMIN))
104803+ return -EPERM;
104804 memcpy(uevent_helper, buf, count);
104805 uevent_helper[count] = '\0';
104806 if (count && uevent_helper[count-1] == '\n')
104807@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
104808 return count;
104809 }
104810
104811-static struct bin_attribute notes_attr = {
104812+static bin_attribute_no_const notes_attr __read_only = {
104813 .attr = {
104814 .name = "notes",
104815 .mode = S_IRUGO,
104816diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
104817index aaeae88..10f3663 100644
104818--- a/kernel/locking/lockdep.c
104819+++ b/kernel/locking/lockdep.c
104820@@ -613,6 +613,10 @@ static int static_obj(void *obj)
104821 end = (unsigned long) &_end,
104822 addr = (unsigned long) obj;
104823
104824+#ifdef CONFIG_PAX_KERNEXEC
104825+ start = ktla_ktva(start);
104826+#endif
104827+
104828 /*
104829 * static variable?
104830 */
104831@@ -757,6 +761,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
104832 if (!static_obj(lock->key)) {
104833 debug_locks_off();
104834 printk("INFO: trying to register non-static key.\n");
104835+ printk("lock:%pS key:%pS.\n", lock, lock->key);
104836 printk("the code is fine but needs lockdep annotation.\n");
104837 printk("turning off the locking correctness validator.\n");
104838 dump_stack();
104839@@ -3102,7 +3107,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
104840 if (!class)
104841 return 0;
104842 }
104843- atomic_inc((atomic_t *)&class->ops);
104844+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
104845 if (very_verbose(class)) {
104846 printk("\nacquire class [%p] %s", class->key, class->name);
104847 if (class->name_version > 1)
104848diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
104849index d83d798..ea3120d 100644
104850--- a/kernel/locking/lockdep_proc.c
104851+++ b/kernel/locking/lockdep_proc.c
104852@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
104853 return 0;
104854 }
104855
104856- seq_printf(m, "%p", class->key);
104857+ seq_printf(m, "%pK", class->key);
104858 #ifdef CONFIG_DEBUG_LOCKDEP
104859 seq_printf(m, " OPS:%8ld", class->ops);
104860 #endif
104861@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
104862
104863 list_for_each_entry(entry, &class->locks_after, entry) {
104864 if (entry->distance == 1) {
104865- seq_printf(m, " -> [%p] ", entry->class->key);
104866+ seq_printf(m, " -> [%pK] ", entry->class->key);
104867 print_name(m, entry->class);
104868 seq_puts(m, "\n");
104869 }
104870@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
104871 if (!class->key)
104872 continue;
104873
104874- seq_printf(m, "[%p] ", class->key);
104875+ seq_printf(m, "[%pK] ", class->key);
104876 print_name(m, class);
104877 seq_puts(m, "\n");
104878 }
104879@@ -508,7 +508,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
104880 if (!i)
104881 seq_line(m, '-', 40-namelen, namelen);
104882
104883- snprintf(ip, sizeof(ip), "[<%p>]",
104884+ snprintf(ip, sizeof(ip), "[<%pK>]",
104885 (void *)class->contention_point[i]);
104886 seq_printf(m, "%40s %14lu %29s %pS\n",
104887 name, stats->contention_point[i],
104888@@ -523,7 +523,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
104889 if (!i)
104890 seq_line(m, '-', 40-namelen, namelen);
104891
104892- snprintf(ip, sizeof(ip), "[<%p>]",
104893+ snprintf(ip, sizeof(ip), "[<%pK>]",
104894 (void *)class->contending_point[i]);
104895 seq_printf(m, "%40s %14lu %29s %pS\n",
104896 name, stats->contending_point[i],
104897diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
104898index 3ef3736..9c951fa 100644
104899--- a/kernel/locking/mutex-debug.c
104900+++ b/kernel/locking/mutex-debug.c
104901@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
104902 }
104903
104904 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
104905- struct thread_info *ti)
104906+ struct task_struct *task)
104907 {
104908 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
104909
104910 /* Mark the current thread as blocked on the lock: */
104911- ti->task->blocked_on = waiter;
104912+ task->blocked_on = waiter;
104913 }
104914
104915 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
104916- struct thread_info *ti)
104917+ struct task_struct *task)
104918 {
104919 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
104920- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
104921- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
104922- ti->task->blocked_on = NULL;
104923+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
104924+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
104925+ task->blocked_on = NULL;
104926
104927 list_del_init(&waiter->list);
104928 waiter->task = NULL;
104929diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
104930index 0799fd3..d06ae3b 100644
104931--- a/kernel/locking/mutex-debug.h
104932+++ b/kernel/locking/mutex-debug.h
104933@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
104934 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
104935 extern void debug_mutex_add_waiter(struct mutex *lock,
104936 struct mutex_waiter *waiter,
104937- struct thread_info *ti);
104938+ struct task_struct *task);
104939 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
104940- struct thread_info *ti);
104941+ struct task_struct *task);
104942 extern void debug_mutex_unlock(struct mutex *lock);
104943 extern void debug_mutex_init(struct mutex *lock, const char *name,
104944 struct lock_class_key *key);
104945diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
104946index 4cccea6..4382db9 100644
104947--- a/kernel/locking/mutex.c
104948+++ b/kernel/locking/mutex.c
104949@@ -533,7 +533,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
104950 goto skip_wait;
104951
104952 debug_mutex_lock_common(lock, &waiter);
104953- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
104954+ debug_mutex_add_waiter(lock, &waiter, task);
104955
104956 /* add waiting tasks to the end of the waitqueue (FIFO): */
104957 list_add_tail(&waiter.list, &lock->wait_list);
104958@@ -580,7 +580,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
104959 }
104960 __set_task_state(task, TASK_RUNNING);
104961
104962- mutex_remove_waiter(lock, &waiter, current_thread_info());
104963+ mutex_remove_waiter(lock, &waiter, task);
104964 /* set it to 0 if there are no waiters left: */
104965 if (likely(list_empty(&lock->wait_list)))
104966 atomic_set(&lock->count, 0);
104967@@ -601,7 +601,7 @@ skip_wait:
104968 return 0;
104969
104970 err:
104971- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
104972+ mutex_remove_waiter(lock, &waiter, task);
104973 spin_unlock_mutex(&lock->wait_lock, flags);
104974 debug_mutex_free_waiter(&waiter);
104975 mutex_release(&lock->dep_map, 1, ip);
104976diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
104977index 1d96dd0..994ff19 100644
104978--- a/kernel/locking/rtmutex-tester.c
104979+++ b/kernel/locking/rtmutex-tester.c
104980@@ -22,7 +22,7 @@
104981 #define MAX_RT_TEST_MUTEXES 8
104982
104983 static spinlock_t rttest_lock;
104984-static atomic_t rttest_event;
104985+static atomic_unchecked_t rttest_event;
104986
104987 struct test_thread_data {
104988 int opcode;
104989@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
104990
104991 case RTTEST_LOCKCONT:
104992 td->mutexes[td->opdata] = 1;
104993- td->event = atomic_add_return(1, &rttest_event);
104994+ td->event = atomic_add_return_unchecked(1, &rttest_event);
104995 return 0;
104996
104997 case RTTEST_RESET:
104998@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
104999 return 0;
105000
105001 case RTTEST_RESETEVENT:
105002- atomic_set(&rttest_event, 0);
105003+ atomic_set_unchecked(&rttest_event, 0);
105004 return 0;
105005
105006 default:
105007@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105008 return ret;
105009
105010 td->mutexes[id] = 1;
105011- td->event = atomic_add_return(1, &rttest_event);
105012+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105013 rt_mutex_lock(&mutexes[id]);
105014- td->event = atomic_add_return(1, &rttest_event);
105015+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105016 td->mutexes[id] = 4;
105017 return 0;
105018
105019@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105020 return ret;
105021
105022 td->mutexes[id] = 1;
105023- td->event = atomic_add_return(1, &rttest_event);
105024+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105025 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
105026- td->event = atomic_add_return(1, &rttest_event);
105027+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105028 td->mutexes[id] = ret ? 0 : 4;
105029 return ret ? -EINTR : 0;
105030
105031@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105032 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
105033 return ret;
105034
105035- td->event = atomic_add_return(1, &rttest_event);
105036+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105037 rt_mutex_unlock(&mutexes[id]);
105038- td->event = atomic_add_return(1, &rttest_event);
105039+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105040 td->mutexes[id] = 0;
105041 return 0;
105042
105043@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105044 break;
105045
105046 td->mutexes[dat] = 2;
105047- td->event = atomic_add_return(1, &rttest_event);
105048+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105049 break;
105050
105051 default:
105052@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105053 return;
105054
105055 td->mutexes[dat] = 3;
105056- td->event = atomic_add_return(1, &rttest_event);
105057+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105058 break;
105059
105060 case RTTEST_LOCKNOWAIT:
105061@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105062 return;
105063
105064 td->mutexes[dat] = 1;
105065- td->event = atomic_add_return(1, &rttest_event);
105066+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105067 return;
105068
105069 default:
105070diff --git a/kernel/module.c b/kernel/module.c
105071index cfc9e84..a058697 100644
105072--- a/kernel/module.c
105073+++ b/kernel/module.c
105074@@ -59,6 +59,7 @@
105075 #include <linux/jump_label.h>
105076 #include <linux/pfn.h>
105077 #include <linux/bsearch.h>
105078+#include <linux/grsecurity.h>
105079 #include <uapi/linux/module.h>
105080 #include "module-internal.h"
105081
105082@@ -145,7 +146,7 @@ module_param(sig_enforce, bool_enable_only, 0644);
105083 #endif /* CONFIG_MODULE_SIG */
105084
105085 /* Block module loading/unloading? */
105086-int modules_disabled = 0;
105087+int modules_disabled __read_only = 0;
105088 core_param(nomodule, modules_disabled, bint, 0);
105089
105090 /* Waiting for a module to finish initializing? */
105091@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
105092
105093 /* Bounds of module allocation, for speeding __module_address.
105094 * Protected by module_mutex. */
105095-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
105096+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
105097+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
105098
105099 int register_module_notifier(struct notifier_block *nb)
105100 {
105101@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105102 return true;
105103
105104 list_for_each_entry_rcu(mod, &modules, list) {
105105- struct symsearch arr[] = {
105106+ struct symsearch modarr[] = {
105107 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
105108 NOT_GPL_ONLY, false },
105109 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
105110@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105111 if (mod->state == MODULE_STATE_UNFORMED)
105112 continue;
105113
105114- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
105115+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
105116 return true;
105117 }
105118 return false;
105119@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
105120 if (!pcpusec->sh_size)
105121 return 0;
105122
105123- if (align > PAGE_SIZE) {
105124+ if (align-1 >= PAGE_SIZE) {
105125 pr_warn("%s: per-cpu alignment %li > %li\n",
105126 mod->name, align, PAGE_SIZE);
105127 align = PAGE_SIZE;
105128@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
105129 static ssize_t show_coresize(struct module_attribute *mattr,
105130 struct module_kobject *mk, char *buffer)
105131 {
105132- return sprintf(buffer, "%u\n", mk->mod->core_size);
105133+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
105134 }
105135
105136 static struct module_attribute modinfo_coresize =
105137@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
105138 static ssize_t show_initsize(struct module_attribute *mattr,
105139 struct module_kobject *mk, char *buffer)
105140 {
105141- return sprintf(buffer, "%u\n", mk->mod->init_size);
105142+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
105143 }
105144
105145 static struct module_attribute modinfo_initsize =
105146@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
105147 goto bad_version;
105148 }
105149
105150+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105151+ /*
105152+ * avoid potentially printing jibberish on attempted load
105153+ * of a module randomized with a different seed
105154+ */
105155+ pr_warn("no symbol version for %s\n", symname);
105156+#else
105157 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
105158+#endif
105159 return 0;
105160
105161 bad_version:
105162+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105163+ /*
105164+ * avoid potentially printing jibberish on attempted load
105165+ * of a module randomized with a different seed
105166+ */
105167+ pr_warn("attempted module disagrees about version of symbol %s\n",
105168+ symname);
105169+#else
105170 pr_warn("%s: disagrees about version of symbol %s\n",
105171 mod->name, symname);
105172+#endif
105173 return 0;
105174 }
105175
105176@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
105177 */
105178 #ifdef CONFIG_SYSFS
105179
105180-#ifdef CONFIG_KALLSYMS
105181+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
105182 static inline bool sect_empty(const Elf_Shdr *sect)
105183 {
105184 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
105185@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
105186 {
105187 unsigned int notes, loaded, i;
105188 struct module_notes_attrs *notes_attrs;
105189- struct bin_attribute *nattr;
105190+ bin_attribute_no_const *nattr;
105191
105192 /* failed to create section attributes, so can't create notes */
105193 if (!mod->sect_attrs)
105194@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
105195 static int module_add_modinfo_attrs(struct module *mod)
105196 {
105197 struct module_attribute *attr;
105198- struct module_attribute *temp_attr;
105199+ module_attribute_no_const *temp_attr;
105200 int error = 0;
105201 int i;
105202
105203@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
105204
105205 static void unset_module_core_ro_nx(struct module *mod)
105206 {
105207- set_page_attributes(mod->module_core + mod->core_text_size,
105208- mod->module_core + mod->core_size,
105209+ set_page_attributes(mod->module_core_rw,
105210+ mod->module_core_rw + mod->core_size_rw,
105211 set_memory_x);
105212- set_page_attributes(mod->module_core,
105213- mod->module_core + mod->core_ro_size,
105214+ set_page_attributes(mod->module_core_rx,
105215+ mod->module_core_rx + mod->core_size_rx,
105216 set_memory_rw);
105217 }
105218
105219 static void unset_module_init_ro_nx(struct module *mod)
105220 {
105221- set_page_attributes(mod->module_init + mod->init_text_size,
105222- mod->module_init + mod->init_size,
105223+ set_page_attributes(mod->module_init_rw,
105224+ mod->module_init_rw + mod->init_size_rw,
105225 set_memory_x);
105226- set_page_attributes(mod->module_init,
105227- mod->module_init + mod->init_ro_size,
105228+ set_page_attributes(mod->module_init_rx,
105229+ mod->module_init_rx + mod->init_size_rx,
105230 set_memory_rw);
105231 }
105232
105233@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
105234 list_for_each_entry_rcu(mod, &modules, list) {
105235 if (mod->state == MODULE_STATE_UNFORMED)
105236 continue;
105237- if ((mod->module_core) && (mod->core_text_size)) {
105238- set_page_attributes(mod->module_core,
105239- mod->module_core + mod->core_text_size,
105240+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105241+ set_page_attributes(mod->module_core_rx,
105242+ mod->module_core_rx + mod->core_size_rx,
105243 set_memory_rw);
105244 }
105245- if ((mod->module_init) && (mod->init_text_size)) {
105246- set_page_attributes(mod->module_init,
105247- mod->module_init + mod->init_text_size,
105248+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105249+ set_page_attributes(mod->module_init_rx,
105250+ mod->module_init_rx + mod->init_size_rx,
105251 set_memory_rw);
105252 }
105253 }
105254@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
105255 list_for_each_entry_rcu(mod, &modules, list) {
105256 if (mod->state == MODULE_STATE_UNFORMED)
105257 continue;
105258- if ((mod->module_core) && (mod->core_text_size)) {
105259- set_page_attributes(mod->module_core,
105260- mod->module_core + mod->core_text_size,
105261+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105262+ set_page_attributes(mod->module_core_rx,
105263+ mod->module_core_rx + mod->core_size_rx,
105264 set_memory_ro);
105265 }
105266- if ((mod->module_init) && (mod->init_text_size)) {
105267- set_page_attributes(mod->module_init,
105268- mod->module_init + mod->init_text_size,
105269+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105270+ set_page_attributes(mod->module_init_rx,
105271+ mod->module_init_rx + mod->init_size_rx,
105272 set_memory_ro);
105273 }
105274 }
105275@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
105276 #else
105277 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
105278 static void unset_module_core_ro_nx(struct module *mod) { }
105279-static void unset_module_init_ro_nx(struct module *mod) { }
105280+static void unset_module_init_ro_nx(struct module *mod)
105281+{
105282+
105283+#ifdef CONFIG_PAX_KERNEXEC
105284+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105285+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105286+#endif
105287+
105288+}
105289 #endif
105290
105291 void __weak module_memfree(void *module_region)
105292@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
105293 /* This may be NULL, but that's OK */
105294 unset_module_init_ro_nx(mod);
105295 module_arch_freeing_init(mod);
105296- module_memfree(mod->module_init);
105297+ module_memfree(mod->module_init_rw);
105298+ module_memfree_exec(mod->module_init_rx);
105299 kfree(mod->args);
105300 percpu_modfree(mod);
105301
105302 /* Free lock-classes; relies on the preceding sync_rcu(). */
105303- lockdep_free_key_range(mod->module_core, mod->core_size);
105304+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
105305+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
105306
105307 /* Finally, free the core (containing the module structure) */
105308 unset_module_core_ro_nx(mod);
105309- module_memfree(mod->module_core);
105310+ module_memfree_exec(mod->module_core_rx);
105311+ module_memfree(mod->module_core_rw);
105312
105313 #ifdef CONFIG_MPU
105314 update_protections(current->mm);
105315@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105316 int ret = 0;
105317 const struct kernel_symbol *ksym;
105318
105319+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105320+ int is_fs_load = 0;
105321+ int register_filesystem_found = 0;
105322+ char *p;
105323+
105324+ p = strstr(mod->args, "grsec_modharden_fs");
105325+ if (p) {
105326+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
105327+ /* copy \0 as well */
105328+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
105329+ is_fs_load = 1;
105330+ }
105331+#endif
105332+
105333 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
105334 const char *name = info->strtab + sym[i].st_name;
105335
105336+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105337+ /* it's a real shame this will never get ripped and copied
105338+ upstream! ;(
105339+ */
105340+ if (is_fs_load && !strcmp(name, "register_filesystem"))
105341+ register_filesystem_found = 1;
105342+#endif
105343+
105344 switch (sym[i].st_shndx) {
105345 case SHN_COMMON:
105346 /* Ignore common symbols */
105347@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105348 ksym = resolve_symbol_wait(mod, info, name);
105349 /* Ok if resolved. */
105350 if (ksym && !IS_ERR(ksym)) {
105351+ pax_open_kernel();
105352 sym[i].st_value = ksym->value;
105353+ pax_close_kernel();
105354 break;
105355 }
105356
105357@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105358 secbase = (unsigned long)mod_percpu(mod);
105359 else
105360 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
105361+ pax_open_kernel();
105362 sym[i].st_value += secbase;
105363+ pax_close_kernel();
105364 break;
105365 }
105366 }
105367
105368+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105369+ if (is_fs_load && !register_filesystem_found) {
105370+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
105371+ ret = -EPERM;
105372+ }
105373+#endif
105374+
105375 return ret;
105376 }
105377
105378@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
105379 || s->sh_entsize != ~0UL
105380 || strstarts(sname, ".init"))
105381 continue;
105382- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
105383+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105384+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
105385+ else
105386+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
105387 pr_debug("\t%s\n", sname);
105388 }
105389- switch (m) {
105390- case 0: /* executable */
105391- mod->core_size = debug_align(mod->core_size);
105392- mod->core_text_size = mod->core_size;
105393- break;
105394- case 1: /* RO: text and ro-data */
105395- mod->core_size = debug_align(mod->core_size);
105396- mod->core_ro_size = mod->core_size;
105397- break;
105398- case 3: /* whole core */
105399- mod->core_size = debug_align(mod->core_size);
105400- break;
105401- }
105402 }
105403
105404 pr_debug("Init section allocation order:\n");
105405@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
105406 || s->sh_entsize != ~0UL
105407 || !strstarts(sname, ".init"))
105408 continue;
105409- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
105410- | INIT_OFFSET_MASK);
105411+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105412+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
105413+ else
105414+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
105415+ s->sh_entsize |= INIT_OFFSET_MASK;
105416 pr_debug("\t%s\n", sname);
105417 }
105418- switch (m) {
105419- case 0: /* executable */
105420- mod->init_size = debug_align(mod->init_size);
105421- mod->init_text_size = mod->init_size;
105422- break;
105423- case 1: /* RO: text and ro-data */
105424- mod->init_size = debug_align(mod->init_size);
105425- mod->init_ro_size = mod->init_size;
105426- break;
105427- case 3: /* whole init */
105428- mod->init_size = debug_align(mod->init_size);
105429- break;
105430- }
105431 }
105432 }
105433
105434@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105435
105436 /* Put symbol section at end of init part of module. */
105437 symsect->sh_flags |= SHF_ALLOC;
105438- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
105439+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
105440 info->index.sym) | INIT_OFFSET_MASK;
105441 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
105442
105443@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105444 }
105445
105446 /* Append room for core symbols at end of core part. */
105447- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
105448- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
105449- mod->core_size += strtab_size;
105450- mod->core_size = debug_align(mod->core_size);
105451+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
105452+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
105453+ mod->core_size_rx += strtab_size;
105454+ mod->core_size_rx = debug_align(mod->core_size_rx);
105455
105456 /* Put string table section at end of init part of module. */
105457 strsect->sh_flags |= SHF_ALLOC;
105458- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
105459+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
105460 info->index.str) | INIT_OFFSET_MASK;
105461- mod->init_size = debug_align(mod->init_size);
105462+ mod->init_size_rx = debug_align(mod->init_size_rx);
105463 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
105464 }
105465
105466@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105467 /* Make sure we get permanent strtab: don't use info->strtab. */
105468 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
105469
105470+ pax_open_kernel();
105471+
105472 /* Set types up while we still have access to sections. */
105473 for (i = 0; i < mod->num_symtab; i++)
105474 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
105475
105476- mod->core_symtab = dst = mod->module_core + info->symoffs;
105477- mod->core_strtab = s = mod->module_core + info->stroffs;
105478+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
105479+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
105480 src = mod->symtab;
105481 for (ndst = i = 0; i < mod->num_symtab; i++) {
105482 if (i == 0 ||
105483@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105484 }
105485 }
105486 mod->core_num_syms = ndst;
105487+
105488+ pax_close_kernel();
105489 }
105490 #else
105491 static inline void layout_symtab(struct module *mod, struct load_info *info)
105492@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
105493 return vmalloc_exec(size);
105494 }
105495
105496-static void *module_alloc_update_bounds(unsigned long size)
105497+static void *module_alloc_update_bounds_rw(unsigned long size)
105498 {
105499 void *ret = module_alloc(size);
105500
105501 if (ret) {
105502 mutex_lock(&module_mutex);
105503 /* Update module bounds. */
105504- if ((unsigned long)ret < module_addr_min)
105505- module_addr_min = (unsigned long)ret;
105506- if ((unsigned long)ret + size > module_addr_max)
105507- module_addr_max = (unsigned long)ret + size;
105508+ if ((unsigned long)ret < module_addr_min_rw)
105509+ module_addr_min_rw = (unsigned long)ret;
105510+ if ((unsigned long)ret + size > module_addr_max_rw)
105511+ module_addr_max_rw = (unsigned long)ret + size;
105512+ mutex_unlock(&module_mutex);
105513+ }
105514+ return ret;
105515+}
105516+
105517+static void *module_alloc_update_bounds_rx(unsigned long size)
105518+{
105519+ void *ret = module_alloc_exec(size);
105520+
105521+ if (ret) {
105522+ mutex_lock(&module_mutex);
105523+ /* Update module bounds. */
105524+ if ((unsigned long)ret < module_addr_min_rx)
105525+ module_addr_min_rx = (unsigned long)ret;
105526+ if ((unsigned long)ret + size > module_addr_max_rx)
105527+ module_addr_max_rx = (unsigned long)ret + size;
105528 mutex_unlock(&module_mutex);
105529 }
105530 return ret;
105531@@ -2666,7 +2729,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105532 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
105533
105534 if (info->index.sym == 0) {
105535+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105536+ /*
105537+ * avoid potentially printing jibberish on attempted load
105538+ * of a module randomized with a different seed
105539+ */
105540+ pr_warn("module has no symbols (stripped?)\n");
105541+#else
105542 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
105543+#endif
105544 return ERR_PTR(-ENOEXEC);
105545 }
105546
105547@@ -2682,8 +2753,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105548 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105549 {
105550 const char *modmagic = get_modinfo(info, "vermagic");
105551+ const char *license = get_modinfo(info, "license");
105552 int err;
105553
105554+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
105555+ if (!license || !license_is_gpl_compatible(license))
105556+ return -ENOEXEC;
105557+#endif
105558+
105559 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
105560 modmagic = NULL;
105561
105562@@ -2708,7 +2785,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105563 }
105564
105565 /* Set up license info based on the info section */
105566- set_license(mod, get_modinfo(info, "license"));
105567+ set_license(mod, license);
105568
105569 return 0;
105570 }
105571@@ -2805,7 +2882,7 @@ static int move_module(struct module *mod, struct load_info *info)
105572 void *ptr;
105573
105574 /* Do the allocs. */
105575- ptr = module_alloc_update_bounds(mod->core_size);
105576+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
105577 /*
105578 * The pointer to this block is stored in the module structure
105579 * which is inside the block. Just mark it as not being a
105580@@ -2815,11 +2892,11 @@ static int move_module(struct module *mod, struct load_info *info)
105581 if (!ptr)
105582 return -ENOMEM;
105583
105584- memset(ptr, 0, mod->core_size);
105585- mod->module_core = ptr;
105586+ memset(ptr, 0, mod->core_size_rw);
105587+ mod->module_core_rw = ptr;
105588
105589- if (mod->init_size) {
105590- ptr = module_alloc_update_bounds(mod->init_size);
105591+ if (mod->init_size_rw) {
105592+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
105593 /*
105594 * The pointer to this block is stored in the module structure
105595 * which is inside the block. This block doesn't need to be
105596@@ -2828,13 +2905,45 @@ static int move_module(struct module *mod, struct load_info *info)
105597 */
105598 kmemleak_ignore(ptr);
105599 if (!ptr) {
105600- module_memfree(mod->module_core);
105601+ module_memfree(mod->module_core_rw);
105602 return -ENOMEM;
105603 }
105604- memset(ptr, 0, mod->init_size);
105605- mod->module_init = ptr;
105606+ memset(ptr, 0, mod->init_size_rw);
105607+ mod->module_init_rw = ptr;
105608 } else
105609- mod->module_init = NULL;
105610+ mod->module_init_rw = NULL;
105611+
105612+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
105613+ kmemleak_not_leak(ptr);
105614+ if (!ptr) {
105615+ if (mod->module_init_rw)
105616+ module_memfree(mod->module_init_rw);
105617+ module_memfree(mod->module_core_rw);
105618+ return -ENOMEM;
105619+ }
105620+
105621+ pax_open_kernel();
105622+ memset(ptr, 0, mod->core_size_rx);
105623+ pax_close_kernel();
105624+ mod->module_core_rx = ptr;
105625+
105626+ if (mod->init_size_rx) {
105627+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
105628+ kmemleak_ignore(ptr);
105629+ if (!ptr && mod->init_size_rx) {
105630+ module_memfree_exec(mod->module_core_rx);
105631+ if (mod->module_init_rw)
105632+ module_memfree(mod->module_init_rw);
105633+ module_memfree(mod->module_core_rw);
105634+ return -ENOMEM;
105635+ }
105636+
105637+ pax_open_kernel();
105638+ memset(ptr, 0, mod->init_size_rx);
105639+ pax_close_kernel();
105640+ mod->module_init_rx = ptr;
105641+ } else
105642+ mod->module_init_rx = NULL;
105643
105644 /* Transfer each section which specifies SHF_ALLOC */
105645 pr_debug("final section addresses:\n");
105646@@ -2845,16 +2954,45 @@ static int move_module(struct module *mod, struct load_info *info)
105647 if (!(shdr->sh_flags & SHF_ALLOC))
105648 continue;
105649
105650- if (shdr->sh_entsize & INIT_OFFSET_MASK)
105651- dest = mod->module_init
105652- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105653- else
105654- dest = mod->module_core + shdr->sh_entsize;
105655+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
105656+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105657+ dest = mod->module_init_rw
105658+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105659+ else
105660+ dest = mod->module_init_rx
105661+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105662+ } else {
105663+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105664+ dest = mod->module_core_rw + shdr->sh_entsize;
105665+ else
105666+ dest = mod->module_core_rx + shdr->sh_entsize;
105667+ }
105668+
105669+ if (shdr->sh_type != SHT_NOBITS) {
105670+
105671+#ifdef CONFIG_PAX_KERNEXEC
105672+#ifdef CONFIG_X86_64
105673+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
105674+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
105675+#endif
105676+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
105677+ pax_open_kernel();
105678+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105679+ pax_close_kernel();
105680+ } else
105681+#endif
105682
105683- if (shdr->sh_type != SHT_NOBITS)
105684 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105685+ }
105686 /* Update sh_addr to point to copy in image. */
105687- shdr->sh_addr = (unsigned long)dest;
105688+
105689+#ifdef CONFIG_PAX_KERNEXEC
105690+ if (shdr->sh_flags & SHF_EXECINSTR)
105691+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
105692+ else
105693+#endif
105694+
105695+ shdr->sh_addr = (unsigned long)dest;
105696 pr_debug("\t0x%lx %s\n",
105697 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
105698 }
105699@@ -2911,12 +3049,12 @@ static void flush_module_icache(const struct module *mod)
105700 * Do it before processing of module parameters, so the module
105701 * can provide parameter accessor functions of its own.
105702 */
105703- if (mod->module_init)
105704- flush_icache_range((unsigned long)mod->module_init,
105705- (unsigned long)mod->module_init
105706- + mod->init_size);
105707- flush_icache_range((unsigned long)mod->module_core,
105708- (unsigned long)mod->module_core + mod->core_size);
105709+ if (mod->module_init_rx)
105710+ flush_icache_range((unsigned long)mod->module_init_rx,
105711+ (unsigned long)mod->module_init_rx
105712+ + mod->init_size_rx);
105713+ flush_icache_range((unsigned long)mod->module_core_rx,
105714+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
105715
105716 set_fs(old_fs);
105717 }
105718@@ -2974,8 +3112,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
105719 {
105720 percpu_modfree(mod);
105721 module_arch_freeing_init(mod);
105722- module_memfree(mod->module_init);
105723- module_memfree(mod->module_core);
105724+ module_memfree_exec(mod->module_init_rx);
105725+ module_memfree_exec(mod->module_core_rx);
105726+ module_memfree(mod->module_init_rw);
105727+ module_memfree(mod->module_core_rw);
105728 }
105729
105730 int __weak module_finalize(const Elf_Ehdr *hdr,
105731@@ -2988,7 +3128,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
105732 static int post_relocation(struct module *mod, const struct load_info *info)
105733 {
105734 /* Sort exception table now relocations are done. */
105735+ pax_open_kernel();
105736 sort_extable(mod->extable, mod->extable + mod->num_exentries);
105737+ pax_close_kernel();
105738
105739 /* Copy relocated percpu area over. */
105740 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
105741@@ -3036,13 +3178,15 @@ static void do_mod_ctors(struct module *mod)
105742 /* For freeing module_init on success, in case kallsyms traversing */
105743 struct mod_initfree {
105744 struct rcu_head rcu;
105745- void *module_init;
105746+ void *module_init_rw;
105747+ void *module_init_rx;
105748 };
105749
105750 static void do_free_init(struct rcu_head *head)
105751 {
105752 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
105753- module_memfree(m->module_init);
105754+ module_memfree(m->module_init_rw);
105755+ module_memfree_exec(m->module_init_rx);
105756 kfree(m);
105757 }
105758
105759@@ -3062,7 +3206,8 @@ static noinline int do_init_module(struct module *mod)
105760 ret = -ENOMEM;
105761 goto fail;
105762 }
105763- freeinit->module_init = mod->module_init;
105764+ freeinit->module_init_rw = mod->module_init_rw;
105765+ freeinit->module_init_rx = mod->module_init_rx;
105766
105767 /*
105768 * We want to find out whether @mod uses async during init. Clear
105769@@ -3121,10 +3266,10 @@ static noinline int do_init_module(struct module *mod)
105770 #endif
105771 unset_module_init_ro_nx(mod);
105772 module_arch_freeing_init(mod);
105773- mod->module_init = NULL;
105774- mod->init_size = 0;
105775- mod->init_ro_size = 0;
105776- mod->init_text_size = 0;
105777+ mod->module_init_rw = NULL;
105778+ mod->module_init_rx = NULL;
105779+ mod->init_size_rw = 0;
105780+ mod->init_size_rx = 0;
105781 /*
105782 * We want to free module_init, but be aware that kallsyms may be
105783 * walking this with preempt disabled. In all the failure paths,
105784@@ -3212,16 +3357,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
105785 module_bug_finalize(info->hdr, info->sechdrs, mod);
105786
105787 /* Set RO and NX regions for core */
105788- set_section_ro_nx(mod->module_core,
105789- mod->core_text_size,
105790- mod->core_ro_size,
105791- mod->core_size);
105792+ set_section_ro_nx(mod->module_core_rx,
105793+ mod->core_size_rx,
105794+ mod->core_size_rx,
105795+ mod->core_size_rx);
105796
105797 /* Set RO and NX regions for init */
105798- set_section_ro_nx(mod->module_init,
105799- mod->init_text_size,
105800- mod->init_ro_size,
105801- mod->init_size);
105802+ set_section_ro_nx(mod->module_init_rx,
105803+ mod->init_size_rx,
105804+ mod->init_size_rx,
105805+ mod->init_size_rx);
105806
105807 /* Mark state as coming so strong_try_module_get() ignores us,
105808 * but kallsyms etc. can see us. */
105809@@ -3305,9 +3450,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
105810 if (err)
105811 goto free_unload;
105812
105813+ /* Now copy in args */
105814+ mod->args = strndup_user(uargs, ~0UL >> 1);
105815+ if (IS_ERR(mod->args)) {
105816+ err = PTR_ERR(mod->args);
105817+ goto free_unload;
105818+ }
105819+
105820 /* Set up MODINFO_ATTR fields */
105821 setup_modinfo(mod, info);
105822
105823+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105824+ {
105825+ char *p, *p2;
105826+
105827+ if (strstr(mod->args, "grsec_modharden_netdev")) {
105828+ 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);
105829+ err = -EPERM;
105830+ goto free_modinfo;
105831+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
105832+ p += sizeof("grsec_modharden_normal") - 1;
105833+ p2 = strstr(p, "_");
105834+ if (p2) {
105835+ *p2 = '\0';
105836+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
105837+ *p2 = '_';
105838+ }
105839+ err = -EPERM;
105840+ goto free_modinfo;
105841+ }
105842+ }
105843+#endif
105844+
105845 /* Fix up syms, so that st_value is a pointer to location. */
105846 err = simplify_symbols(mod, info);
105847 if (err < 0)
105848@@ -3323,13 +3497,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
105849
105850 flush_module_icache(mod);
105851
105852- /* Now copy in args */
105853- mod->args = strndup_user(uargs, ~0UL >> 1);
105854- if (IS_ERR(mod->args)) {
105855- err = PTR_ERR(mod->args);
105856- goto free_arch_cleanup;
105857- }
105858-
105859 dynamic_debug_setup(info->debug, info->num_debug);
105860
105861 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
105862@@ -3380,11 +3547,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
105863 ddebug_cleanup:
105864 dynamic_debug_remove(info->debug);
105865 synchronize_sched();
105866- kfree(mod->args);
105867- free_arch_cleanup:
105868 module_arch_cleanup(mod);
105869 free_modinfo:
105870 free_modinfo(mod);
105871+ kfree(mod->args);
105872 free_unload:
105873 module_unload_free(mod);
105874 unlink_mod:
105875@@ -3397,7 +3563,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
105876 mutex_unlock(&module_mutex);
105877 free_module:
105878 /* Free lock-classes; relies on the preceding sync_rcu() */
105879- lockdep_free_key_range(mod->module_core, mod->core_size);
105880+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
105881+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
105882
105883 module_deallocate(mod, info);
105884 free_copy:
105885@@ -3474,10 +3641,16 @@ static const char *get_ksymbol(struct module *mod,
105886 unsigned long nextval;
105887
105888 /* At worse, next value is at end of module */
105889- if (within_module_init(addr, mod))
105890- nextval = (unsigned long)mod->module_init+mod->init_text_size;
105891+ if (within_module_init_rx(addr, mod))
105892+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
105893+ else if (within_module_init_rw(addr, mod))
105894+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
105895+ else if (within_module_core_rx(addr, mod))
105896+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
105897+ else if (within_module_core_rw(addr, mod))
105898+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
105899 else
105900- nextval = (unsigned long)mod->module_core+mod->core_text_size;
105901+ return NULL;
105902
105903 /* Scan for closest preceding symbol, and next symbol. (ELF
105904 starts real symbols at 1). */
105905@@ -3725,7 +3898,7 @@ static int m_show(struct seq_file *m, void *p)
105906 return 0;
105907
105908 seq_printf(m, "%s %u",
105909- mod->name, mod->init_size + mod->core_size);
105910+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
105911 print_unload_info(m, mod);
105912
105913 /* Informative for users. */
105914@@ -3734,7 +3907,7 @@ static int m_show(struct seq_file *m, void *p)
105915 mod->state == MODULE_STATE_COMING ? "Loading" :
105916 "Live");
105917 /* Used by oprofile and other similar tools. */
105918- seq_printf(m, " 0x%pK", mod->module_core);
105919+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
105920
105921 /* Taints info */
105922 if (mod->taints)
105923@@ -3770,7 +3943,17 @@ static const struct file_operations proc_modules_operations = {
105924
105925 static int __init proc_modules_init(void)
105926 {
105927+#ifndef CONFIG_GRKERNSEC_HIDESYM
105928+#ifdef CONFIG_GRKERNSEC_PROC_USER
105929+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
105930+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
105931+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
105932+#else
105933 proc_create("modules", 0, NULL, &proc_modules_operations);
105934+#endif
105935+#else
105936+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
105937+#endif
105938 return 0;
105939 }
105940 module_init(proc_modules_init);
105941@@ -3831,7 +4014,8 @@ struct module *__module_address(unsigned long addr)
105942 {
105943 struct module *mod;
105944
105945- if (addr < module_addr_min || addr > module_addr_max)
105946+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
105947+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
105948 return NULL;
105949
105950 list_for_each_entry_rcu(mod, &modules, list) {
105951@@ -3872,11 +4056,20 @@ bool is_module_text_address(unsigned long addr)
105952 */
105953 struct module *__module_text_address(unsigned long addr)
105954 {
105955- struct module *mod = __module_address(addr);
105956+ struct module *mod;
105957+
105958+#ifdef CONFIG_X86_32
105959+ addr = ktla_ktva(addr);
105960+#endif
105961+
105962+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
105963+ return NULL;
105964+
105965+ mod = __module_address(addr);
105966+
105967 if (mod) {
105968 /* Make sure it's within the text section. */
105969- if (!within(addr, mod->module_init, mod->init_text_size)
105970- && !within(addr, mod->module_core, mod->core_text_size))
105971+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
105972 mod = NULL;
105973 }
105974 return mod;
105975diff --git a/kernel/notifier.c b/kernel/notifier.c
105976index ae9fc7c..5085fbf 100644
105977--- a/kernel/notifier.c
105978+++ b/kernel/notifier.c
105979@@ -5,6 +5,7 @@
105980 #include <linux/rcupdate.h>
105981 #include <linux/vmalloc.h>
105982 #include <linux/reboot.h>
105983+#include <linux/mm.h>
105984
105985 /*
105986 * Notifier list for kernel code which wants to be called
105987@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
105988 while ((*nl) != NULL) {
105989 if (n->priority > (*nl)->priority)
105990 break;
105991- nl = &((*nl)->next);
105992+ nl = (struct notifier_block **)&((*nl)->next);
105993 }
105994- n->next = *nl;
105995+ pax_open_kernel();
105996+ *(const void **)&n->next = *nl;
105997 rcu_assign_pointer(*nl, n);
105998+ pax_close_kernel();
105999 return 0;
106000 }
106001
106002@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
106003 return 0;
106004 if (n->priority > (*nl)->priority)
106005 break;
106006- nl = &((*nl)->next);
106007+ nl = (struct notifier_block **)&((*nl)->next);
106008 }
106009- n->next = *nl;
106010+ pax_open_kernel();
106011+ *(const void **)&n->next = *nl;
106012 rcu_assign_pointer(*nl, n);
106013+ pax_close_kernel();
106014 return 0;
106015 }
106016
106017@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
106018 {
106019 while ((*nl) != NULL) {
106020 if ((*nl) == n) {
106021+ pax_open_kernel();
106022 rcu_assign_pointer(*nl, n->next);
106023+ pax_close_kernel();
106024 return 0;
106025 }
106026- nl = &((*nl)->next);
106027+ nl = (struct notifier_block **)&((*nl)->next);
106028 }
106029 return -ENOENT;
106030 }
106031diff --git a/kernel/padata.c b/kernel/padata.c
106032index b38bea9..91acfbe 100644
106033--- a/kernel/padata.c
106034+++ b/kernel/padata.c
106035@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
106036 * seq_nr mod. number of cpus in use.
106037 */
106038
106039- seq_nr = atomic_inc_return(&pd->seq_nr);
106040+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
106041 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
106042
106043 return padata_index_to_cpu(pd, cpu_index);
106044@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
106045 padata_init_pqueues(pd);
106046 padata_init_squeues(pd);
106047 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
106048- atomic_set(&pd->seq_nr, -1);
106049+ atomic_set_unchecked(&pd->seq_nr, -1);
106050 atomic_set(&pd->reorder_objects, 0);
106051 atomic_set(&pd->refcnt, 0);
106052 pd->pinst = pinst;
106053diff --git a/kernel/panic.c b/kernel/panic.c
106054index 8136ad7..15c857b 100644
106055--- a/kernel/panic.c
106056+++ b/kernel/panic.c
106057@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
106058 /*
106059 * Stop ourself in panic -- architecture code may override this
106060 */
106061-void __weak panic_smp_self_stop(void)
106062+void __weak __noreturn panic_smp_self_stop(void)
106063 {
106064 while (1)
106065 cpu_relax();
106066@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
106067 disable_trace_on_warning();
106068
106069 pr_warn("------------[ cut here ]------------\n");
106070- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
106071+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
106072 raw_smp_processor_id(), current->pid, file, line, caller);
106073
106074 if (args)
106075@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
106076 */
106077 __visible void __stack_chk_fail(void)
106078 {
106079- panic("stack-protector: Kernel stack is corrupted in: %p\n",
106080+ dump_stack();
106081+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
106082 __builtin_return_address(0));
106083 }
106084 EXPORT_SYMBOL(__stack_chk_fail);
106085diff --git a/kernel/pid.c b/kernel/pid.c
106086index 4fd07d5..02bce4f 100644
106087--- a/kernel/pid.c
106088+++ b/kernel/pid.c
106089@@ -33,6 +33,7 @@
106090 #include <linux/rculist.h>
106091 #include <linux/bootmem.h>
106092 #include <linux/hash.h>
106093+#include <linux/security.h>
106094 #include <linux/pid_namespace.h>
106095 #include <linux/init_task.h>
106096 #include <linux/syscalls.h>
106097@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
106098
106099 int pid_max = PID_MAX_DEFAULT;
106100
106101-#define RESERVED_PIDS 300
106102+#define RESERVED_PIDS 500
106103
106104 int pid_max_min = RESERVED_PIDS + 1;
106105 int pid_max_max = PID_MAX_LIMIT;
106106@@ -451,10 +452,18 @@ EXPORT_SYMBOL(pid_task);
106107 */
106108 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
106109 {
106110+ struct task_struct *task;
106111+
106112 rcu_lockdep_assert(rcu_read_lock_held(),
106113 "find_task_by_pid_ns() needs rcu_read_lock()"
106114 " protection");
106115- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106116+
106117+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106118+
106119+ if (gr_pid_is_chrooted(task))
106120+ return NULL;
106121+
106122+ return task;
106123 }
106124
106125 struct task_struct *find_task_by_vpid(pid_t vnr)
106126@@ -462,6 +471,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
106127 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
106128 }
106129
106130+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
106131+{
106132+ rcu_lockdep_assert(rcu_read_lock_held(),
106133+ "find_task_by_pid_ns() needs rcu_read_lock()"
106134+ " protection");
106135+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
106136+}
106137+
106138 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
106139 {
106140 struct pid *pid;
106141diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
106142index a65ba13..f600dbb 100644
106143--- a/kernel/pid_namespace.c
106144+++ b/kernel/pid_namespace.c
106145@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
106146 void __user *buffer, size_t *lenp, loff_t *ppos)
106147 {
106148 struct pid_namespace *pid_ns = task_active_pid_ns(current);
106149- struct ctl_table tmp = *table;
106150+ ctl_table_no_const tmp = *table;
106151
106152 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
106153 return -EPERM;
106154diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
106155index 9e30231..75a6d97 100644
106156--- a/kernel/power/Kconfig
106157+++ b/kernel/power/Kconfig
106158@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
106159 config HIBERNATION
106160 bool "Hibernation (aka 'suspend to disk')"
106161 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
106162+ depends on !GRKERNSEC_KMEM
106163+ depends on !PAX_MEMORY_SANITIZE
106164 select HIBERNATE_CALLBACKS
106165 select LZO_COMPRESS
106166 select LZO_DECOMPRESS
106167diff --git a/kernel/power/process.c b/kernel/power/process.c
106168index 564f786..361a18e 100644
106169--- a/kernel/power/process.c
106170+++ b/kernel/power/process.c
106171@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
106172 unsigned int elapsed_msecs;
106173 bool wakeup = false;
106174 int sleep_usecs = USEC_PER_MSEC;
106175+ bool timedout = false;
106176
106177 do_gettimeofday(&start);
106178
106179@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
106180
106181 while (true) {
106182 todo = 0;
106183+ if (time_after(jiffies, end_time))
106184+ timedout = true;
106185 read_lock(&tasklist_lock);
106186 for_each_process_thread(g, p) {
106187 if (p == current || !freeze_task(p))
106188 continue;
106189
106190- if (!freezer_should_skip(p))
106191+ if (!freezer_should_skip(p)) {
106192 todo++;
106193+ if (timedout) {
106194+ printk(KERN_ERR "Task refusing to freeze:\n");
106195+ sched_show_task(p);
106196+ }
106197+ }
106198 }
106199 read_unlock(&tasklist_lock);
106200
106201@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
106202 todo += wq_busy;
106203 }
106204
106205- if (!todo || time_after(jiffies, end_time))
106206+ if (!todo || timedout)
106207 break;
106208
106209 if (pm_wakeup_pending()) {
106210diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
106211index bff0169..c90815d 100644
106212--- a/kernel/printk/printk.c
106213+++ b/kernel/printk/printk.c
106214@@ -463,7 +463,7 @@ static int log_store(int facility, int level,
106215 return msg->text_len;
106216 }
106217
106218-int dmesg_restrict = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106219+int dmesg_restrict __read_only = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106220
106221 static int syslog_action_restricted(int type)
106222 {
106223@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
106224 if (from_file && type != SYSLOG_ACTION_OPEN)
106225 goto ok;
106226
106227+#ifdef CONFIG_GRKERNSEC_DMESG
106228+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
106229+ return -EPERM;
106230+#endif
106231+
106232 if (syslog_action_restricted(type)) {
106233 if (capable(CAP_SYSLOG))
106234 goto ok;
106235diff --git a/kernel/profile.c b/kernel/profile.c
106236index a7bcd28..5b368fa 100644
106237--- a/kernel/profile.c
106238+++ b/kernel/profile.c
106239@@ -37,7 +37,7 @@ struct profile_hit {
106240 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
106241 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
106242
106243-static atomic_t *prof_buffer;
106244+static atomic_unchecked_t *prof_buffer;
106245 static unsigned long prof_len, prof_shift;
106246
106247 int prof_on __read_mostly;
106248@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
106249 hits[i].pc = 0;
106250 continue;
106251 }
106252- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106253+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106254 hits[i].hits = hits[i].pc = 0;
106255 }
106256 }
106257@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106258 * Add the current hit(s) and flush the write-queue out
106259 * to the global buffer:
106260 */
106261- atomic_add(nr_hits, &prof_buffer[pc]);
106262+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
106263 for (i = 0; i < NR_PROFILE_HIT; ++i) {
106264- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106265+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106266 hits[i].pc = hits[i].hits = 0;
106267 }
106268 out:
106269@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106270 {
106271 unsigned long pc;
106272 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
106273- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106274+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106275 }
106276 #endif /* !CONFIG_SMP */
106277
106278@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
106279 return -EFAULT;
106280 buf++; p++; count--; read++;
106281 }
106282- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
106283+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
106284 if (copy_to_user(buf, (void *)pnt, count))
106285 return -EFAULT;
106286 read += count;
106287@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
106288 }
106289 #endif
106290 profile_discard_flip_buffers();
106291- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
106292+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
106293 return count;
106294 }
106295
106296diff --git a/kernel/ptrace.c b/kernel/ptrace.c
106297index c8e0e05..2be5614 100644
106298--- a/kernel/ptrace.c
106299+++ b/kernel/ptrace.c
106300@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
106301 if (seize)
106302 flags |= PT_SEIZED;
106303 rcu_read_lock();
106304- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106305+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106306 flags |= PT_PTRACE_CAP;
106307 rcu_read_unlock();
106308 task->ptrace = flags;
106309@@ -514,7 +514,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
106310 break;
106311 return -EIO;
106312 }
106313- if (copy_to_user(dst, buf, retval))
106314+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
106315 return -EFAULT;
106316 copied += retval;
106317 src += retval;
106318@@ -802,7 +802,7 @@ int ptrace_request(struct task_struct *child, long request,
106319 bool seized = child->ptrace & PT_SEIZED;
106320 int ret = -EIO;
106321 siginfo_t siginfo, *si;
106322- void __user *datavp = (void __user *) data;
106323+ void __user *datavp = (__force void __user *) data;
106324 unsigned long __user *datalp = datavp;
106325 unsigned long flags;
106326
106327@@ -1048,14 +1048,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
106328 goto out;
106329 }
106330
106331+ if (gr_handle_ptrace(child, request)) {
106332+ ret = -EPERM;
106333+ goto out_put_task_struct;
106334+ }
106335+
106336 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106337 ret = ptrace_attach(child, request, addr, data);
106338 /*
106339 * Some architectures need to do book-keeping after
106340 * a ptrace attach.
106341 */
106342- if (!ret)
106343+ if (!ret) {
106344 arch_ptrace_attach(child);
106345+ gr_audit_ptrace(child);
106346+ }
106347 goto out_put_task_struct;
106348 }
106349
106350@@ -1083,7 +1090,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
106351 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
106352 if (copied != sizeof(tmp))
106353 return -EIO;
106354- return put_user(tmp, (unsigned long __user *)data);
106355+ return put_user(tmp, (__force unsigned long __user *)data);
106356 }
106357
106358 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
106359@@ -1176,7 +1183,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
106360 }
106361
106362 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106363- compat_long_t, addr, compat_long_t, data)
106364+ compat_ulong_t, addr, compat_ulong_t, data)
106365 {
106366 struct task_struct *child;
106367 long ret;
106368@@ -1192,14 +1199,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106369 goto out;
106370 }
106371
106372+ if (gr_handle_ptrace(child, request)) {
106373+ ret = -EPERM;
106374+ goto out_put_task_struct;
106375+ }
106376+
106377 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106378 ret = ptrace_attach(child, request, addr, data);
106379 /*
106380 * Some architectures need to do book-keeping after
106381 * a ptrace attach.
106382 */
106383- if (!ret)
106384+ if (!ret) {
106385 arch_ptrace_attach(child);
106386+ gr_audit_ptrace(child);
106387+ }
106388 goto out_put_task_struct;
106389 }
106390
106391diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
106392index 8dbe276..8e87dbd 100644
106393--- a/kernel/rcu/rcutorture.c
106394+++ b/kernel/rcu/rcutorture.c
106395@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106396 rcu_torture_count) = { 0 };
106397 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106398 rcu_torture_batch) = { 0 };
106399-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106400-static atomic_t n_rcu_torture_alloc;
106401-static atomic_t n_rcu_torture_alloc_fail;
106402-static atomic_t n_rcu_torture_free;
106403-static atomic_t n_rcu_torture_mberror;
106404-static atomic_t n_rcu_torture_error;
106405+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106406+static atomic_unchecked_t n_rcu_torture_alloc;
106407+static atomic_unchecked_t n_rcu_torture_alloc_fail;
106408+static atomic_unchecked_t n_rcu_torture_free;
106409+static atomic_unchecked_t n_rcu_torture_mberror;
106410+static atomic_unchecked_t n_rcu_torture_error;
106411 static long n_rcu_torture_barrier_error;
106412 static long n_rcu_torture_boost_ktrerror;
106413 static long n_rcu_torture_boost_rterror;
106414@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
106415 static long n_rcu_torture_timers;
106416 static long n_barrier_attempts;
106417 static long n_barrier_successes;
106418-static atomic_long_t n_cbfloods;
106419+static atomic_long_unchecked_t n_cbfloods;
106420 static struct list_head rcu_torture_removed;
106421
106422 static int rcu_torture_writer_state;
106423@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
106424
106425 spin_lock_bh(&rcu_torture_lock);
106426 if (list_empty(&rcu_torture_freelist)) {
106427- atomic_inc(&n_rcu_torture_alloc_fail);
106428+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
106429 spin_unlock_bh(&rcu_torture_lock);
106430 return NULL;
106431 }
106432- atomic_inc(&n_rcu_torture_alloc);
106433+ atomic_inc_unchecked(&n_rcu_torture_alloc);
106434 p = rcu_torture_freelist.next;
106435 list_del_init(p);
106436 spin_unlock_bh(&rcu_torture_lock);
106437@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
106438 static void
106439 rcu_torture_free(struct rcu_torture *p)
106440 {
106441- atomic_inc(&n_rcu_torture_free);
106442+ atomic_inc_unchecked(&n_rcu_torture_free);
106443 spin_lock_bh(&rcu_torture_lock);
106444 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
106445 spin_unlock_bh(&rcu_torture_lock);
106446@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
106447 i = rp->rtort_pipe_count;
106448 if (i > RCU_TORTURE_PIPE_LEN)
106449 i = RCU_TORTURE_PIPE_LEN;
106450- atomic_inc(&rcu_torture_wcount[i]);
106451+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106452 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
106453 rp->rtort_mbtest = 0;
106454 return true;
106455@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
106456 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
106457 do {
106458 schedule_timeout_interruptible(cbflood_inter_holdoff);
106459- atomic_long_inc(&n_cbfloods);
106460+ atomic_long_inc_unchecked(&n_cbfloods);
106461 WARN_ON(signal_pending(current));
106462 for (i = 0; i < cbflood_n_burst; i++) {
106463 for (j = 0; j < cbflood_n_per_burst; j++) {
106464@@ -923,7 +923,7 @@ rcu_torture_writer(void *arg)
106465 i = old_rp->rtort_pipe_count;
106466 if (i > RCU_TORTURE_PIPE_LEN)
106467 i = RCU_TORTURE_PIPE_LEN;
106468- atomic_inc(&rcu_torture_wcount[i]);
106469+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106470 old_rp->rtort_pipe_count++;
106471 switch (synctype[torture_random(&rand) % nsynctypes]) {
106472 case RTWS_DEF_FREE:
106473@@ -1061,7 +1061,7 @@ static void rcu_torture_timer(unsigned long unused)
106474 return;
106475 }
106476 if (p->rtort_mbtest == 0)
106477- atomic_inc(&n_rcu_torture_mberror);
106478+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106479 spin_lock(&rand_lock);
106480 cur_ops->read_delay(&rand);
106481 n_rcu_torture_timers++;
106482@@ -1136,7 +1136,7 @@ rcu_torture_reader(void *arg)
106483 continue;
106484 }
106485 if (p->rtort_mbtest == 0)
106486- atomic_inc(&n_rcu_torture_mberror);
106487+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106488 cur_ops->read_delay(&rand);
106489 preempt_disable();
106490 pipe_count = p->rtort_pipe_count;
106491@@ -1205,11 +1205,11 @@ rcu_torture_stats_print(void)
106492 rcu_torture_current,
106493 rcu_torture_current_version,
106494 list_empty(&rcu_torture_freelist),
106495- atomic_read(&n_rcu_torture_alloc),
106496- atomic_read(&n_rcu_torture_alloc_fail),
106497- atomic_read(&n_rcu_torture_free));
106498+ atomic_read_unchecked(&n_rcu_torture_alloc),
106499+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
106500+ atomic_read_unchecked(&n_rcu_torture_free));
106501 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
106502- atomic_read(&n_rcu_torture_mberror),
106503+ atomic_read_unchecked(&n_rcu_torture_mberror),
106504 n_rcu_torture_boost_ktrerror,
106505 n_rcu_torture_boost_rterror);
106506 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
106507@@ -1221,17 +1221,17 @@ rcu_torture_stats_print(void)
106508 n_barrier_successes,
106509 n_barrier_attempts,
106510 n_rcu_torture_barrier_error);
106511- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
106512+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
106513
106514 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106515- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
106516+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
106517 n_rcu_torture_barrier_error != 0 ||
106518 n_rcu_torture_boost_ktrerror != 0 ||
106519 n_rcu_torture_boost_rterror != 0 ||
106520 n_rcu_torture_boost_failure != 0 ||
106521 i > 1) {
106522 pr_cont("%s", "!!! ");
106523- atomic_inc(&n_rcu_torture_error);
106524+ atomic_inc_unchecked(&n_rcu_torture_error);
106525 WARN_ON_ONCE(1);
106526 }
106527 pr_cont("Reader Pipe: ");
106528@@ -1248,7 +1248,7 @@ rcu_torture_stats_print(void)
106529 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106530 pr_cont("Free-Block Circulation: ");
106531 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106532- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
106533+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
106534 }
106535 pr_cont("\n");
106536
106537@@ -1595,7 +1595,7 @@ rcu_torture_cleanup(void)
106538
106539 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
106540
106541- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106542+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106543 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
106544 else if (torture_onoff_failures())
106545 rcu_torture_print_module_parms(cur_ops,
106546@@ -1720,18 +1720,18 @@ rcu_torture_init(void)
106547
106548 rcu_torture_current = NULL;
106549 rcu_torture_current_version = 0;
106550- atomic_set(&n_rcu_torture_alloc, 0);
106551- atomic_set(&n_rcu_torture_alloc_fail, 0);
106552- atomic_set(&n_rcu_torture_free, 0);
106553- atomic_set(&n_rcu_torture_mberror, 0);
106554- atomic_set(&n_rcu_torture_error, 0);
106555+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
106556+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
106557+ atomic_set_unchecked(&n_rcu_torture_free, 0);
106558+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
106559+ atomic_set_unchecked(&n_rcu_torture_error, 0);
106560 n_rcu_torture_barrier_error = 0;
106561 n_rcu_torture_boost_ktrerror = 0;
106562 n_rcu_torture_boost_rterror = 0;
106563 n_rcu_torture_boost_failure = 0;
106564 n_rcu_torture_boosts = 0;
106565 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
106566- atomic_set(&rcu_torture_wcount[i], 0);
106567+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
106568 for_each_possible_cpu(cpu) {
106569 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106570 per_cpu(rcu_torture_count, cpu)[i] = 0;
106571diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
106572index ec30868..89752ff 100644
106573--- a/kernel/rcu/tiny.c
106574+++ b/kernel/rcu/tiny.c
106575@@ -42,7 +42,7 @@
106576 /* Forward declarations for tiny_plugin.h. */
106577 struct rcu_ctrlblk;
106578 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
106579-static void rcu_process_callbacks(struct softirq_action *unused);
106580+static void rcu_process_callbacks(void);
106581 static void __call_rcu(struct rcu_head *head,
106582 void (*func)(struct rcu_head *rcu),
106583 struct rcu_ctrlblk *rcp);
106584@@ -203,7 +203,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
106585 false));
106586 }
106587
106588-static void rcu_process_callbacks(struct softirq_action *unused)
106589+static __latent_entropy void rcu_process_callbacks(void)
106590 {
106591 __rcu_process_callbacks(&rcu_sched_ctrlblk);
106592 __rcu_process_callbacks(&rcu_bh_ctrlblk);
106593diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
106594index f94e209..d2985bd 100644
106595--- a/kernel/rcu/tiny_plugin.h
106596+++ b/kernel/rcu/tiny_plugin.h
106597@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
106598 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
106599 jiffies - rcp->gp_start, rcp->qlen);
106600 dump_stack();
106601- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
106602+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
106603 3 * rcu_jiffies_till_stall_check() + 3;
106604 } else if (ULONG_CMP_GE(j, js)) {
106605- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106606+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106607 }
106608 }
106609
106610@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
106611 {
106612 rcp->ticks_this_gp = 0;
106613 rcp->gp_start = jiffies;
106614- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106615+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106616 }
106617
106618 static void check_cpu_stalls(void)
106619diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
106620index 8cf7304..953f8ad 100644
106621--- a/kernel/rcu/tree.c
106622+++ b/kernel/rcu/tree.c
106623@@ -290,7 +290,7 @@ static void rcu_momentary_dyntick_idle(void)
106624 */
106625 rdtp = this_cpu_ptr(&rcu_dynticks);
106626 smp_mb__before_atomic(); /* Earlier stuff before QS. */
106627- atomic_add(2, &rdtp->dynticks); /* QS. */
106628+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
106629 smp_mb__after_atomic(); /* Later stuff after QS. */
106630 break;
106631 }
106632@@ -602,9 +602,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
106633 rcu_prepare_for_idle();
106634 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106635 smp_mb__before_atomic(); /* See above. */
106636- atomic_inc(&rdtp->dynticks);
106637+ atomic_inc_unchecked(&rdtp->dynticks);
106638 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
106639- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106640+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106641 rcu_dynticks_task_enter();
106642
106643 /*
106644@@ -725,10 +725,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
106645
106646 rcu_dynticks_task_exit();
106647 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
106648- atomic_inc(&rdtp->dynticks);
106649+ atomic_inc_unchecked(&rdtp->dynticks);
106650 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
106651 smp_mb__after_atomic(); /* See above. */
106652- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106653+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106654 rcu_cleanup_after_idle();
106655 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
106656 if (!user && !is_idle_task(current)) {
106657@@ -862,12 +862,12 @@ void rcu_nmi_enter(void)
106658 * to be in the outermost NMI handler that interrupted an RCU-idle
106659 * period (observation due to Andy Lutomirski).
106660 */
106661- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
106662+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
106663 smp_mb__before_atomic(); /* Force delay from prior write. */
106664- atomic_inc(&rdtp->dynticks);
106665+ atomic_inc_unchecked(&rdtp->dynticks);
106666 /* atomic_inc() before later RCU read-side crit sects */
106667 smp_mb__after_atomic(); /* See above. */
106668- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106669+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106670 incby = 1;
106671 }
106672 rdtp->dynticks_nmi_nesting += incby;
106673@@ -892,7 +892,7 @@ void rcu_nmi_exit(void)
106674 * to us!)
106675 */
106676 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
106677- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106678+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106679
106680 /*
106681 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
106682@@ -907,9 +907,9 @@ void rcu_nmi_exit(void)
106683 rdtp->dynticks_nmi_nesting = 0;
106684 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106685 smp_mb__before_atomic(); /* See above. */
106686- atomic_inc(&rdtp->dynticks);
106687+ atomic_inc_unchecked(&rdtp->dynticks);
106688 smp_mb__after_atomic(); /* Force delay to next write. */
106689- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106690+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106691 }
106692
106693 /**
106694@@ -922,7 +922,7 @@ void rcu_nmi_exit(void)
106695 */
106696 bool notrace __rcu_is_watching(void)
106697 {
106698- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106699+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106700 }
106701
106702 /**
106703@@ -1005,7 +1005,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
106704 static int dyntick_save_progress_counter(struct rcu_data *rdp,
106705 bool *isidle, unsigned long *maxj)
106706 {
106707- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
106708+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106709 rcu_sysidle_check_cpu(rdp, isidle, maxj);
106710 if ((rdp->dynticks_snap & 0x1) == 0) {
106711 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
106712@@ -1013,7 +1013,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
106713 } else {
106714 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
106715 rdp->mynode->gpnum))
106716- ACCESS_ONCE(rdp->gpwrap) = true;
106717+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
106718 return 0;
106719 }
106720 }
106721@@ -1031,7 +1031,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106722 int *rcrmp;
106723 unsigned int snap;
106724
106725- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
106726+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106727 snap = (unsigned int)rdp->dynticks_snap;
106728
106729 /*
106730@@ -1094,10 +1094,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106731 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
106732 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
106733 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
106734- ACCESS_ONCE(rdp->cond_resched_completed) =
106735+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
106736 ACCESS_ONCE(rdp->mynode->completed);
106737 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
106738- ACCESS_ONCE(*rcrmp) =
106739+ ACCESS_ONCE_RW(*rcrmp) =
106740 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
106741 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
106742 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
106743@@ -1119,7 +1119,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
106744 rsp->gp_start = j;
106745 smp_wmb(); /* Record start time before stall time. */
106746 j1 = rcu_jiffies_till_stall_check();
106747- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
106748+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
106749 rsp->jiffies_resched = j + j1 / 2;
106750 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
106751 }
106752@@ -1178,7 +1178,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
106753 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106754 return;
106755 }
106756- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106757+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106758 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106759
106760 /*
106761@@ -1263,7 +1263,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
106762
106763 raw_spin_lock_irqsave(&rnp->lock, flags);
106764 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
106765- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
106766+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
106767 3 * rcu_jiffies_till_stall_check() + 3;
106768 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106769
106770@@ -1347,7 +1347,7 @@ void rcu_cpu_stall_reset(void)
106771 struct rcu_state *rsp;
106772
106773 for_each_rcu_flavor(rsp)
106774- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106775+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106776 }
106777
106778 /*
106779@@ -1704,7 +1704,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
106780 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
106781 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
106782 zero_cpu_stall_ticks(rdp);
106783- ACCESS_ONCE(rdp->gpwrap) = false;
106784+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
106785 }
106786 return ret;
106787 }
106788@@ -1740,7 +1740,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106789 struct rcu_data *rdp;
106790 struct rcu_node *rnp = rcu_get_root(rsp);
106791
106792- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106793+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106794 raw_spin_lock_irq(&rnp->lock);
106795 smp_mb__after_unlock_lock();
106796 if (!ACCESS_ONCE(rsp->gp_flags)) {
106797@@ -1748,7 +1748,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106798 raw_spin_unlock_irq(&rnp->lock);
106799 return 0;
106800 }
106801- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106802+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106803
106804 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
106805 /*
106806@@ -1834,9 +1834,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
106807 rdp = this_cpu_ptr(rsp->rda);
106808 rcu_preempt_check_blocked_tasks(rnp);
106809 rnp->qsmask = rnp->qsmaskinit;
106810- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
106811+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
106812 if (WARN_ON_ONCE(rnp->completed != rsp->completed))
106813- ACCESS_ONCE(rnp->completed) = rsp->completed;
106814+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
106815 if (rnp == rdp->mynode)
106816 (void)__note_gp_changes(rsp, rnp, rdp);
106817 rcu_preempt_boost_start_gp(rnp);
106818@@ -1845,7 +1845,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106819 rnp->grphi, rnp->qsmask);
106820 raw_spin_unlock_irq(&rnp->lock);
106821 cond_resched_rcu_qs();
106822- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106823+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106824 if (gp_init_delay > 0 &&
106825 !(rsp->gpnum % (rcu_num_nodes * PER_RCU_NODE_PERIOD)))
106826 schedule_timeout_uninterruptible(gp_init_delay);
106827@@ -1864,7 +1864,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
106828 unsigned long maxj;
106829 struct rcu_node *rnp = rcu_get_root(rsp);
106830
106831- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106832+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106833 rsp->n_force_qs++;
106834 if (fqs_state == RCU_SAVE_DYNTICK) {
106835 /* Collect dyntick-idle snapshots. */
106836@@ -1885,7 +1885,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
106837 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
106838 raw_spin_lock_irq(&rnp->lock);
106839 smp_mb__after_unlock_lock();
106840- ACCESS_ONCE(rsp->gp_flags) =
106841+ ACCESS_ONCE_RW(rsp->gp_flags) =
106842 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
106843 raw_spin_unlock_irq(&rnp->lock);
106844 }
106845@@ -1903,7 +1903,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106846 struct rcu_data *rdp;
106847 struct rcu_node *rnp = rcu_get_root(rsp);
106848
106849- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106850+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106851 raw_spin_lock_irq(&rnp->lock);
106852 smp_mb__after_unlock_lock();
106853 gp_duration = jiffies - rsp->gp_start;
106854@@ -1934,7 +1934,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106855 smp_mb__after_unlock_lock();
106856 WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp));
106857 WARN_ON_ONCE(rnp->qsmask);
106858- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
106859+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
106860 rdp = this_cpu_ptr(rsp->rda);
106861 if (rnp == rdp->mynode)
106862 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
106863@@ -1942,7 +1942,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106864 nocb += rcu_future_gp_cleanup(rsp, rnp);
106865 raw_spin_unlock_irq(&rnp->lock);
106866 cond_resched_rcu_qs();
106867- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106868+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106869 }
106870 rnp = rcu_get_root(rsp);
106871 raw_spin_lock_irq(&rnp->lock);
106872@@ -1950,14 +1950,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106873 rcu_nocb_gp_set(rnp, nocb);
106874
106875 /* Declare grace period done. */
106876- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
106877+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
106878 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
106879 rsp->fqs_state = RCU_GP_IDLE;
106880 rdp = this_cpu_ptr(rsp->rda);
106881 /* Advance CBs to reduce false positives below. */
106882 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
106883 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
106884- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106885+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106886 trace_rcu_grace_period(rsp->name,
106887 ACCESS_ONCE(rsp->gpnum),
106888 TPS("newreq"));
106889@@ -1993,7 +1993,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
106890 if (rcu_gp_init(rsp))
106891 break;
106892 cond_resched_rcu_qs();
106893- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106894+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106895 WARN_ON(signal_pending(current));
106896 trace_rcu_grace_period(rsp->name,
106897 ACCESS_ONCE(rsp->gpnum),
106898@@ -2037,11 +2037,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
106899 ACCESS_ONCE(rsp->gpnum),
106900 TPS("fqsend"));
106901 cond_resched_rcu_qs();
106902- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106903+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106904 } else {
106905 /* Deal with stray signal. */
106906 cond_resched_rcu_qs();
106907- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106908+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106909 WARN_ON(signal_pending(current));
106910 trace_rcu_grace_period(rsp->name,
106911 ACCESS_ONCE(rsp->gpnum),
106912@@ -2086,7 +2086,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
106913 */
106914 return false;
106915 }
106916- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106917+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106918 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
106919 TPS("newreq"));
106920
106921@@ -2359,7 +2359,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
106922 rsp->qlen += rdp->qlen;
106923 rdp->n_cbs_orphaned += rdp->qlen;
106924 rdp->qlen_lazy = 0;
106925- ACCESS_ONCE(rdp->qlen) = 0;
106926+ ACCESS_ONCE_RW(rdp->qlen) = 0;
106927 }
106928
106929 /*
106930@@ -2636,7 +2636,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
106931 }
106932 smp_mb(); /* List handling before counting for rcu_barrier(). */
106933 rdp->qlen_lazy -= count_lazy;
106934- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
106935+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
106936 rdp->n_cbs_invoked += count;
106937
106938 /* Reinstate batch limit if we have worked down the excess. */
106939@@ -2814,7 +2814,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
106940 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
106941 return; /* Someone beat us to it. */
106942 }
106943- ACCESS_ONCE(rsp->gp_flags) =
106944+ ACCESS_ONCE_RW(rsp->gp_flags) =
106945 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
106946 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
106947 rcu_gp_kthread_wake(rsp);
106948@@ -2860,7 +2860,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
106949 /*
106950 * Do RCU core processing for the current CPU.
106951 */
106952-static void rcu_process_callbacks(struct softirq_action *unused)
106953+static void rcu_process_callbacks(void)
106954 {
106955 struct rcu_state *rsp;
106956
106957@@ -2972,7 +2972,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
106958 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
106959 if (debug_rcu_head_queue(head)) {
106960 /* Probable double call_rcu(), so leak the callback. */
106961- ACCESS_ONCE(head->func) = rcu_leak_callback;
106962+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
106963 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
106964 return;
106965 }
106966@@ -3011,7 +3011,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
106967 if (!likely(rdp->nxtlist))
106968 init_default_callback_list(rdp);
106969 }
106970- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
106971+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
106972 if (lazy)
106973 rdp->qlen_lazy++;
106974 else
106975@@ -3284,11 +3284,11 @@ void synchronize_sched_expedited(void)
106976 * counter wrap on a 32-bit system. Quite a few more CPUs would of
106977 * course be required on a 64-bit system.
106978 */
106979- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
106980+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
106981 (ulong)atomic_long_read(&rsp->expedited_done) +
106982 ULONG_MAX / 8)) {
106983 synchronize_sched();
106984- atomic_long_inc(&rsp->expedited_wrap);
106985+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
106986 return;
106987 }
106988
106989@@ -3296,12 +3296,12 @@ void synchronize_sched_expedited(void)
106990 * Take a ticket. Note that atomic_inc_return() implies a
106991 * full memory barrier.
106992 */
106993- snap = atomic_long_inc_return(&rsp->expedited_start);
106994+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
106995 firstsnap = snap;
106996 if (!try_get_online_cpus()) {
106997 /* CPU hotplug operation in flight, fall back to normal GP. */
106998 wait_rcu_gp(call_rcu_sched);
106999- atomic_long_inc(&rsp->expedited_normal);
107000+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107001 return;
107002 }
107003 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
107004@@ -3314,7 +3314,7 @@ void synchronize_sched_expedited(void)
107005 for_each_cpu(cpu, cm) {
107006 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
107007
107008- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
107009+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
107010 cpumask_clear_cpu(cpu, cm);
107011 }
107012 if (cpumask_weight(cm) == 0)
107013@@ -3329,14 +3329,14 @@ void synchronize_sched_expedited(void)
107014 synchronize_sched_expedited_cpu_stop,
107015 NULL) == -EAGAIN) {
107016 put_online_cpus();
107017- atomic_long_inc(&rsp->expedited_tryfail);
107018+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
107019
107020 /* Check to see if someone else did our work for us. */
107021 s = atomic_long_read(&rsp->expedited_done);
107022 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107023 /* ensure test happens before caller kfree */
107024 smp_mb__before_atomic(); /* ^^^ */
107025- atomic_long_inc(&rsp->expedited_workdone1);
107026+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
107027 free_cpumask_var(cm);
107028 return;
107029 }
107030@@ -3346,7 +3346,7 @@ void synchronize_sched_expedited(void)
107031 udelay(trycount * num_online_cpus());
107032 } else {
107033 wait_rcu_gp(call_rcu_sched);
107034- atomic_long_inc(&rsp->expedited_normal);
107035+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107036 free_cpumask_var(cm);
107037 return;
107038 }
107039@@ -3356,7 +3356,7 @@ void synchronize_sched_expedited(void)
107040 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107041 /* ensure test happens before caller kfree */
107042 smp_mb__before_atomic(); /* ^^^ */
107043- atomic_long_inc(&rsp->expedited_workdone2);
107044+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
107045 free_cpumask_var(cm);
107046 return;
107047 }
107048@@ -3371,14 +3371,14 @@ void synchronize_sched_expedited(void)
107049 if (!try_get_online_cpus()) {
107050 /* CPU hotplug operation in flight, use normal GP. */
107051 wait_rcu_gp(call_rcu_sched);
107052- atomic_long_inc(&rsp->expedited_normal);
107053+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107054 free_cpumask_var(cm);
107055 return;
107056 }
107057- snap = atomic_long_read(&rsp->expedited_start);
107058+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
107059 smp_mb(); /* ensure read is before try_stop_cpus(). */
107060 }
107061- atomic_long_inc(&rsp->expedited_stoppedcpus);
107062+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
107063
107064 all_cpus_idle:
107065 free_cpumask_var(cm);
107066@@ -3390,16 +3390,16 @@ all_cpus_idle:
107067 * than we did already did their update.
107068 */
107069 do {
107070- atomic_long_inc(&rsp->expedited_done_tries);
107071+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
107072 s = atomic_long_read(&rsp->expedited_done);
107073 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
107074 /* ensure test happens before caller kfree */
107075 smp_mb__before_atomic(); /* ^^^ */
107076- atomic_long_inc(&rsp->expedited_done_lost);
107077+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
107078 break;
107079 }
107080 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
107081- atomic_long_inc(&rsp->expedited_done_exit);
107082+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
107083
107084 put_online_cpus();
107085 }
107086@@ -3609,7 +3609,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107087 * ACCESS_ONCE() to prevent the compiler from speculating
107088 * the increment to precede the early-exit check.
107089 */
107090- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107091+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107092 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
107093 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
107094 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
107095@@ -3665,7 +3665,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107096
107097 /* Increment ->n_barrier_done to prevent duplicate work. */
107098 smp_mb(); /* Keep increment after above mechanism. */
107099- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107100+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107101 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
107102 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
107103 smp_mb(); /* Keep increment before caller's subsequent code. */
107104@@ -3732,7 +3732,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
107105 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
107106 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
107107 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
107108- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
107109+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
107110 rdp->cpu = cpu;
107111 rdp->rsp = rsp;
107112 rcu_boot_init_nocb_percpu_data(rdp);
107113@@ -3763,8 +3763,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
107114 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
107115 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
107116 rcu_sysidle_init_percpu_data(rdp->dynticks);
107117- atomic_set(&rdp->dynticks->dynticks,
107118- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
107119+ atomic_set_unchecked(&rdp->dynticks->dynticks,
107120+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
107121 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
107122
107123 /*
107124diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
107125index a69d3da..51993c4 100644
107126--- a/kernel/rcu/tree.h
107127+++ b/kernel/rcu/tree.h
107128@@ -86,11 +86,11 @@ struct rcu_dynticks {
107129 long long dynticks_nesting; /* Track irq/process nesting level. */
107130 /* Process level is worth LLONG_MAX/2. */
107131 int dynticks_nmi_nesting; /* Track NMI nesting level. */
107132- atomic_t dynticks; /* Even value for idle, else odd. */
107133+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
107134 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
107135 long long dynticks_idle_nesting;
107136 /* irq/process nesting level from idle. */
107137- atomic_t dynticks_idle; /* Even value for idle, else odd. */
107138+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
107139 /* "Idle" excludes userspace execution. */
107140 unsigned long dynticks_idle_jiffies;
107141 /* End of last non-NMI non-idle period. */
107142@@ -463,17 +463,17 @@ struct rcu_state {
107143 /* _rcu_barrier(). */
107144 /* End of fields guarded by barrier_mutex. */
107145
107146- atomic_long_t expedited_start; /* Starting ticket. */
107147- atomic_long_t expedited_done; /* Done ticket. */
107148- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
107149- atomic_long_t expedited_tryfail; /* # acquisition failures. */
107150- atomic_long_t expedited_workdone1; /* # done by others #1. */
107151- atomic_long_t expedited_workdone2; /* # done by others #2. */
107152- atomic_long_t expedited_normal; /* # fallbacks to normal. */
107153- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
107154- atomic_long_t expedited_done_tries; /* # tries to update _done. */
107155- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
107156- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
107157+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
107158+ atomic_long_t expedited_done; /* Done ticket. */
107159+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
107160+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
107161+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
107162+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
107163+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
107164+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
107165+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
107166+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
107167+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
107168
107169 unsigned long jiffies_force_qs; /* Time at which to invoke */
107170 /* force_quiescent_state(). */
107171diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
107172index 8c0ec0f..99d52c5 100644
107173--- a/kernel/rcu/tree_plugin.h
107174+++ b/kernel/rcu/tree_plugin.h
107175@@ -570,7 +570,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
107176 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
107177 {
107178 return !rcu_preempted_readers_exp(rnp) &&
107179- ACCESS_ONCE(rnp->expmask) == 0;
107180+ ACCESS_ONCE_RW(rnp->expmask) == 0;
107181 }
107182
107183 /*
107184@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
107185
107186 /* Clean up and exit. */
107187 smp_mb(); /* ensure expedited GP seen before counter increment. */
107188- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
107189+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
107190 sync_rcu_preempt_exp_count + 1;
107191 unlock_mb_ret:
107192 mutex_unlock(&sync_rcu_preempt_exp_mutex);
107193@@ -1286,7 +1286,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
107194 free_cpumask_var(cm);
107195 }
107196
107197-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
107198+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
107199 .store = &rcu_cpu_kthread_task,
107200 .thread_should_run = rcu_cpu_kthread_should_run,
107201 .thread_fn = rcu_cpu_kthread,
107202@@ -1757,7 +1757,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
107203 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
107204 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
107205 cpu, ticks_value, ticks_title,
107206- atomic_read(&rdtp->dynticks) & 0xfff,
107207+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
107208 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
107209 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
107210 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
107211@@ -1902,7 +1902,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
107212 return;
107213 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
107214 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
107215- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
107216+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
107217 wake_up(&rdp_leader->nocb_wq);
107218 }
107219 }
107220@@ -1975,7 +1975,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
107221 atomic_long_add(rhcount, &rdp->nocb_q_count);
107222 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
107223 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
107224- ACCESS_ONCE(*old_rhpp) = rhp;
107225+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
107226 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
107227 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
107228
107229@@ -2164,7 +2164,7 @@ wait_again:
107230 continue; /* No CBs here, try next follower. */
107231
107232 /* Move callbacks to wait-for-GP list, which is empty. */
107233- ACCESS_ONCE(rdp->nocb_head) = NULL;
107234+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
107235 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
107236 gotcbs = true;
107237 }
107238@@ -2285,7 +2285,7 @@ static int rcu_nocb_kthread(void *arg)
107239 list = ACCESS_ONCE(rdp->nocb_follower_head);
107240 BUG_ON(!list);
107241 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
107242- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
107243+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
107244 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
107245
107246 /* Each pass through the following loop invokes a callback. */
107247@@ -2335,7 +2335,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
107248 if (!rcu_nocb_need_deferred_wakeup(rdp))
107249 return;
107250 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
107251- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107252+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107253 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
107254 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
107255 }
107256@@ -2448,7 +2448,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
107257 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
107258 "rcuo%c/%d", rsp->abbr, cpu);
107259 BUG_ON(IS_ERR(t));
107260- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
107261+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
107262 }
107263
107264 /*
107265@@ -2663,11 +2663,11 @@ static void rcu_sysidle_enter(int irq)
107266
107267 /* Record start of fully idle period. */
107268 j = jiffies;
107269- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
107270+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
107271 smp_mb__before_atomic();
107272- atomic_inc(&rdtp->dynticks_idle);
107273+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107274 smp_mb__after_atomic();
107275- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
107276+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
107277 }
107278
107279 /*
107280@@ -2738,9 +2738,9 @@ static void rcu_sysidle_exit(int irq)
107281
107282 /* Record end of idle period. */
107283 smp_mb__before_atomic();
107284- atomic_inc(&rdtp->dynticks_idle);
107285+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107286 smp_mb__after_atomic();
107287- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
107288+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
107289
107290 /*
107291 * If we are the timekeeping CPU, we are permitted to be non-idle
107292@@ -2786,7 +2786,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
107293 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
107294
107295 /* Pick up current idle and NMI-nesting counter and check. */
107296- cur = atomic_read(&rdtp->dynticks_idle);
107297+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
107298 if (cur & 0x1) {
107299 *isidle = false; /* We are not idle! */
107300 return;
107301@@ -2835,7 +2835,7 @@ static void rcu_sysidle(unsigned long j)
107302 case RCU_SYSIDLE_NOT:
107303
107304 /* First time all are idle, so note a short idle period. */
107305- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107306+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107307 break;
107308
107309 case RCU_SYSIDLE_SHORT:
107310@@ -2873,7 +2873,7 @@ static void rcu_sysidle_cancel(void)
107311 {
107312 smp_mb();
107313 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
107314- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
107315+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
107316 }
107317
107318 /*
107319@@ -2925,7 +2925,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
107320 smp_mb(); /* grace period precedes setting inuse. */
107321
107322 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
107323- ACCESS_ONCE(rshp->inuse) = 0;
107324+ ACCESS_ONCE_RW(rshp->inuse) = 0;
107325 }
107326
107327 /*
107328@@ -3077,7 +3077,7 @@ static void rcu_bind_gp_kthread(void)
107329 static void rcu_dynticks_task_enter(void)
107330 {
107331 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107332- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
107333+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
107334 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107335 }
107336
107337@@ -3085,6 +3085,6 @@ static void rcu_dynticks_task_enter(void)
107338 static void rcu_dynticks_task_exit(void)
107339 {
107340 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107341- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
107342+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
107343 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107344 }
107345diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
107346index f92361e..0052f88 100644
107347--- a/kernel/rcu/tree_trace.c
107348+++ b/kernel/rcu/tree_trace.c
107349@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
107350 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
107351 rdp->qs_pending);
107352 seq_printf(m, " dt=%d/%llx/%d df=%lu",
107353- atomic_read(&rdp->dynticks->dynticks),
107354+ atomic_read_unchecked(&rdp->dynticks->dynticks),
107355 rdp->dynticks->dynticks_nesting,
107356 rdp->dynticks->dynticks_nmi_nesting,
107357 rdp->dynticks_fqs);
107358@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
107359 struct rcu_state *rsp = (struct rcu_state *)m->private;
107360
107361 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",
107362- atomic_long_read(&rsp->expedited_start),
107363+ atomic_long_read_unchecked(&rsp->expedited_start),
107364 atomic_long_read(&rsp->expedited_done),
107365- atomic_long_read(&rsp->expedited_wrap),
107366- atomic_long_read(&rsp->expedited_tryfail),
107367- atomic_long_read(&rsp->expedited_workdone1),
107368- atomic_long_read(&rsp->expedited_workdone2),
107369- atomic_long_read(&rsp->expedited_normal),
107370- atomic_long_read(&rsp->expedited_stoppedcpus),
107371- atomic_long_read(&rsp->expedited_done_tries),
107372- atomic_long_read(&rsp->expedited_done_lost),
107373- atomic_long_read(&rsp->expedited_done_exit));
107374+ atomic_long_read_unchecked(&rsp->expedited_wrap),
107375+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
107376+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
107377+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
107378+ atomic_long_read_unchecked(&rsp->expedited_normal),
107379+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
107380+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
107381+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
107382+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
107383 return 0;
107384 }
107385
107386diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
107387index 1f13335..77ebb7f 100644
107388--- a/kernel/rcu/update.c
107389+++ b/kernel/rcu/update.c
107390@@ -396,10 +396,10 @@ int rcu_jiffies_till_stall_check(void)
107391 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
107392 */
107393 if (till_stall_check < 3) {
107394- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
107395+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
107396 till_stall_check = 3;
107397 } else if (till_stall_check > 300) {
107398- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
107399+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
107400 till_stall_check = 300;
107401 }
107402 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
107403@@ -555,7 +555,7 @@ static void check_holdout_task(struct task_struct *t,
107404 !ACCESS_ONCE(t->on_rq) ||
107405 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
107406 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
107407- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
107408+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
107409 list_del_init(&t->rcu_tasks_holdout_list);
107410 put_task_struct(t);
107411 return;
107412@@ -643,7 +643,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
107413 !is_idle_task(t)) {
107414 get_task_struct(t);
107415 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
107416- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
107417+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
107418 list_add(&t->rcu_tasks_holdout_list,
107419 &rcu_tasks_holdouts);
107420 }
107421@@ -740,7 +740,7 @@ static void rcu_spawn_tasks_kthread(void)
107422 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
107423 BUG_ON(IS_ERR(t));
107424 smp_mb(); /* Ensure others see full kthread. */
107425- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
107426+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
107427 mutex_unlock(&rcu_tasks_kthread_mutex);
107428 }
107429
107430diff --git a/kernel/resource.c b/kernel/resource.c
107431index 90552aa..ad13346 100644
107432--- a/kernel/resource.c
107433+++ b/kernel/resource.c
107434@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
107435
107436 static int __init ioresources_init(void)
107437 {
107438+#ifdef CONFIG_GRKERNSEC_PROC_ADD
107439+#ifdef CONFIG_GRKERNSEC_PROC_USER
107440+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
107441+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
107442+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
107443+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
107444+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
107445+#endif
107446+#else
107447 proc_create("ioports", 0, NULL, &proc_ioports_operations);
107448 proc_create("iomem", 0, NULL, &proc_iomem_operations);
107449+#endif
107450 return 0;
107451 }
107452 __initcall(ioresources_init);
107453@@ -504,13 +514,13 @@ int region_is_ram(resource_size_t start, unsigned long size)
107454 {
107455 struct resource *p;
107456 resource_size_t end = start + size - 1;
107457- int flags = IORESOURCE_MEM | IORESOURCE_BUSY;
107458+ unsigned long flags = IORESOURCE_MEM | IORESOURCE_BUSY;
107459 const char *name = "System RAM";
107460 int ret = -1;
107461
107462 read_lock(&resource_lock);
107463 for (p = iomem_resource.child; p ; p = p->sibling) {
107464- if (end < p->start)
107465+ if (p->end < start)
107466 continue;
107467
107468 if (p->start <= start && end <= p->end) {
107469@@ -521,7 +531,7 @@ int region_is_ram(resource_size_t start, unsigned long size)
107470 ret = 1;
107471 break;
107472 }
107473- if (p->end < start)
107474+ if (end < p->start)
107475 break; /* not found */
107476 }
107477 read_unlock(&resource_lock);
107478diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
107479index eae160d..c9aa22e 100644
107480--- a/kernel/sched/auto_group.c
107481+++ b/kernel/sched/auto_group.c
107482@@ -11,7 +11,7 @@
107483
107484 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
107485 static struct autogroup autogroup_default;
107486-static atomic_t autogroup_seq_nr;
107487+static atomic_unchecked_t autogroup_seq_nr;
107488
107489 void __init autogroup_init(struct task_struct *init_task)
107490 {
107491@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
107492
107493 kref_init(&ag->kref);
107494 init_rwsem(&ag->lock);
107495- ag->id = atomic_inc_return(&autogroup_seq_nr);
107496+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
107497 ag->tg = tg;
107498 #ifdef CONFIG_RT_GROUP_SCHED
107499 /*
107500diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
107501index 8d0f35d..c16360d 100644
107502--- a/kernel/sched/completion.c
107503+++ b/kernel/sched/completion.c
107504@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
107505 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107506 * or number of jiffies left till timeout) if completed.
107507 */
107508-long __sched
107509+long __sched __intentional_overflow(-1)
107510 wait_for_completion_interruptible_timeout(struct completion *x,
107511 unsigned long timeout)
107512 {
107513@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
107514 *
107515 * Return: -ERESTARTSYS if interrupted, 0 if completed.
107516 */
107517-int __sched wait_for_completion_killable(struct completion *x)
107518+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
107519 {
107520 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
107521 if (t == -ERESTARTSYS)
107522@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
107523 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107524 * or number of jiffies left till timeout) if completed.
107525 */
107526-long __sched
107527+long __sched __intentional_overflow(-1)
107528 wait_for_completion_killable_timeout(struct completion *x,
107529 unsigned long timeout)
107530 {
107531diff --git a/kernel/sched/core.c b/kernel/sched/core.c
107532index 1236732..df281d6 100644
107533--- a/kernel/sched/core.c
107534+++ b/kernel/sched/core.c
107535@@ -1867,7 +1867,7 @@ void set_numabalancing_state(bool enabled)
107536 int sysctl_numa_balancing(struct ctl_table *table, int write,
107537 void __user *buffer, size_t *lenp, loff_t *ppos)
107538 {
107539- struct ctl_table t;
107540+ ctl_table_no_const t;
107541 int err;
107542 int state = numabalancing_enabled;
107543
107544@@ -2317,8 +2317,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
107545 next->active_mm = oldmm;
107546 atomic_inc(&oldmm->mm_count);
107547 enter_lazy_tlb(oldmm, next);
107548- } else
107549+ } else {
107550 switch_mm(oldmm, mm, next);
107551+ populate_stack();
107552+ }
107553
107554 if (!prev->mm) {
107555 prev->active_mm = NULL;
107556@@ -3129,6 +3131,8 @@ int can_nice(const struct task_struct *p, const int nice)
107557 /* convert nice value [19,-20] to rlimit style value [1,40] */
107558 int nice_rlim = nice_to_rlimit(nice);
107559
107560+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
107561+
107562 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
107563 capable(CAP_SYS_NICE));
107564 }
107565@@ -3155,7 +3159,8 @@ SYSCALL_DEFINE1(nice, int, increment)
107566 nice = task_nice(current) + increment;
107567
107568 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
107569- if (increment < 0 && !can_nice(current, nice))
107570+ if (increment < 0 && (!can_nice(current, nice) ||
107571+ gr_handle_chroot_nice()))
107572 return -EPERM;
107573
107574 retval = security_task_setnice(current, nice);
107575@@ -3467,6 +3472,7 @@ recheck:
107576 if (policy != p->policy && !rlim_rtprio)
107577 return -EPERM;
107578
107579+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
107580 /* can't increase priority */
107581 if (attr->sched_priority > p->rt_priority &&
107582 attr->sched_priority > rlim_rtprio)
107583@@ -4950,6 +4956,7 @@ void idle_task_exit(void)
107584
107585 if (mm != &init_mm) {
107586 switch_mm(mm, &init_mm, current);
107587+ populate_stack();
107588 finish_arch_post_lock_switch();
107589 }
107590 mmdrop(mm);
107591@@ -5045,7 +5052,7 @@ static void migrate_tasks(unsigned int dead_cpu)
107592
107593 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
107594
107595-static struct ctl_table sd_ctl_dir[] = {
107596+static ctl_table_no_const sd_ctl_dir[] __read_only = {
107597 {
107598 .procname = "sched_domain",
107599 .mode = 0555,
107600@@ -5062,17 +5069,17 @@ static struct ctl_table sd_ctl_root[] = {
107601 {}
107602 };
107603
107604-static struct ctl_table *sd_alloc_ctl_entry(int n)
107605+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
107606 {
107607- struct ctl_table *entry =
107608+ ctl_table_no_const *entry =
107609 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
107610
107611 return entry;
107612 }
107613
107614-static void sd_free_ctl_entry(struct ctl_table **tablep)
107615+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
107616 {
107617- struct ctl_table *entry;
107618+ ctl_table_no_const *entry;
107619
107620 /*
107621 * In the intermediate directories, both the child directory and
107622@@ -5080,22 +5087,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
107623 * will always be set. In the lowest directory the names are
107624 * static strings and all have proc handlers.
107625 */
107626- for (entry = *tablep; entry->mode; entry++) {
107627- if (entry->child)
107628- sd_free_ctl_entry(&entry->child);
107629+ for (entry = tablep; entry->mode; entry++) {
107630+ if (entry->child) {
107631+ sd_free_ctl_entry(entry->child);
107632+ pax_open_kernel();
107633+ entry->child = NULL;
107634+ pax_close_kernel();
107635+ }
107636 if (entry->proc_handler == NULL)
107637 kfree(entry->procname);
107638 }
107639
107640- kfree(*tablep);
107641- *tablep = NULL;
107642+ kfree(tablep);
107643 }
107644
107645 static int min_load_idx = 0;
107646 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
107647
107648 static void
107649-set_table_entry(struct ctl_table *entry,
107650+set_table_entry(ctl_table_no_const *entry,
107651 const char *procname, void *data, int maxlen,
107652 umode_t mode, proc_handler *proc_handler,
107653 bool load_idx)
107654@@ -5115,7 +5125,7 @@ set_table_entry(struct ctl_table *entry,
107655 static struct ctl_table *
107656 sd_alloc_ctl_domain_table(struct sched_domain *sd)
107657 {
107658- struct ctl_table *table = sd_alloc_ctl_entry(14);
107659+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
107660
107661 if (table == NULL)
107662 return NULL;
107663@@ -5153,9 +5163,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
107664 return table;
107665 }
107666
107667-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
107668+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
107669 {
107670- struct ctl_table *entry, *table;
107671+ ctl_table_no_const *entry, *table;
107672 struct sched_domain *sd;
107673 int domain_num = 0, i;
107674 char buf[32];
107675@@ -5182,11 +5192,13 @@ static struct ctl_table_header *sd_sysctl_header;
107676 static void register_sched_domain_sysctl(void)
107677 {
107678 int i, cpu_num = num_possible_cpus();
107679- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
107680+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
107681 char buf[32];
107682
107683 WARN_ON(sd_ctl_dir[0].child);
107684+ pax_open_kernel();
107685 sd_ctl_dir[0].child = entry;
107686+ pax_close_kernel();
107687
107688 if (entry == NULL)
107689 return;
107690@@ -5209,8 +5221,12 @@ static void unregister_sched_domain_sysctl(void)
107691 if (sd_sysctl_header)
107692 unregister_sysctl_table(sd_sysctl_header);
107693 sd_sysctl_header = NULL;
107694- if (sd_ctl_dir[0].child)
107695- sd_free_ctl_entry(&sd_ctl_dir[0].child);
107696+ if (sd_ctl_dir[0].child) {
107697+ sd_free_ctl_entry(sd_ctl_dir[0].child);
107698+ pax_open_kernel();
107699+ sd_ctl_dir[0].child = NULL;
107700+ pax_close_kernel();
107701+ }
107702 }
107703 #else
107704 static void register_sched_domain_sysctl(void)
107705diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
107706index c2980e8..4737a6d 100644
107707--- a/kernel/sched/fair.c
107708+++ b/kernel/sched/fair.c
107709@@ -2107,7 +2107,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
107710
107711 static void reset_ptenuma_scan(struct task_struct *p)
107712 {
107713- ACCESS_ONCE(p->mm->numa_scan_seq)++;
107714+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
107715 p->mm->numa_scan_offset = 0;
107716 }
107717
107718@@ -7753,7 +7753,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
107719 * run_rebalance_domains is triggered when needed from the scheduler tick.
107720 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
107721 */
107722-static void run_rebalance_domains(struct softirq_action *h)
107723+static __latent_entropy void run_rebalance_domains(void)
107724 {
107725 struct rq *this_rq = this_rq();
107726 enum cpu_idle_type idle = this_rq->idle_balance ?
107727diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
107728index e0e1299..e1e896b 100644
107729--- a/kernel/sched/sched.h
107730+++ b/kernel/sched/sched.h
107731@@ -1219,7 +1219,7 @@ struct sched_class {
107732 #ifdef CONFIG_FAIR_GROUP_SCHED
107733 void (*task_move_group) (struct task_struct *p, int on_rq);
107734 #endif
107735-};
107736+} __do_const;
107737
107738 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
107739 {
107740diff --git a/kernel/signal.c b/kernel/signal.c
107741index 0206be7..6445784 100644
107742--- a/kernel/signal.c
107743+++ b/kernel/signal.c
107744@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
107745
107746 int print_fatal_signals __read_mostly;
107747
107748-static void __user *sig_handler(struct task_struct *t, int sig)
107749+static __sighandler_t sig_handler(struct task_struct *t, int sig)
107750 {
107751 return t->sighand->action[sig - 1].sa.sa_handler;
107752 }
107753
107754-static int sig_handler_ignored(void __user *handler, int sig)
107755+static int sig_handler_ignored(__sighandler_t handler, int sig)
107756 {
107757 /* Is it explicitly or implicitly ignored? */
107758 return handler == SIG_IGN ||
107759@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
107760
107761 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
107762 {
107763- void __user *handler;
107764+ __sighandler_t handler;
107765
107766 handler = sig_handler(t, sig);
107767
107768@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
107769 atomic_inc(&user->sigpending);
107770 rcu_read_unlock();
107771
107772+ if (!override_rlimit)
107773+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
107774+
107775 if (override_rlimit ||
107776 atomic_read(&user->sigpending) <=
107777 task_rlimit(t, RLIMIT_SIGPENDING)) {
107778@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
107779
107780 int unhandled_signal(struct task_struct *tsk, int sig)
107781 {
107782- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
107783+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
107784 if (is_global_init(tsk))
107785 return 1;
107786 if (handler != SIG_IGN && handler != SIG_DFL)
107787@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
107788 }
107789 }
107790
107791+ /* allow glibc communication via tgkill to other threads in our
107792+ thread group */
107793+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
107794+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
107795+ && gr_handle_signal(t, sig))
107796+ return -EPERM;
107797+
107798 return security_task_kill(t, info, sig, 0);
107799 }
107800
107801@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
107802 return send_signal(sig, info, p, 1);
107803 }
107804
107805-static int
107806+int
107807 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107808 {
107809 return send_signal(sig, info, t, 0);
107810@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107811 unsigned long int flags;
107812 int ret, blocked, ignored;
107813 struct k_sigaction *action;
107814+ int is_unhandled = 0;
107815
107816 spin_lock_irqsave(&t->sighand->siglock, flags);
107817 action = &t->sighand->action[sig-1];
107818@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107819 }
107820 if (action->sa.sa_handler == SIG_DFL)
107821 t->signal->flags &= ~SIGNAL_UNKILLABLE;
107822+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
107823+ is_unhandled = 1;
107824 ret = specific_send_sig_info(sig, info, t);
107825 spin_unlock_irqrestore(&t->sighand->siglock, flags);
107826
107827+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
107828+ normal operation */
107829+ if (is_unhandled) {
107830+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
107831+ gr_handle_crash(t, sig);
107832+ }
107833+
107834 return ret;
107835 }
107836
107837@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
107838 ret = check_kill_permission(sig, info, p);
107839 rcu_read_unlock();
107840
107841- if (!ret && sig)
107842+ if (!ret && sig) {
107843 ret = do_send_sig_info(sig, info, p, true);
107844+ if (!ret)
107845+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
107846+ }
107847
107848 return ret;
107849 }
107850@@ -2918,7 +2941,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
107851 int error = -ESRCH;
107852
107853 rcu_read_lock();
107854- p = find_task_by_vpid(pid);
107855+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
107856+ /* allow glibc communication via tgkill to other threads in our
107857+ thread group */
107858+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
107859+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
107860+ p = find_task_by_vpid_unrestricted(pid);
107861+ else
107862+#endif
107863+ p = find_task_by_vpid(pid);
107864 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
107865 error = check_kill_permission(sig, info, p);
107866 /*
107867@@ -3247,8 +3278,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
107868 }
107869 seg = get_fs();
107870 set_fs(KERNEL_DS);
107871- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
107872- (stack_t __force __user *) &uoss,
107873+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
107874+ (stack_t __force_user *) &uoss,
107875 compat_user_stack_pointer());
107876 set_fs(seg);
107877 if (ret >= 0 && uoss_ptr) {
107878diff --git a/kernel/smpboot.c b/kernel/smpboot.c
107879index c697f73..4ef1c25 100644
107880--- a/kernel/smpboot.c
107881+++ b/kernel/smpboot.c
107882@@ -291,7 +291,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
107883 }
107884 smpboot_unpark_thread(plug_thread, cpu);
107885 }
107886- list_add(&plug_thread->list, &hotplug_threads);
107887+ pax_list_add(&plug_thread->list, &hotplug_threads);
107888 out:
107889 mutex_unlock(&smpboot_threads_lock);
107890 put_online_cpus();
107891@@ -309,7 +309,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
107892 {
107893 get_online_cpus();
107894 mutex_lock(&smpboot_threads_lock);
107895- list_del(&plug_thread->list);
107896+ pax_list_del(&plug_thread->list);
107897 smpboot_destroy_threads(plug_thread);
107898 mutex_unlock(&smpboot_threads_lock);
107899 put_online_cpus();
107900diff --git a/kernel/softirq.c b/kernel/softirq.c
107901index 479e443..66d845e1 100644
107902--- a/kernel/softirq.c
107903+++ b/kernel/softirq.c
107904@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
107905 EXPORT_SYMBOL(irq_stat);
107906 #endif
107907
107908-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
107909+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
107910
107911 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
107912
107913@@ -270,7 +270,7 @@ restart:
107914 kstat_incr_softirqs_this_cpu(vec_nr);
107915
107916 trace_softirq_entry(vec_nr);
107917- h->action(h);
107918+ h->action();
107919 trace_softirq_exit(vec_nr);
107920 if (unlikely(prev_count != preempt_count())) {
107921 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
107922@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
107923 or_softirq_pending(1UL << nr);
107924 }
107925
107926-void open_softirq(int nr, void (*action)(struct softirq_action *))
107927+void __init open_softirq(int nr, void (*action)(void))
107928 {
107929 softirq_vec[nr].action = action;
107930 }
107931@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
107932 }
107933 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
107934
107935-static void tasklet_action(struct softirq_action *a)
107936+static void tasklet_action(void)
107937 {
107938 struct tasklet_struct *list;
107939
107940@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
107941 }
107942 }
107943
107944-static void tasklet_hi_action(struct softirq_action *a)
107945+static __latent_entropy void tasklet_hi_action(void)
107946 {
107947 struct tasklet_struct *list;
107948
107949@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
107950 .notifier_call = cpu_callback
107951 };
107952
107953-static struct smp_hotplug_thread softirq_threads = {
107954+static struct smp_hotplug_thread softirq_threads __read_only = {
107955 .store = &ksoftirqd,
107956 .thread_should_run = ksoftirqd_should_run,
107957 .thread_fn = run_ksoftirqd,
107958diff --git a/kernel/sys.c b/kernel/sys.c
107959index a4e372b..766810e 100644
107960--- a/kernel/sys.c
107961+++ b/kernel/sys.c
107962@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
107963 error = -EACCES;
107964 goto out;
107965 }
107966+
107967+ if (gr_handle_chroot_setpriority(p, niceval)) {
107968+ error = -EACCES;
107969+ goto out;
107970+ }
107971+
107972 no_nice = security_task_setnice(p, niceval);
107973 if (no_nice) {
107974 error = no_nice;
107975@@ -366,6 +372,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
107976 goto error;
107977 }
107978
107979+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
107980+ goto error;
107981+
107982+ if (!gid_eq(new->gid, old->gid)) {
107983+ /* make sure we generate a learn log for what will
107984+ end up being a role transition after a full-learning
107985+ policy is generated
107986+ CAP_SETGID is required to perform a transition
107987+ we may not log a CAP_SETGID check above, e.g.
107988+ in the case where new rgid = old egid
107989+ */
107990+ gr_learn_cap(current, new, CAP_SETGID);
107991+ }
107992+
107993 if (rgid != (gid_t) -1 ||
107994 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
107995 new->sgid = new->egid;
107996@@ -401,6 +421,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
107997 old = current_cred();
107998
107999 retval = -EPERM;
108000+
108001+ if (gr_check_group_change(kgid, kgid, kgid))
108002+ goto error;
108003+
108004 if (ns_capable(old->user_ns, CAP_SETGID))
108005 new->gid = new->egid = new->sgid = new->fsgid = kgid;
108006 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
108007@@ -418,7 +442,7 @@ error:
108008 /*
108009 * change the user struct in a credentials set to match the new UID
108010 */
108011-static int set_user(struct cred *new)
108012+int set_user(struct cred *new)
108013 {
108014 struct user_struct *new_user;
108015
108016@@ -498,7 +522,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
108017 goto error;
108018 }
108019
108020+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
108021+ goto error;
108022+
108023 if (!uid_eq(new->uid, old->uid)) {
108024+ /* make sure we generate a learn log for what will
108025+ end up being a role transition after a full-learning
108026+ policy is generated
108027+ CAP_SETUID is required to perform a transition
108028+ we may not log a CAP_SETUID check above, e.g.
108029+ in the case where new ruid = old euid
108030+ */
108031+ gr_learn_cap(current, new, CAP_SETUID);
108032 retval = set_user(new);
108033 if (retval < 0)
108034 goto error;
108035@@ -548,6 +583,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
108036 old = current_cred();
108037
108038 retval = -EPERM;
108039+
108040+ if (gr_check_crash_uid(kuid))
108041+ goto error;
108042+ if (gr_check_user_change(kuid, kuid, kuid))
108043+ goto error;
108044+
108045 if (ns_capable(old->user_ns, CAP_SETUID)) {
108046 new->suid = new->uid = kuid;
108047 if (!uid_eq(kuid, old->uid)) {
108048@@ -617,6 +658,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
108049 goto error;
108050 }
108051
108052+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
108053+ goto error;
108054+
108055 if (ruid != (uid_t) -1) {
108056 new->uid = kruid;
108057 if (!uid_eq(kruid, old->uid)) {
108058@@ -701,6 +745,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
108059 goto error;
108060 }
108061
108062+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
108063+ goto error;
108064+
108065 if (rgid != (gid_t) -1)
108066 new->gid = krgid;
108067 if (egid != (gid_t) -1)
108068@@ -765,12 +812,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
108069 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
108070 ns_capable(old->user_ns, CAP_SETUID)) {
108071 if (!uid_eq(kuid, old->fsuid)) {
108072+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
108073+ goto error;
108074+
108075 new->fsuid = kuid;
108076 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
108077 goto change_okay;
108078 }
108079 }
108080
108081+error:
108082 abort_creds(new);
108083 return old_fsuid;
108084
108085@@ -803,12 +854,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
108086 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
108087 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
108088 ns_capable(old->user_ns, CAP_SETGID)) {
108089+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
108090+ goto error;
108091+
108092 if (!gid_eq(kgid, old->fsgid)) {
108093 new->fsgid = kgid;
108094 goto change_okay;
108095 }
108096 }
108097
108098+error:
108099 abort_creds(new);
108100 return old_fsgid;
108101
108102@@ -1187,19 +1242,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
108103 return -EFAULT;
108104
108105 down_read(&uts_sem);
108106- error = __copy_to_user(&name->sysname, &utsname()->sysname,
108107+ error = __copy_to_user(name->sysname, &utsname()->sysname,
108108 __OLD_UTS_LEN);
108109 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
108110- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
108111+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
108112 __OLD_UTS_LEN);
108113 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
108114- error |= __copy_to_user(&name->release, &utsname()->release,
108115+ error |= __copy_to_user(name->release, &utsname()->release,
108116 __OLD_UTS_LEN);
108117 error |= __put_user(0, name->release + __OLD_UTS_LEN);
108118- error |= __copy_to_user(&name->version, &utsname()->version,
108119+ error |= __copy_to_user(name->version, &utsname()->version,
108120 __OLD_UTS_LEN);
108121 error |= __put_user(0, name->version + __OLD_UTS_LEN);
108122- error |= __copy_to_user(&name->machine, &utsname()->machine,
108123+ error |= __copy_to_user(name->machine, &utsname()->machine,
108124 __OLD_UTS_LEN);
108125 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
108126 up_read(&uts_sem);
108127@@ -1400,6 +1455,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
108128 */
108129 new_rlim->rlim_cur = 1;
108130 }
108131+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
108132+ is changed to a lower value. Since tasks can be created by the same
108133+ user in between this limit change and an execve by this task, force
108134+ a recheck only for this task by setting PF_NPROC_EXCEEDED
108135+ */
108136+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
108137+ tsk->flags |= PF_NPROC_EXCEEDED;
108138 }
108139 if (!retval) {
108140 if (old_rlim)
108141diff --git a/kernel/sysctl.c b/kernel/sysctl.c
108142index c3eee4c..2e53ad1 100644
108143--- a/kernel/sysctl.c
108144+++ b/kernel/sysctl.c
108145@@ -94,7 +94,6 @@
108146 #endif
108147
108148 #if defined(CONFIG_SYSCTL)
108149-
108150 /* External variables not in a header file. */
108151 extern int suid_dumpable;
108152 #ifdef CONFIG_COREDUMP
108153@@ -111,22 +110,24 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
108154 #ifndef CONFIG_MMU
108155 extern int sysctl_nr_trim_pages;
108156 #endif
108157+extern int sysctl_modify_ldt;
108158
108159 /* Constants used for minimum and maximum */
108160 #ifdef CONFIG_LOCKUP_DETECTOR
108161-static int sixty = 60;
108162+static int sixty __read_only = 60;
108163 #endif
108164
108165-static int __maybe_unused neg_one = -1;
108166+static int __maybe_unused neg_one __read_only = -1;
108167
108168-static int zero;
108169-static int __maybe_unused one = 1;
108170-static int __maybe_unused two = 2;
108171-static int __maybe_unused four = 4;
108172-static unsigned long one_ul = 1;
108173-static int one_hundred = 100;
108174+static int zero __read_only = 0;
108175+static int __maybe_unused one __read_only = 1;
108176+static int __maybe_unused two __read_only = 2;
108177+static int __maybe_unused three __read_only = 3;
108178+static int __maybe_unused four __read_only = 4;
108179+static unsigned long one_ul __read_only = 1;
108180+static int one_hundred __read_only = 100;
108181 #ifdef CONFIG_PRINTK
108182-static int ten_thousand = 10000;
108183+static int ten_thousand __read_only = 10000;
108184 #endif
108185
108186 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
108187@@ -180,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
108188 void __user *buffer, size_t *lenp, loff_t *ppos);
108189 #endif
108190
108191-#ifdef CONFIG_PRINTK
108192-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108193+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108194 void __user *buffer, size_t *lenp, loff_t *ppos);
108195-#endif
108196
108197 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
108198 void __user *buffer, size_t *lenp, loff_t *ppos);
108199@@ -214,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
108200
108201 #endif
108202
108203+extern struct ctl_table grsecurity_table[];
108204+
108205 static struct ctl_table kern_table[];
108206 static struct ctl_table vm_table[];
108207 static struct ctl_table fs_table[];
108208@@ -228,6 +229,20 @@ extern struct ctl_table epoll_table[];
108209 int sysctl_legacy_va_layout;
108210 #endif
108211
108212+#ifdef CONFIG_PAX_SOFTMODE
108213+static struct ctl_table pax_table[] = {
108214+ {
108215+ .procname = "softmode",
108216+ .data = &pax_softmode,
108217+ .maxlen = sizeof(unsigned int),
108218+ .mode = 0600,
108219+ .proc_handler = &proc_dointvec,
108220+ },
108221+
108222+ { }
108223+};
108224+#endif
108225+
108226 /* The default sysctl tables: */
108227
108228 static struct ctl_table sysctl_base_table[] = {
108229@@ -276,6 +291,22 @@ static int max_extfrag_threshold = 1000;
108230 #endif
108231
108232 static struct ctl_table kern_table[] = {
108233+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
108234+ {
108235+ .procname = "grsecurity",
108236+ .mode = 0500,
108237+ .child = grsecurity_table,
108238+ },
108239+#endif
108240+
108241+#ifdef CONFIG_PAX_SOFTMODE
108242+ {
108243+ .procname = "pax",
108244+ .mode = 0500,
108245+ .child = pax_table,
108246+ },
108247+#endif
108248+
108249 {
108250 .procname = "sched_child_runs_first",
108251 .data = &sysctl_sched_child_runs_first,
108252@@ -637,7 +668,7 @@ static struct ctl_table kern_table[] = {
108253 .maxlen = sizeof(int),
108254 .mode = 0644,
108255 /* only handle a transition from default "0" to "1" */
108256- .proc_handler = proc_dointvec_minmax,
108257+ .proc_handler = proc_dointvec_minmax_secure,
108258 .extra1 = &one,
108259 .extra2 = &one,
108260 },
108261@@ -648,7 +679,7 @@ static struct ctl_table kern_table[] = {
108262 .data = &modprobe_path,
108263 .maxlen = KMOD_PATH_LEN,
108264 .mode = 0644,
108265- .proc_handler = proc_dostring,
108266+ .proc_handler = proc_dostring_modpriv,
108267 },
108268 {
108269 .procname = "modules_disabled",
108270@@ -656,7 +687,7 @@ static struct ctl_table kern_table[] = {
108271 .maxlen = sizeof(int),
108272 .mode = 0644,
108273 /* only handle a transition from default "0" to "1" */
108274- .proc_handler = proc_dointvec_minmax,
108275+ .proc_handler = proc_dointvec_minmax_secure,
108276 .extra1 = &one,
108277 .extra2 = &one,
108278 },
108279@@ -811,20 +842,24 @@ static struct ctl_table kern_table[] = {
108280 .data = &dmesg_restrict,
108281 .maxlen = sizeof(int),
108282 .mode = 0644,
108283- .proc_handler = proc_dointvec_minmax_sysadmin,
108284+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108285 .extra1 = &zero,
108286 .extra2 = &one,
108287 },
108288+#endif
108289 {
108290 .procname = "kptr_restrict",
108291 .data = &kptr_restrict,
108292 .maxlen = sizeof(int),
108293 .mode = 0644,
108294- .proc_handler = proc_dointvec_minmax_sysadmin,
108295+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108296+#ifdef CONFIG_GRKERNSEC_HIDESYM
108297+ .extra1 = &two,
108298+#else
108299 .extra1 = &zero,
108300+#endif
108301 .extra2 = &two,
108302 },
108303-#endif
108304 {
108305 .procname = "ngroups_max",
108306 .data = &ngroups_max,
108307@@ -962,6 +997,15 @@ static struct ctl_table kern_table[] = {
108308 .mode = 0644,
108309 .proc_handler = proc_dointvec,
108310 },
108311+ {
108312+ .procname = "modify_ldt",
108313+ .data = &sysctl_modify_ldt,
108314+ .maxlen = sizeof(int),
108315+ .mode = 0644,
108316+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108317+ .extra1 = &zero,
108318+ .extra2 = &one,
108319+ },
108320 #endif
108321 #if defined(CONFIG_MMU)
108322 {
108323@@ -1084,10 +1128,17 @@ static struct ctl_table kern_table[] = {
108324 */
108325 {
108326 .procname = "perf_event_paranoid",
108327- .data = &sysctl_perf_event_paranoid,
108328- .maxlen = sizeof(sysctl_perf_event_paranoid),
108329+ .data = &sysctl_perf_event_legitimately_concerned,
108330+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
108331 .mode = 0644,
108332- .proc_handler = proc_dointvec,
108333+ /* go ahead, be a hero */
108334+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108335+ .extra1 = &neg_one,
108336+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
108337+ .extra2 = &three,
108338+#else
108339+ .extra2 = &two,
108340+#endif
108341 },
108342 {
108343 .procname = "perf_event_mlock_kb",
108344@@ -1369,6 +1420,13 @@ static struct ctl_table vm_table[] = {
108345 .proc_handler = proc_dointvec_minmax,
108346 .extra1 = &zero,
108347 },
108348+ {
108349+ .procname = "heap_stack_gap",
108350+ .data = &sysctl_heap_stack_gap,
108351+ .maxlen = sizeof(sysctl_heap_stack_gap),
108352+ .mode = 0644,
108353+ .proc_handler = proc_doulongvec_minmax,
108354+ },
108355 #else
108356 {
108357 .procname = "nr_trim_pages",
108358@@ -1845,6 +1903,16 @@ int proc_dostring(struct ctl_table *table, int write,
108359 (char __user *)buffer, lenp, ppos);
108360 }
108361
108362+int proc_dostring_modpriv(struct ctl_table *table, int write,
108363+ void __user *buffer, size_t *lenp, loff_t *ppos)
108364+{
108365+ if (write && !capable(CAP_SYS_MODULE))
108366+ return -EPERM;
108367+
108368+ return _proc_do_string(table->data, table->maxlen, write,
108369+ buffer, lenp, ppos);
108370+}
108371+
108372 static size_t proc_skip_spaces(char **buf)
108373 {
108374 size_t ret;
108375@@ -1950,6 +2018,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
108376 len = strlen(tmp);
108377 if (len > *size)
108378 len = *size;
108379+ if (len > sizeof(tmp))
108380+ len = sizeof(tmp);
108381 if (copy_to_user(*buf, tmp, len))
108382 return -EFAULT;
108383 *size -= len;
108384@@ -1988,7 +2058,7 @@ static int do_proc_dointvec_conv(bool *negp, unsigned long *lvalp,
108385 int val = *valp;
108386 if (val < 0) {
108387 *negp = true;
108388- *lvalp = (unsigned long)-val;
108389+ *lvalp = -(unsigned long)val;
108390 } else {
108391 *negp = false;
108392 *lvalp = (unsigned long)val;
108393@@ -2128,6 +2198,44 @@ int proc_dointvec(struct ctl_table *table, int write,
108394 NULL,NULL);
108395 }
108396
108397+static int do_proc_dointvec_conv_secure(bool *negp, unsigned long *lvalp,
108398+ int *valp,
108399+ int write, void *data)
108400+{
108401+ if (write) {
108402+ if (*negp) {
108403+ if (*lvalp > (unsigned long) INT_MAX + 1)
108404+ return -EINVAL;
108405+ pax_open_kernel();
108406+ *valp = -*lvalp;
108407+ pax_close_kernel();
108408+ } else {
108409+ if (*lvalp > (unsigned long) INT_MAX)
108410+ return -EINVAL;
108411+ pax_open_kernel();
108412+ *valp = *lvalp;
108413+ pax_close_kernel();
108414+ }
108415+ } else {
108416+ int val = *valp;
108417+ if (val < 0) {
108418+ *negp = true;
108419+ *lvalp = -(unsigned long)val;
108420+ } else {
108421+ *negp = false;
108422+ *lvalp = (unsigned long)val;
108423+ }
108424+ }
108425+ return 0;
108426+}
108427+
108428+int proc_dointvec_secure(struct ctl_table *table, int write,
108429+ void __user *buffer, size_t *lenp, loff_t *ppos)
108430+{
108431+ return do_proc_dointvec(table,write,buffer,lenp,ppos,
108432+ do_proc_dointvec_conv_secure,NULL);
108433+}
108434+
108435 /*
108436 * Taint values can only be increased
108437 * This means we can safely use a temporary.
108438@@ -2135,7 +2243,7 @@ int proc_dointvec(struct ctl_table *table, int write,
108439 static int proc_taint(struct ctl_table *table, int write,
108440 void __user *buffer, size_t *lenp, loff_t *ppos)
108441 {
108442- struct ctl_table t;
108443+ ctl_table_no_const t;
108444 unsigned long tmptaint = get_taint();
108445 int err;
108446
108447@@ -2163,16 +2271,14 @@ static int proc_taint(struct ctl_table *table, int write,
108448 return err;
108449 }
108450
108451-#ifdef CONFIG_PRINTK
108452-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108453+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108454 void __user *buffer, size_t *lenp, loff_t *ppos)
108455 {
108456 if (write && !capable(CAP_SYS_ADMIN))
108457 return -EPERM;
108458
108459- return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108460+ return proc_dointvec_minmax_secure(table, write, buffer, lenp, ppos);
108461 }
108462-#endif
108463
108464 struct do_proc_dointvec_minmax_conv_param {
108465 int *min;
108466@@ -2194,7 +2300,33 @@ static int do_proc_dointvec_minmax_conv(bool *negp, unsigned long *lvalp,
108467 int val = *valp;
108468 if (val < 0) {
108469 *negp = true;
108470- *lvalp = (unsigned long)-val;
108471+ *lvalp = -(unsigned long)val;
108472+ } else {
108473+ *negp = false;
108474+ *lvalp = (unsigned long)val;
108475+ }
108476+ }
108477+ return 0;
108478+}
108479+
108480+static int do_proc_dointvec_minmax_conv_secure(bool *negp, unsigned long *lvalp,
108481+ int *valp,
108482+ int write, void *data)
108483+{
108484+ struct do_proc_dointvec_minmax_conv_param *param = data;
108485+ if (write) {
108486+ int val = *negp ? -*lvalp : *lvalp;
108487+ if ((param->min && *param->min > val) ||
108488+ (param->max && *param->max < val))
108489+ return -EINVAL;
108490+ pax_open_kernel();
108491+ *valp = val;
108492+ pax_close_kernel();
108493+ } else {
108494+ int val = *valp;
108495+ if (val < 0) {
108496+ *negp = true;
108497+ *lvalp = -(unsigned long)val;
108498 } else {
108499 *negp = false;
108500 *lvalp = (unsigned long)val;
108501@@ -2230,6 +2362,17 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
108502 do_proc_dointvec_minmax_conv, &param);
108503 }
108504
108505+int proc_dointvec_minmax_secure(struct ctl_table *table, int write,
108506+ void __user *buffer, size_t *lenp, loff_t *ppos)
108507+{
108508+ struct do_proc_dointvec_minmax_conv_param param = {
108509+ .min = (int *) table->extra1,
108510+ .max = (int *) table->extra2,
108511+ };
108512+ return do_proc_dointvec(table, write, buffer, lenp, ppos,
108513+ do_proc_dointvec_minmax_conv_secure, &param);
108514+}
108515+
108516 static void validate_coredump_safety(void)
108517 {
108518 #ifdef CONFIG_COREDUMP
108519@@ -2429,7 +2572,7 @@ static int do_proc_dointvec_jiffies_conv(bool *negp, unsigned long *lvalp,
108520 unsigned long lval;
108521 if (val < 0) {
108522 *negp = true;
108523- lval = (unsigned long)-val;
108524+ lval = -(unsigned long)val;
108525 } else {
108526 *negp = false;
108527 lval = (unsigned long)val;
108528@@ -2452,7 +2595,7 @@ static int do_proc_dointvec_userhz_jiffies_conv(bool *negp, unsigned long *lvalp
108529 unsigned long lval;
108530 if (val < 0) {
108531 *negp = true;
108532- lval = (unsigned long)-val;
108533+ lval = -(unsigned long)val;
108534 } else {
108535 *negp = false;
108536 lval = (unsigned long)val;
108537@@ -2477,7 +2620,7 @@ static int do_proc_dointvec_ms_jiffies_conv(bool *negp, unsigned long *lvalp,
108538 unsigned long lval;
108539 if (val < 0) {
108540 *negp = true;
108541- lval = (unsigned long)-val;
108542+ lval = -(unsigned long)val;
108543 } else {
108544 *negp = false;
108545 lval = (unsigned long)val;
108546@@ -2732,6 +2875,12 @@ int proc_dostring(struct ctl_table *table, int write,
108547 return -ENOSYS;
108548 }
108549
108550+int proc_dostring_modpriv(struct ctl_table *table, int write,
108551+ void __user *buffer, size_t *lenp, loff_t *ppos)
108552+{
108553+ return -ENOSYS;
108554+}
108555+
108556 int proc_dointvec(struct ctl_table *table, int write,
108557 void __user *buffer, size_t *lenp, loff_t *ppos)
108558 {
108559@@ -2788,5 +2937,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
108560 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
108561 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
108562 EXPORT_SYMBOL(proc_dostring);
108563+EXPORT_SYMBOL(proc_dostring_modpriv);
108564 EXPORT_SYMBOL(proc_doulongvec_minmax);
108565 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
108566diff --git a/kernel/taskstats.c b/kernel/taskstats.c
108567index 21f82c2..c1984e5 100644
108568--- a/kernel/taskstats.c
108569+++ b/kernel/taskstats.c
108570@@ -28,9 +28,12 @@
108571 #include <linux/fs.h>
108572 #include <linux/file.h>
108573 #include <linux/pid_namespace.h>
108574+#include <linux/grsecurity.h>
108575 #include <net/genetlink.h>
108576 #include <linux/atomic.h>
108577
108578+extern int gr_is_taskstats_denied(int pid);
108579+
108580 /*
108581 * Maximum length of a cpumask that can be specified in
108582 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
108583@@ -567,6 +570,9 @@ err:
108584
108585 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
108586 {
108587+ if (gr_is_taskstats_denied(current->pid))
108588+ return -EACCES;
108589+
108590 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
108591 return cmd_attr_register_cpumask(info);
108592 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
108593diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
108594index 1b001ed..55ef9e4 100644
108595--- a/kernel/time/alarmtimer.c
108596+++ b/kernel/time/alarmtimer.c
108597@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
108598 struct platform_device *pdev;
108599 int error = 0;
108600 int i;
108601- struct k_clock alarm_clock = {
108602+ static struct k_clock alarm_clock = {
108603 .clock_getres = alarm_clock_getres,
108604 .clock_get = alarm_clock_get,
108605 .timer_create = alarm_timer_create,
108606diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
108607index 93ef7190..7c85701 100644
108608--- a/kernel/time/hrtimer.c
108609+++ b/kernel/time/hrtimer.c
108610@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
108611 local_irq_restore(flags);
108612 }
108613
108614-static void run_hrtimer_softirq(struct softirq_action *h)
108615+static __latent_entropy void run_hrtimer_softirq(void)
108616 {
108617 hrtimer_peek_ahead_timers();
108618 }
108619diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
108620index 0075da7..63cc872 100644
108621--- a/kernel/time/posix-cpu-timers.c
108622+++ b/kernel/time/posix-cpu-timers.c
108623@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
108624
108625 static __init int init_posix_cpu_timers(void)
108626 {
108627- struct k_clock process = {
108628+ static struct k_clock process = {
108629 .clock_getres = process_cpu_clock_getres,
108630 .clock_get = process_cpu_clock_get,
108631 .timer_create = process_cpu_timer_create,
108632 .nsleep = process_cpu_nsleep,
108633 .nsleep_restart = process_cpu_nsleep_restart,
108634 };
108635- struct k_clock thread = {
108636+ static struct k_clock thread = {
108637 .clock_getres = thread_cpu_clock_getres,
108638 .clock_get = thread_cpu_clock_get,
108639 .timer_create = thread_cpu_timer_create,
108640diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
108641index 31ea01f..7fc61ef 100644
108642--- a/kernel/time/posix-timers.c
108643+++ b/kernel/time/posix-timers.c
108644@@ -43,6 +43,7 @@
108645 #include <linux/hash.h>
108646 #include <linux/posix-clock.h>
108647 #include <linux/posix-timers.h>
108648+#include <linux/grsecurity.h>
108649 #include <linux/syscalls.h>
108650 #include <linux/wait.h>
108651 #include <linux/workqueue.h>
108652@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
108653 * which we beg off on and pass to do_sys_settimeofday().
108654 */
108655
108656-static struct k_clock posix_clocks[MAX_CLOCKS];
108657+static struct k_clock *posix_clocks[MAX_CLOCKS];
108658
108659 /*
108660 * These ones are defined below.
108661@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
108662 */
108663 static __init int init_posix_timers(void)
108664 {
108665- struct k_clock clock_realtime = {
108666+ static struct k_clock clock_realtime = {
108667 .clock_getres = hrtimer_get_res,
108668 .clock_get = posix_clock_realtime_get,
108669 .clock_set = posix_clock_realtime_set,
108670@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
108671 .timer_get = common_timer_get,
108672 .timer_del = common_timer_del,
108673 };
108674- struct k_clock clock_monotonic = {
108675+ static struct k_clock clock_monotonic = {
108676 .clock_getres = hrtimer_get_res,
108677 .clock_get = posix_ktime_get_ts,
108678 .nsleep = common_nsleep,
108679@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
108680 .timer_get = common_timer_get,
108681 .timer_del = common_timer_del,
108682 };
108683- struct k_clock clock_monotonic_raw = {
108684+ static struct k_clock clock_monotonic_raw = {
108685 .clock_getres = hrtimer_get_res,
108686 .clock_get = posix_get_monotonic_raw,
108687 };
108688- struct k_clock clock_realtime_coarse = {
108689+ static struct k_clock clock_realtime_coarse = {
108690 .clock_getres = posix_get_coarse_res,
108691 .clock_get = posix_get_realtime_coarse,
108692 };
108693- struct k_clock clock_monotonic_coarse = {
108694+ static struct k_clock clock_monotonic_coarse = {
108695 .clock_getres = posix_get_coarse_res,
108696 .clock_get = posix_get_monotonic_coarse,
108697 };
108698- struct k_clock clock_tai = {
108699+ static struct k_clock clock_tai = {
108700 .clock_getres = hrtimer_get_res,
108701 .clock_get = posix_get_tai,
108702 .nsleep = common_nsleep,
108703@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
108704 .timer_get = common_timer_get,
108705 .timer_del = common_timer_del,
108706 };
108707- struct k_clock clock_boottime = {
108708+ static struct k_clock clock_boottime = {
108709 .clock_getres = hrtimer_get_res,
108710 .clock_get = posix_get_boottime,
108711 .nsleep = common_nsleep,
108712@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
108713 return;
108714 }
108715
108716- posix_clocks[clock_id] = *new_clock;
108717+ posix_clocks[clock_id] = new_clock;
108718 }
108719 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
108720
108721@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
108722 return (id & CLOCKFD_MASK) == CLOCKFD ?
108723 &clock_posix_dynamic : &clock_posix_cpu;
108724
108725- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
108726+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
108727 return NULL;
108728- return &posix_clocks[id];
108729+ return posix_clocks[id];
108730 }
108731
108732 static int common_timer_create(struct k_itimer *new_timer)
108733@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
108734 struct k_clock *kc = clockid_to_kclock(which_clock);
108735 struct k_itimer *new_timer;
108736 int error, new_timer_id;
108737- sigevent_t event;
108738+ sigevent_t event = { };
108739 int it_id_set = IT_ID_NOT_SET;
108740
108741 if (!kc)
108742@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
108743 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
108744 return -EFAULT;
108745
108746+ /* only the CLOCK_REALTIME clock can be set, all other clocks
108747+ have their clock_set fptr set to a nosettime dummy function
108748+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
108749+ call common_clock_set, which calls do_sys_settimeofday, which
108750+ we hook
108751+ */
108752+
108753 return kc->clock_set(which_clock, &new_tp);
108754 }
108755
108756diff --git a/kernel/time/time.c b/kernel/time/time.c
108757index 2c85b77..6530536 100644
108758--- a/kernel/time/time.c
108759+++ b/kernel/time/time.c
108760@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
108761 return error;
108762
108763 if (tz) {
108764+ /* we log in do_settimeofday called below, so don't log twice
108765+ */
108766+ if (!tv)
108767+ gr_log_timechange();
108768+
108769 sys_tz = *tz;
108770 update_vsyscall_tz();
108771 if (firsttime) {
108772diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
108773index 946acb7..1e13c0f 100644
108774--- a/kernel/time/timekeeping.c
108775+++ b/kernel/time/timekeeping.c
108776@@ -15,6 +15,7 @@
108777 #include <linux/init.h>
108778 #include <linux/mm.h>
108779 #include <linux/sched.h>
108780+#include <linux/grsecurity.h>
108781 #include <linux/syscore_ops.h>
108782 #include <linux/clocksource.h>
108783 #include <linux/jiffies.h>
108784@@ -915,6 +916,8 @@ int do_settimeofday64(const struct timespec64 *ts)
108785 if (!timespec64_valid_strict(ts))
108786 return -EINVAL;
108787
108788+ gr_log_timechange();
108789+
108790 raw_spin_lock_irqsave(&timekeeper_lock, flags);
108791 write_seqcount_begin(&tk_core.seq);
108792
108793diff --git a/kernel/time/timer.c b/kernel/time/timer.c
108794index 2ece3aa..055a295 100644
108795--- a/kernel/time/timer.c
108796+++ b/kernel/time/timer.c
108797@@ -1405,7 +1405,7 @@ void update_process_times(int user_tick)
108798 /*
108799 * This function runs timers and the timer-tq in bottom half context.
108800 */
108801-static void run_timer_softirq(struct softirq_action *h)
108802+static __latent_entropy void run_timer_softirq(void)
108803 {
108804 struct tvec_base *base = __this_cpu_read(tvec_bases);
108805
108806@@ -1468,7 +1468,7 @@ static void process_timeout(unsigned long __data)
108807 *
108808 * In all cases the return value is guaranteed to be non-negative.
108809 */
108810-signed long __sched schedule_timeout(signed long timeout)
108811+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
108812 {
108813 struct timer_list timer;
108814 unsigned long expire;
108815diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
108816index e878c2e..cf1546bb 100644
108817--- a/kernel/time/timer_list.c
108818+++ b/kernel/time/timer_list.c
108819@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
108820
108821 static void print_name_offset(struct seq_file *m, void *sym)
108822 {
108823+#ifdef CONFIG_GRKERNSEC_HIDESYM
108824+ SEQ_printf(m, "<%p>", NULL);
108825+#else
108826 char symname[KSYM_NAME_LEN];
108827
108828 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
108829 SEQ_printf(m, "<%pK>", sym);
108830 else
108831 SEQ_printf(m, "%s", symname);
108832+#endif
108833 }
108834
108835 static void
108836@@ -119,7 +123,11 @@ next_one:
108837 static void
108838 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
108839 {
108840+#ifdef CONFIG_GRKERNSEC_HIDESYM
108841+ SEQ_printf(m, " .base: %p\n", NULL);
108842+#else
108843 SEQ_printf(m, " .base: %pK\n", base);
108844+#endif
108845 SEQ_printf(m, " .index: %d\n",
108846 base->index);
108847 SEQ_printf(m, " .resolution: %Lu nsecs\n",
108848@@ -388,7 +396,11 @@ static int __init init_timer_list_procfs(void)
108849 {
108850 struct proc_dir_entry *pe;
108851
108852+#ifdef CONFIG_GRKERNSEC_PROC_ADD
108853+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
108854+#else
108855 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
108856+#endif
108857 if (!pe)
108858 return -ENOMEM;
108859 return 0;
108860diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
108861index 1fb08f2..ca4bb1e 100644
108862--- a/kernel/time/timer_stats.c
108863+++ b/kernel/time/timer_stats.c
108864@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
108865 static unsigned long nr_entries;
108866 static struct entry entries[MAX_ENTRIES];
108867
108868-static atomic_t overflow_count;
108869+static atomic_unchecked_t overflow_count;
108870
108871 /*
108872 * The entries are in a hash-table, for fast lookup:
108873@@ -140,7 +140,7 @@ static void reset_entries(void)
108874 nr_entries = 0;
108875 memset(entries, 0, sizeof(entries));
108876 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
108877- atomic_set(&overflow_count, 0);
108878+ atomic_set_unchecked(&overflow_count, 0);
108879 }
108880
108881 static struct entry *alloc_entry(void)
108882@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
108883 if (likely(entry))
108884 entry->count++;
108885 else
108886- atomic_inc(&overflow_count);
108887+ atomic_inc_unchecked(&overflow_count);
108888
108889 out_unlock:
108890 raw_spin_unlock_irqrestore(lock, flags);
108891@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
108892
108893 static void print_name_offset(struct seq_file *m, unsigned long addr)
108894 {
108895+#ifdef CONFIG_GRKERNSEC_HIDESYM
108896+ seq_printf(m, "<%p>", NULL);
108897+#else
108898 char symname[KSYM_NAME_LEN];
108899
108900 if (lookup_symbol_name(addr, symname) < 0)
108901- seq_printf(m, "<%p>", (void *)addr);
108902+ seq_printf(m, "<%pK>", (void *)addr);
108903 else
108904 seq_printf(m, "%s", symname);
108905+#endif
108906 }
108907
108908 static int tstats_show(struct seq_file *m, void *v)
108909@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
108910
108911 seq_puts(m, "Timer Stats Version: v0.3\n");
108912 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
108913- if (atomic_read(&overflow_count))
108914- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
108915+ if (atomic_read_unchecked(&overflow_count))
108916+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
108917 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
108918
108919 for (i = 0; i < nr_entries; i++) {
108920@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
108921 {
108922 struct proc_dir_entry *pe;
108923
108924+#ifdef CONFIG_GRKERNSEC_PROC_ADD
108925+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
108926+#else
108927 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
108928+#endif
108929 if (!pe)
108930 return -ENOMEM;
108931 return 0;
108932diff --git a/kernel/torture.c b/kernel/torture.c
108933index dd70993..0bf694b 100644
108934--- a/kernel/torture.c
108935+++ b/kernel/torture.c
108936@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
108937 mutex_lock(&fullstop_mutex);
108938 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
108939 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
108940- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
108941+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
108942 } else {
108943 pr_warn("Concurrent rmmod and shutdown illegal!\n");
108944 }
108945@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
108946 if (!torture_must_stop()) {
108947 if (stutter > 1) {
108948 schedule_timeout_interruptible(stutter - 1);
108949- ACCESS_ONCE(stutter_pause_test) = 2;
108950+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
108951 }
108952 schedule_timeout_interruptible(1);
108953- ACCESS_ONCE(stutter_pause_test) = 1;
108954+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
108955 }
108956 if (!torture_must_stop())
108957 schedule_timeout_interruptible(stutter);
108958- ACCESS_ONCE(stutter_pause_test) = 0;
108959+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
108960 torture_shutdown_absorb("torture_stutter");
108961 } while (!torture_must_stop());
108962 torture_kthread_stopping("torture_stutter");
108963@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
108964 schedule_timeout_uninterruptible(10);
108965 return true;
108966 }
108967- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
108968+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
108969 mutex_unlock(&fullstop_mutex);
108970 torture_shutdown_cleanup();
108971 torture_shuffle_cleanup();
108972diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
108973index 483cecf..ac46091 100644
108974--- a/kernel/trace/blktrace.c
108975+++ b/kernel/trace/blktrace.c
108976@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
108977 struct blk_trace *bt = filp->private_data;
108978 char buf[16];
108979
108980- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
108981+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
108982
108983 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
108984 }
108985@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
108986 return 1;
108987
108988 bt = buf->chan->private_data;
108989- atomic_inc(&bt->dropped);
108990+ atomic_inc_unchecked(&bt->dropped);
108991 return 0;
108992 }
108993
108994@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
108995
108996 bt->dir = dir;
108997 bt->dev = dev;
108998- atomic_set(&bt->dropped, 0);
108999+ atomic_set_unchecked(&bt->dropped, 0);
109000 INIT_LIST_HEAD(&bt->running_list);
109001
109002 ret = -EIO;
109003diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
109004index eb11011..43adc29 100644
109005--- a/kernel/trace/ftrace.c
109006+++ b/kernel/trace/ftrace.c
109007@@ -2413,12 +2413,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
109008 if (unlikely(ftrace_disabled))
109009 return 0;
109010
109011+ ret = ftrace_arch_code_modify_prepare();
109012+ FTRACE_WARN_ON(ret);
109013+ if (ret)
109014+ return 0;
109015+
109016 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
109017+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
109018 if (ret) {
109019 ftrace_bug(ret, rec);
109020- return 0;
109021 }
109022- return 1;
109023+ return ret ? 0 : 1;
109024 }
109025
109026 /*
109027@@ -4807,8 +4812,10 @@ static int ftrace_process_locs(struct module *mod,
109028 if (!count)
109029 return 0;
109030
109031+ pax_open_kernel();
109032 sort(start, count, sizeof(*start),
109033 ftrace_cmp_ips, ftrace_swap_ips);
109034+ pax_close_kernel();
109035
109036 start_pg = ftrace_allocate_pages(count);
109037 if (!start_pg)
109038@@ -5675,7 +5682,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
109039
109040 if (t->ret_stack == NULL) {
109041 atomic_set(&t->tracing_graph_pause, 0);
109042- atomic_set(&t->trace_overrun, 0);
109043+ atomic_set_unchecked(&t->trace_overrun, 0);
109044 t->curr_ret_stack = -1;
109045 /* Make sure the tasks see the -1 first: */
109046 smp_wmb();
109047@@ -5898,7 +5905,7 @@ static void
109048 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
109049 {
109050 atomic_set(&t->tracing_graph_pause, 0);
109051- atomic_set(&t->trace_overrun, 0);
109052+ atomic_set_unchecked(&t->trace_overrun, 0);
109053 t->ftrace_timestamp = 0;
109054 /* make curr_ret_stack visible before we add the ret_stack */
109055 smp_wmb();
109056diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
109057index 0315d43..2e5e9a2 100644
109058--- a/kernel/trace/ring_buffer.c
109059+++ b/kernel/trace/ring_buffer.c
109060@@ -348,9 +348,9 @@ struct buffer_data_page {
109061 */
109062 struct buffer_page {
109063 struct list_head list; /* list of buffer pages */
109064- local_t write; /* index for next write */
109065+ local_unchecked_t write; /* index for next write */
109066 unsigned read; /* index for next read */
109067- local_t entries; /* entries on this page */
109068+ local_unchecked_t entries; /* entries on this page */
109069 unsigned long real_end; /* real end of data */
109070 struct buffer_data_page *page; /* Actual data page */
109071 };
109072@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
109073 unsigned long last_overrun;
109074 local_t entries_bytes;
109075 local_t entries;
109076- local_t overrun;
109077- local_t commit_overrun;
109078- local_t dropped_events;
109079+ local_unchecked_t overrun;
109080+ local_unchecked_t commit_overrun;
109081+ local_unchecked_t dropped_events;
109082 local_t committing;
109083- local_t commits;
109084+ local_unchecked_t commits;
109085 unsigned long read;
109086 unsigned long read_bytes;
109087 u64 write_stamp;
109088@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109089 *
109090 * We add a counter to the write field to denote this.
109091 */
109092- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
109093- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
109094+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
109095+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
109096
109097 /*
109098 * Just make sure we have seen our old_write and synchronize
109099@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109100 * cmpxchg to only update if an interrupt did not already
109101 * do it for us. If the cmpxchg fails, we don't care.
109102 */
109103- (void)local_cmpxchg(&next_page->write, old_write, val);
109104- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
109105+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
109106+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
109107
109108 /*
109109 * No need to worry about races with clearing out the commit.
109110@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
109111
109112 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
109113 {
109114- return local_read(&bpage->entries) & RB_WRITE_MASK;
109115+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
109116 }
109117
109118 static inline unsigned long rb_page_write(struct buffer_page *bpage)
109119 {
109120- return local_read(&bpage->write) & RB_WRITE_MASK;
109121+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
109122 }
109123
109124 static int
109125@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
109126 * bytes consumed in ring buffer from here.
109127 * Increment overrun to account for the lost events.
109128 */
109129- local_add(page_entries, &cpu_buffer->overrun);
109130+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
109131 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109132 }
109133
109134@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
109135 * it is our responsibility to update
109136 * the counters.
109137 */
109138- local_add(entries, &cpu_buffer->overrun);
109139+ local_add_unchecked(entries, &cpu_buffer->overrun);
109140 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109141
109142 /*
109143@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109144 if (tail == BUF_PAGE_SIZE)
109145 tail_page->real_end = 0;
109146
109147- local_sub(length, &tail_page->write);
109148+ local_sub_unchecked(length, &tail_page->write);
109149 return;
109150 }
109151
109152@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109153 rb_event_set_padding(event);
109154
109155 /* Set the write back to the previous setting */
109156- local_sub(length, &tail_page->write);
109157+ local_sub_unchecked(length, &tail_page->write);
109158 return;
109159 }
109160
109161@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109162
109163 /* Set write to end of buffer */
109164 length = (tail + length) - BUF_PAGE_SIZE;
109165- local_sub(length, &tail_page->write);
109166+ local_sub_unchecked(length, &tail_page->write);
109167 }
109168
109169 /*
109170@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109171 * about it.
109172 */
109173 if (unlikely(next_page == commit_page)) {
109174- local_inc(&cpu_buffer->commit_overrun);
109175+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109176 goto out_reset;
109177 }
109178
109179@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109180 * this is easy, just stop here.
109181 */
109182 if (!(buffer->flags & RB_FL_OVERWRITE)) {
109183- local_inc(&cpu_buffer->dropped_events);
109184+ local_inc_unchecked(&cpu_buffer->dropped_events);
109185 goto out_reset;
109186 }
109187
109188@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109189 cpu_buffer->tail_page) &&
109190 (cpu_buffer->commit_page ==
109191 cpu_buffer->reader_page))) {
109192- local_inc(&cpu_buffer->commit_overrun);
109193+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109194 goto out_reset;
109195 }
109196 }
109197@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109198 length += RB_LEN_TIME_EXTEND;
109199
109200 tail_page = cpu_buffer->tail_page;
109201- write = local_add_return(length, &tail_page->write);
109202+ write = local_add_return_unchecked(length, &tail_page->write);
109203
109204 /* set write to only the index of the write */
109205 write &= RB_WRITE_MASK;
109206@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109207 kmemcheck_annotate_bitfield(event, bitfield);
109208 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
109209
109210- local_inc(&tail_page->entries);
109211+ local_inc_unchecked(&tail_page->entries);
109212
109213 /*
109214 * If this is the first commit on the page, then update
109215@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109216
109217 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
109218 unsigned long write_mask =
109219- local_read(&bpage->write) & ~RB_WRITE_MASK;
109220+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
109221 unsigned long event_length = rb_event_length(event);
109222 /*
109223 * This is on the tail page. It is possible that
109224@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109225 */
109226 old_index += write_mask;
109227 new_index += write_mask;
109228- index = local_cmpxchg(&bpage->write, old_index, new_index);
109229+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
109230 if (index == old_index) {
109231 /* update counters */
109232 local_sub(event_length, &cpu_buffer->entries_bytes);
109233@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109234 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
109235 {
109236 local_inc(&cpu_buffer->committing);
109237- local_inc(&cpu_buffer->commits);
109238+ local_inc_unchecked(&cpu_buffer->commits);
109239 }
109240
109241 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109242@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109243 return;
109244
109245 again:
109246- commits = local_read(&cpu_buffer->commits);
109247+ commits = local_read_unchecked(&cpu_buffer->commits);
109248 /* synchronize with interrupts */
109249 barrier();
109250 if (local_read(&cpu_buffer->committing) == 1)
109251@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109252 * updating of the commit page and the clearing of the
109253 * committing counter.
109254 */
109255- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
109256+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
109257 !local_read(&cpu_buffer->committing)) {
109258 local_inc(&cpu_buffer->committing);
109259 goto again;
109260@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
109261 barrier();
109262 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
109263 local_dec(&cpu_buffer->committing);
109264- local_dec(&cpu_buffer->commits);
109265+ local_dec_unchecked(&cpu_buffer->commits);
109266 return NULL;
109267 }
109268 #endif
109269@@ -2898,7 +2898,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109270
109271 /* Do the likely case first */
109272 if (likely(bpage->page == (void *)addr)) {
109273- local_dec(&bpage->entries);
109274+ local_dec_unchecked(&bpage->entries);
109275 return;
109276 }
109277
109278@@ -2910,7 +2910,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109279 start = bpage;
109280 do {
109281 if (bpage->page == (void *)addr) {
109282- local_dec(&bpage->entries);
109283+ local_dec_unchecked(&bpage->entries);
109284 return;
109285 }
109286 rb_inc_page(cpu_buffer, &bpage);
109287@@ -3194,7 +3194,7 @@ static inline unsigned long
109288 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
109289 {
109290 return local_read(&cpu_buffer->entries) -
109291- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
109292+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
109293 }
109294
109295 /**
109296@@ -3283,7 +3283,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
109297 return 0;
109298
109299 cpu_buffer = buffer->buffers[cpu];
109300- ret = local_read(&cpu_buffer->overrun);
109301+ ret = local_read_unchecked(&cpu_buffer->overrun);
109302
109303 return ret;
109304 }
109305@@ -3306,7 +3306,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
109306 return 0;
109307
109308 cpu_buffer = buffer->buffers[cpu];
109309- ret = local_read(&cpu_buffer->commit_overrun);
109310+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
109311
109312 return ret;
109313 }
109314@@ -3328,7 +3328,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
109315 return 0;
109316
109317 cpu_buffer = buffer->buffers[cpu];
109318- ret = local_read(&cpu_buffer->dropped_events);
109319+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
109320
109321 return ret;
109322 }
109323@@ -3391,7 +3391,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
109324 /* if you care about this being correct, lock the buffer */
109325 for_each_buffer_cpu(buffer, cpu) {
109326 cpu_buffer = buffer->buffers[cpu];
109327- overruns += local_read(&cpu_buffer->overrun);
109328+ overruns += local_read_unchecked(&cpu_buffer->overrun);
109329 }
109330
109331 return overruns;
109332@@ -3562,8 +3562,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109333 /*
109334 * Reset the reader page to size zero.
109335 */
109336- local_set(&cpu_buffer->reader_page->write, 0);
109337- local_set(&cpu_buffer->reader_page->entries, 0);
109338+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109339+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109340 local_set(&cpu_buffer->reader_page->page->commit, 0);
109341 cpu_buffer->reader_page->real_end = 0;
109342
109343@@ -3597,7 +3597,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109344 * want to compare with the last_overrun.
109345 */
109346 smp_mb();
109347- overwrite = local_read(&(cpu_buffer->overrun));
109348+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
109349
109350 /*
109351 * Here's the tricky part.
109352@@ -4169,8 +4169,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109353
109354 cpu_buffer->head_page
109355 = list_entry(cpu_buffer->pages, struct buffer_page, list);
109356- local_set(&cpu_buffer->head_page->write, 0);
109357- local_set(&cpu_buffer->head_page->entries, 0);
109358+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
109359+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
109360 local_set(&cpu_buffer->head_page->page->commit, 0);
109361
109362 cpu_buffer->head_page->read = 0;
109363@@ -4180,18 +4180,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109364
109365 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
109366 INIT_LIST_HEAD(&cpu_buffer->new_pages);
109367- local_set(&cpu_buffer->reader_page->write, 0);
109368- local_set(&cpu_buffer->reader_page->entries, 0);
109369+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109370+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109371 local_set(&cpu_buffer->reader_page->page->commit, 0);
109372 cpu_buffer->reader_page->read = 0;
109373
109374 local_set(&cpu_buffer->entries_bytes, 0);
109375- local_set(&cpu_buffer->overrun, 0);
109376- local_set(&cpu_buffer->commit_overrun, 0);
109377- local_set(&cpu_buffer->dropped_events, 0);
109378+ local_set_unchecked(&cpu_buffer->overrun, 0);
109379+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
109380+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
109381 local_set(&cpu_buffer->entries, 0);
109382 local_set(&cpu_buffer->committing, 0);
109383- local_set(&cpu_buffer->commits, 0);
109384+ local_set_unchecked(&cpu_buffer->commits, 0);
109385 cpu_buffer->read = 0;
109386 cpu_buffer->read_bytes = 0;
109387
109388@@ -4592,8 +4592,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
109389 rb_init_page(bpage);
109390 bpage = reader->page;
109391 reader->page = *data_page;
109392- local_set(&reader->write, 0);
109393- local_set(&reader->entries, 0);
109394+ local_set_unchecked(&reader->write, 0);
109395+ local_set_unchecked(&reader->entries, 0);
109396 reader->read = 0;
109397 *data_page = bpage;
109398
109399diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
109400index 0533049..85e27f0 100644
109401--- a/kernel/trace/trace.c
109402+++ b/kernel/trace/trace.c
109403@@ -3538,7 +3538,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
109404 return 0;
109405 }
109406
109407-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
109408+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
109409 {
109410 /* do nothing if flag is already set */
109411 if (!!(trace_flags & mask) == !!enabled)
109412diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
109413index 921691c..64e1da1 100644
109414--- a/kernel/trace/trace.h
109415+++ b/kernel/trace/trace.h
109416@@ -1272,7 +1272,7 @@ extern const char *__stop___tracepoint_str[];
109417 void trace_printk_init_buffers(void);
109418 void trace_printk_start_comm(void);
109419 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
109420-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
109421+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
109422
109423 /*
109424 * Normal trace_printk() and friends allocates special buffers
109425diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
109426index 57b67b1..66082a9 100644
109427--- a/kernel/trace/trace_clock.c
109428+++ b/kernel/trace/trace_clock.c
109429@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
109430 return now;
109431 }
109432
109433-static atomic64_t trace_counter;
109434+static atomic64_unchecked_t trace_counter;
109435
109436 /*
109437 * trace_clock_counter(): simply an atomic counter.
109438@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
109439 */
109440 u64 notrace trace_clock_counter(void)
109441 {
109442- return atomic64_add_return(1, &trace_counter);
109443+ return atomic64_inc_return_unchecked(&trace_counter);
109444 }
109445diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
109446index c4de47f..5f134b8 100644
109447--- a/kernel/trace/trace_events.c
109448+++ b/kernel/trace/trace_events.c
109449@@ -1887,7 +1887,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
109450 return 0;
109451 }
109452
109453-struct ftrace_module_file_ops;
109454 static void __add_event_to_tracers(struct ftrace_event_call *call);
109455
109456 /* Add an additional event_call dynamically */
109457diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
109458index a51e796..1f32ebd 100644
109459--- a/kernel/trace/trace_functions_graph.c
109460+++ b/kernel/trace/trace_functions_graph.c
109461@@ -132,7 +132,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
109462
109463 /* The return trace stack is full */
109464 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
109465- atomic_inc(&current->trace_overrun);
109466+ atomic_inc_unchecked(&current->trace_overrun);
109467 return -EBUSY;
109468 }
109469
109470@@ -229,7 +229,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
109471 *ret = current->ret_stack[index].ret;
109472 trace->func = current->ret_stack[index].func;
109473 trace->calltime = current->ret_stack[index].calltime;
109474- trace->overrun = atomic_read(&current->trace_overrun);
109475+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
109476 trace->depth = index;
109477 }
109478
109479diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
109480index 7a9ba62..2e0e4a1 100644
109481--- a/kernel/trace/trace_mmiotrace.c
109482+++ b/kernel/trace/trace_mmiotrace.c
109483@@ -24,7 +24,7 @@ struct header_iter {
109484 static struct trace_array *mmio_trace_array;
109485 static bool overrun_detected;
109486 static unsigned long prev_overruns;
109487-static atomic_t dropped_count;
109488+static atomic_unchecked_t dropped_count;
109489
109490 static void mmio_reset_data(struct trace_array *tr)
109491 {
109492@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
109493
109494 static unsigned long count_overruns(struct trace_iterator *iter)
109495 {
109496- unsigned long cnt = atomic_xchg(&dropped_count, 0);
109497+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
109498 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
109499
109500 if (over > prev_overruns)
109501@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
109502 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
109503 sizeof(*entry), 0, pc);
109504 if (!event) {
109505- atomic_inc(&dropped_count);
109506+ atomic_inc_unchecked(&dropped_count);
109507 return;
109508 }
109509 entry = ring_buffer_event_data(event);
109510@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
109511 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
109512 sizeof(*entry), 0, pc);
109513 if (!event) {
109514- atomic_inc(&dropped_count);
109515+ atomic_inc_unchecked(&dropped_count);
109516 return;
109517 }
109518 entry = ring_buffer_event_data(event);
109519diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
109520index 25a086b..a918131 100644
109521--- a/kernel/trace/trace_output.c
109522+++ b/kernel/trace/trace_output.c
109523@@ -752,14 +752,16 @@ int register_ftrace_event(struct trace_event *event)
109524 goto out;
109525 }
109526
109527+ pax_open_kernel();
109528 if (event->funcs->trace == NULL)
109529- event->funcs->trace = trace_nop_print;
109530+ *(void **)&event->funcs->trace = trace_nop_print;
109531 if (event->funcs->raw == NULL)
109532- event->funcs->raw = trace_nop_print;
109533+ *(void **)&event->funcs->raw = trace_nop_print;
109534 if (event->funcs->hex == NULL)
109535- event->funcs->hex = trace_nop_print;
109536+ *(void **)&event->funcs->hex = trace_nop_print;
109537 if (event->funcs->binary == NULL)
109538- event->funcs->binary = trace_nop_print;
109539+ *(void **)&event->funcs->binary = trace_nop_print;
109540+ pax_close_kernel();
109541
109542 key = event->type & (EVENT_HASHSIZE - 1);
109543
109544diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
109545index e694c9f..6775a38 100644
109546--- a/kernel/trace/trace_seq.c
109547+++ b/kernel/trace/trace_seq.c
109548@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
109549 return 0;
109550 }
109551
109552- seq_buf_path(&s->seq, path, "\n");
109553+ seq_buf_path(&s->seq, path, "\n\\");
109554
109555 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
109556 s->seq.len = save_len;
109557diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
109558index 3f34496..0492d95 100644
109559--- a/kernel/trace/trace_stack.c
109560+++ b/kernel/trace/trace_stack.c
109561@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
109562 return;
109563
109564 /* we do not handle interrupt stacks yet */
109565- if (!object_is_on_stack(stack))
109566+ if (!object_starts_on_stack(stack))
109567 return;
109568
109569 local_irq_save(flags);
109570diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
109571index f97f6e3..d367b48 100644
109572--- a/kernel/trace/trace_syscalls.c
109573+++ b/kernel/trace/trace_syscalls.c
109574@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
109575 int num;
109576
109577 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109578+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109579+ return -EINVAL;
109580
109581 mutex_lock(&syscall_trace_lock);
109582 if (!sys_perf_refcount_enter)
109583@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
109584 int num;
109585
109586 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109587+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109588+ return;
109589
109590 mutex_lock(&syscall_trace_lock);
109591 sys_perf_refcount_enter--;
109592@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
109593 int num;
109594
109595 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109596+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109597+ return -EINVAL;
109598
109599 mutex_lock(&syscall_trace_lock);
109600 if (!sys_perf_refcount_exit)
109601@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
109602 int num;
109603
109604 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109605+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109606+ return;
109607
109608 mutex_lock(&syscall_trace_lock);
109609 sys_perf_refcount_exit--;
109610diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
109611index 4109f83..fe1f830 100644
109612--- a/kernel/user_namespace.c
109613+++ b/kernel/user_namespace.c
109614@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
109615 !kgid_has_mapping(parent_ns, group))
109616 return -EPERM;
109617
109618+#ifdef CONFIG_GRKERNSEC
109619+ /*
109620+ * This doesn't really inspire confidence:
109621+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
109622+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
109623+ * Increases kernel attack surface in areas developers
109624+ * previously cared little about ("low importance due
109625+ * to requiring "root" capability")
109626+ * To be removed when this code receives *proper* review
109627+ */
109628+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
109629+ !capable(CAP_SETGID))
109630+ return -EPERM;
109631+#endif
109632+
109633 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
109634 if (!ns)
109635 return -ENOMEM;
109636@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
109637 if (atomic_read(&current->mm->mm_users) > 1)
109638 return -EINVAL;
109639
109640- if (current->fs->users != 1)
109641+ if (atomic_read(&current->fs->users) != 1)
109642 return -EINVAL;
109643
109644 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
109645diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
109646index c8eac43..4b5f08f 100644
109647--- a/kernel/utsname_sysctl.c
109648+++ b/kernel/utsname_sysctl.c
109649@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
109650 static int proc_do_uts_string(struct ctl_table *table, int write,
109651 void __user *buffer, size_t *lenp, loff_t *ppos)
109652 {
109653- struct ctl_table uts_table;
109654+ ctl_table_no_const uts_table;
109655 int r;
109656 memcpy(&uts_table, table, sizeof(uts_table));
109657 uts_table.data = get_uts(table, write);
109658diff --git a/kernel/watchdog.c b/kernel/watchdog.c
109659index 581a68a..7ff6a89 100644
109660--- a/kernel/watchdog.c
109661+++ b/kernel/watchdog.c
109662@@ -648,7 +648,7 @@ void watchdog_nmi_enable_all(void) {}
109663 void watchdog_nmi_disable_all(void) {}
109664 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
109665
109666-static struct smp_hotplug_thread watchdog_threads = {
109667+static struct smp_hotplug_thread watchdog_threads __read_only = {
109668 .store = &softlockup_watchdog,
109669 .thread_should_run = watchdog_should_run,
109670 .thread_fn = watchdog,
109671diff --git a/kernel/workqueue.c b/kernel/workqueue.c
109672index 586ad91..5f8844a 100644
109673--- a/kernel/workqueue.c
109674+++ b/kernel/workqueue.c
109675@@ -4428,7 +4428,7 @@ static void rebind_workers(struct worker_pool *pool)
109676 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
109677 worker_flags |= WORKER_REBOUND;
109678 worker_flags &= ~WORKER_UNBOUND;
109679- ACCESS_ONCE(worker->flags) = worker_flags;
109680+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
109681 }
109682
109683 spin_unlock_irq(&pool->lock);
109684diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
109685index ba2b0c8..a571efc 100644
109686--- a/lib/Kconfig.debug
109687+++ b/lib/Kconfig.debug
109688@@ -936,7 +936,7 @@ config DEBUG_MUTEXES
109689
109690 config DEBUG_WW_MUTEX_SLOWPATH
109691 bool "Wait/wound mutex debugging: Slowpath testing"
109692- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109693+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109694 select DEBUG_LOCK_ALLOC
109695 select DEBUG_SPINLOCK
109696 select DEBUG_MUTEXES
109697@@ -953,7 +953,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
109698
109699 config DEBUG_LOCK_ALLOC
109700 bool "Lock debugging: detect incorrect freeing of live locks"
109701- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109702+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109703 select DEBUG_SPINLOCK
109704 select DEBUG_MUTEXES
109705 select LOCKDEP
109706@@ -967,7 +967,7 @@ config DEBUG_LOCK_ALLOC
109707
109708 config PROVE_LOCKING
109709 bool "Lock debugging: prove locking correctness"
109710- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109711+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109712 select LOCKDEP
109713 select DEBUG_SPINLOCK
109714 select DEBUG_MUTEXES
109715@@ -1018,7 +1018,7 @@ config LOCKDEP
109716
109717 config LOCK_STAT
109718 bool "Lock usage statistics"
109719- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109720+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109721 select LOCKDEP
109722 select DEBUG_SPINLOCK
109723 select DEBUG_MUTEXES
109724@@ -1496,6 +1496,7 @@ config LATENCYTOP
109725 depends on DEBUG_KERNEL
109726 depends on STACKTRACE_SUPPORT
109727 depends on PROC_FS
109728+ depends on !GRKERNSEC_HIDESYM
109729 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
109730 select KALLSYMS
109731 select KALLSYMS_ALL
109732@@ -1512,7 +1513,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109733 config DEBUG_STRICT_USER_COPY_CHECKS
109734 bool "Strict user copy size checks"
109735 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109736- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
109737+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
109738 help
109739 Enabling this option turns a certain set of sanity checks for user
109740 copy operations into compile time failures.
109741@@ -1643,7 +1644,7 @@ endmenu # runtime tests
109742
109743 config PROVIDE_OHCI1394_DMA_INIT
109744 bool "Remote debugging over FireWire early on boot"
109745- depends on PCI && X86
109746+ depends on PCI && X86 && !GRKERNSEC
109747 help
109748 If you want to debug problems which hang or crash the kernel early
109749 on boot and the crashing machine has a FireWire port, you can use
109750diff --git a/lib/Makefile b/lib/Makefile
109751index 6c37933..d48e7ca 100644
109752--- a/lib/Makefile
109753+++ b/lib/Makefile
109754@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
109755 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
109756 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
109757 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
109758-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
109759+obj-y += list_debug.o
109760 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
109761
109762 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
109763diff --git a/lib/average.c b/lib/average.c
109764index 114d1be..ab0350c 100644
109765--- a/lib/average.c
109766+++ b/lib/average.c
109767@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
109768 {
109769 unsigned long internal = ACCESS_ONCE(avg->internal);
109770
109771- ACCESS_ONCE(avg->internal) = internal ?
109772+ ACCESS_ONCE_RW(avg->internal) = internal ?
109773 (((internal << avg->weight) - internal) +
109774 (val << avg->factor)) >> avg->weight :
109775 (val << avg->factor);
109776diff --git a/lib/bitmap.c b/lib/bitmap.c
109777index 40162f8..b55c7c7 100644
109778--- a/lib/bitmap.c
109779+++ b/lib/bitmap.c
109780@@ -234,7 +234,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
109781 }
109782 EXPORT_SYMBOL(__bitmap_subset);
109783
109784-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109785+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109786 {
109787 unsigned int k, lim = bits/BITS_PER_LONG;
109788 int w = 0;
109789@@ -361,7 +361,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
109790 {
109791 int c, old_c, totaldigits, ndigits, nchunks, nbits;
109792 u32 chunk;
109793- const char __user __force *ubuf = (const char __user __force *)buf;
109794+ const char __user *ubuf = (const char __force_user *)buf;
109795
109796 bitmap_zero(maskp, nmaskbits);
109797
109798@@ -446,7 +446,7 @@ int bitmap_parse_user(const char __user *ubuf,
109799 {
109800 if (!access_ok(VERIFY_READ, ubuf, ulen))
109801 return -EFAULT;
109802- return __bitmap_parse((const char __force *)ubuf,
109803+ return __bitmap_parse((const char __force_kernel *)ubuf,
109804 ulen, 1, maskp, nmaskbits);
109805
109806 }
109807@@ -505,7 +505,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
109808 {
109809 unsigned a, b;
109810 int c, old_c, totaldigits;
109811- const char __user __force *ubuf = (const char __user __force *)buf;
109812+ const char __user *ubuf = (const char __force_user *)buf;
109813 int at_start, in_range;
109814
109815 totaldigits = c = 0;
109816@@ -601,7 +601,7 @@ int bitmap_parselist_user(const char __user *ubuf,
109817 {
109818 if (!access_ok(VERIFY_READ, ubuf, ulen))
109819 return -EFAULT;
109820- return __bitmap_parselist((const char __force *)ubuf,
109821+ return __bitmap_parselist((const char __force_kernel *)ubuf,
109822 ulen, 1, maskp, nmaskbits);
109823 }
109824 EXPORT_SYMBOL(bitmap_parselist_user);
109825diff --git a/lib/bug.c b/lib/bug.c
109826index 0c3bd95..5a615a1 100644
109827--- a/lib/bug.c
109828+++ b/lib/bug.c
109829@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
109830 return BUG_TRAP_TYPE_NONE;
109831
109832 bug = find_bug(bugaddr);
109833+ if (!bug)
109834+ return BUG_TRAP_TYPE_NONE;
109835
109836 file = NULL;
109837 line = 0;
109838diff --git a/lib/debugobjects.c b/lib/debugobjects.c
109839index 547f7f9..a6d4ba0 100644
109840--- a/lib/debugobjects.c
109841+++ b/lib/debugobjects.c
109842@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
109843 if (limit > 4)
109844 return;
109845
109846- is_on_stack = object_is_on_stack(addr);
109847+ is_on_stack = object_starts_on_stack(addr);
109848 if (is_on_stack == onstack)
109849 return;
109850
109851diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
109852index 6dd0335..1e9c239 100644
109853--- a/lib/decompress_bunzip2.c
109854+++ b/lib/decompress_bunzip2.c
109855@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
109856
109857 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
109858 uncompressed data. Allocate intermediate buffer for block. */
109859- bd->dbufSize = 100000*(i-BZh0);
109860+ i -= BZh0;
109861+ bd->dbufSize = 100000 * i;
109862
109863 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
109864 if (!bd->dbuf)
109865diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
109866index 0be83af..4605e93 100644
109867--- a/lib/decompress_unlzma.c
109868+++ b/lib/decompress_unlzma.c
109869@@ -39,10 +39,10 @@
109870
109871 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
109872
109873-static long long INIT read_int(unsigned char *ptr, int size)
109874+static unsigned long long INIT read_int(unsigned char *ptr, int size)
109875 {
109876 int i;
109877- long long ret = 0;
109878+ unsigned long long ret = 0;
109879
109880 for (i = 0; i < size; i++)
109881 ret = (ret << 8) | ptr[size-i-1];
109882diff --git a/lib/div64.c b/lib/div64.c
109883index 19ea7ed..20cac21 100644
109884--- a/lib/div64.c
109885+++ b/lib/div64.c
109886@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
109887 EXPORT_SYMBOL(__div64_32);
109888
109889 #ifndef div_s64_rem
109890-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
109891+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
109892 {
109893 u64 quotient;
109894
109895@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
109896 * 'http://www.hackersdelight.org/hdcodetxt/divDouble.c.txt'
109897 */
109898 #ifndef div64_u64
109899-u64 div64_u64(u64 dividend, u64 divisor)
109900+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
109901 {
109902 u32 high = divisor >> 32;
109903 u64 quot;
109904diff --git a/lib/dma-debug.c b/lib/dma-debug.c
109905index dace71f..13da37b 100644
109906--- a/lib/dma-debug.c
109907+++ b/lib/dma-debug.c
109908@@ -982,7 +982,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
109909
109910 void dma_debug_add_bus(struct bus_type *bus)
109911 {
109912- struct notifier_block *nb;
109913+ notifier_block_no_const *nb;
109914
109915 if (dma_debug_disabled())
109916 return;
109917@@ -1164,7 +1164,7 @@ static void check_unmap(struct dma_debug_entry *ref)
109918
109919 static void check_for_stack(struct device *dev, void *addr)
109920 {
109921- if (object_is_on_stack(addr))
109922+ if (object_starts_on_stack(addr))
109923 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
109924 "stack [addr=%p]\n", addr);
109925 }
109926diff --git a/lib/inflate.c b/lib/inflate.c
109927index 013a761..c28f3fc 100644
109928--- a/lib/inflate.c
109929+++ b/lib/inflate.c
109930@@ -269,7 +269,7 @@ static void free(void *where)
109931 malloc_ptr = free_mem_ptr;
109932 }
109933 #else
109934-#define malloc(a) kmalloc(a, GFP_KERNEL)
109935+#define malloc(a) kmalloc((a), GFP_KERNEL)
109936 #define free(a) kfree(a)
109937 #endif
109938
109939diff --git a/lib/ioremap.c b/lib/ioremap.c
109940index 86c8911..f5bfc34 100644
109941--- a/lib/ioremap.c
109942+++ b/lib/ioremap.c
109943@@ -75,7 +75,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
109944 unsigned long next;
109945
109946 phys_addr -= addr;
109947- pmd = pmd_alloc(&init_mm, pud, addr);
109948+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
109949 if (!pmd)
109950 return -ENOMEM;
109951 do {
109952@@ -101,7 +101,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
109953 unsigned long next;
109954
109955 phys_addr -= addr;
109956- pud = pud_alloc(&init_mm, pgd, addr);
109957+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
109958 if (!pud)
109959 return -ENOMEM;
109960 do {
109961diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
109962index bd2bea9..6b3c95e 100644
109963--- a/lib/is_single_threaded.c
109964+++ b/lib/is_single_threaded.c
109965@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
109966 struct task_struct *p, *t;
109967 bool ret;
109968
109969+ if (!mm)
109970+ return true;
109971+
109972 if (atomic_read(&task->signal->live) != 1)
109973 return false;
109974
109975diff --git a/lib/kobject.c b/lib/kobject.c
109976index 3b841b9..7c215aa 100644
109977--- a/lib/kobject.c
109978+++ b/lib/kobject.c
109979@@ -340,8 +340,9 @@ error:
109980 }
109981 EXPORT_SYMBOL(kobject_init);
109982
109983-static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
109984- const char *fmt, va_list vargs)
109985+static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
109986+ struct kobject *parent,
109987+ const char *fmt, va_list vargs)
109988 {
109989 int retval;
109990
109991@@ -936,9 +937,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
109992
109993
109994 static DEFINE_SPINLOCK(kobj_ns_type_lock);
109995-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
109996+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
109997
109998-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
109999+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
110000 {
110001 enum kobj_ns_type type = ops->type;
110002 int error;
110003diff --git a/lib/list_debug.c b/lib/list_debug.c
110004index c24c2f7..f0296f4 100644
110005--- a/lib/list_debug.c
110006+++ b/lib/list_debug.c
110007@@ -11,7 +11,9 @@
110008 #include <linux/bug.h>
110009 #include <linux/kernel.h>
110010 #include <linux/rculist.h>
110011+#include <linux/mm.h>
110012
110013+#ifdef CONFIG_DEBUG_LIST
110014 /*
110015 * Insert a new entry between two known consecutive entries.
110016 *
110017@@ -19,21 +21,40 @@
110018 * the prev/next entries already!
110019 */
110020
110021+static bool __list_add_debug(struct list_head *new,
110022+ struct list_head *prev,
110023+ struct list_head *next)
110024+{
110025+ if (unlikely(next->prev != prev)) {
110026+ printk(KERN_ERR "list_add corruption. next->prev should be "
110027+ "prev (%p), but was %p. (next=%p).\n",
110028+ prev, next->prev, next);
110029+ BUG();
110030+ return false;
110031+ }
110032+ if (unlikely(prev->next != next)) {
110033+ printk(KERN_ERR "list_add corruption. prev->next should be "
110034+ "next (%p), but was %p. (prev=%p).\n",
110035+ next, prev->next, prev);
110036+ BUG();
110037+ return false;
110038+ }
110039+ if (unlikely(new == prev || new == next)) {
110040+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
110041+ new, prev, next);
110042+ BUG();
110043+ return false;
110044+ }
110045+ return true;
110046+}
110047+
110048 void __list_add(struct list_head *new,
110049- struct list_head *prev,
110050- struct list_head *next)
110051+ struct list_head *prev,
110052+ struct list_head *next)
110053 {
110054- WARN(next->prev != prev,
110055- "list_add corruption. next->prev should be "
110056- "prev (%p), but was %p. (next=%p).\n",
110057- prev, next->prev, next);
110058- WARN(prev->next != next,
110059- "list_add corruption. prev->next should be "
110060- "next (%p), but was %p. (prev=%p).\n",
110061- next, prev->next, prev);
110062- WARN(new == prev || new == next,
110063- "list_add double add: new=%p, prev=%p, next=%p.\n",
110064- new, prev, next);
110065+ if (!__list_add_debug(new, prev, next))
110066+ return;
110067+
110068 next->prev = new;
110069 new->next = next;
110070 new->prev = prev;
110071@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
110072 }
110073 EXPORT_SYMBOL(__list_add);
110074
110075-void __list_del_entry(struct list_head *entry)
110076+static bool __list_del_entry_debug(struct list_head *entry)
110077 {
110078 struct list_head *prev, *next;
110079
110080 prev = entry->prev;
110081 next = entry->next;
110082
110083- if (WARN(next == LIST_POISON1,
110084- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110085- entry, LIST_POISON1) ||
110086- WARN(prev == LIST_POISON2,
110087- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110088- entry, LIST_POISON2) ||
110089- WARN(prev->next != entry,
110090- "list_del corruption. prev->next should be %p, "
110091- "but was %p\n", entry, prev->next) ||
110092- WARN(next->prev != entry,
110093- "list_del corruption. next->prev should be %p, "
110094- "but was %p\n", entry, next->prev))
110095+ if (unlikely(next == LIST_POISON1)) {
110096+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110097+ entry, LIST_POISON1);
110098+ BUG();
110099+ return false;
110100+ }
110101+ if (unlikely(prev == LIST_POISON2)) {
110102+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110103+ entry, LIST_POISON2);
110104+ BUG();
110105+ return false;
110106+ }
110107+ if (unlikely(entry->prev->next != entry)) {
110108+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
110109+ "but was %p\n", entry, prev->next);
110110+ BUG();
110111+ return false;
110112+ }
110113+ if (unlikely(entry->next->prev != entry)) {
110114+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
110115+ "but was %p\n", entry, next->prev);
110116+ BUG();
110117+ return false;
110118+ }
110119+ return true;
110120+}
110121+
110122+void __list_del_entry(struct list_head *entry)
110123+{
110124+ if (!__list_del_entry_debug(entry))
110125 return;
110126
110127- __list_del(prev, next);
110128+ __list_del(entry->prev, entry->next);
110129 }
110130 EXPORT_SYMBOL(__list_del_entry);
110131
110132@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
110133 void __list_add_rcu(struct list_head *new,
110134 struct list_head *prev, struct list_head *next)
110135 {
110136- WARN(next->prev != prev,
110137- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
110138- prev, next->prev, next);
110139- WARN(prev->next != next,
110140- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
110141- next, prev->next, prev);
110142+ if (!__list_add_debug(new, prev, next))
110143+ return;
110144+
110145 new->next = next;
110146 new->prev = prev;
110147 rcu_assign_pointer(list_next_rcu(prev), new);
110148 next->prev = new;
110149 }
110150 EXPORT_SYMBOL(__list_add_rcu);
110151+#endif
110152+
110153+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
110154+{
110155+#ifdef CONFIG_DEBUG_LIST
110156+ if (!__list_add_debug(new, prev, next))
110157+ return;
110158+#endif
110159+
110160+ pax_open_kernel();
110161+ next->prev = new;
110162+ new->next = next;
110163+ new->prev = prev;
110164+ prev->next = new;
110165+ pax_close_kernel();
110166+}
110167+EXPORT_SYMBOL(__pax_list_add);
110168+
110169+void pax_list_del(struct list_head *entry)
110170+{
110171+#ifdef CONFIG_DEBUG_LIST
110172+ if (!__list_del_entry_debug(entry))
110173+ return;
110174+#endif
110175+
110176+ pax_open_kernel();
110177+ __list_del(entry->prev, entry->next);
110178+ entry->next = LIST_POISON1;
110179+ entry->prev = LIST_POISON2;
110180+ pax_close_kernel();
110181+}
110182+EXPORT_SYMBOL(pax_list_del);
110183+
110184+void pax_list_del_init(struct list_head *entry)
110185+{
110186+ pax_open_kernel();
110187+ __list_del(entry->prev, entry->next);
110188+ INIT_LIST_HEAD(entry);
110189+ pax_close_kernel();
110190+}
110191+EXPORT_SYMBOL(pax_list_del_init);
110192+
110193+void __pax_list_add_rcu(struct list_head *new,
110194+ struct list_head *prev, struct list_head *next)
110195+{
110196+#ifdef CONFIG_DEBUG_LIST
110197+ if (!__list_add_debug(new, prev, next))
110198+ return;
110199+#endif
110200+
110201+ pax_open_kernel();
110202+ new->next = next;
110203+ new->prev = prev;
110204+ rcu_assign_pointer(list_next_rcu(prev), new);
110205+ next->prev = new;
110206+ pax_close_kernel();
110207+}
110208+EXPORT_SYMBOL(__pax_list_add_rcu);
110209+
110210+void pax_list_del_rcu(struct list_head *entry)
110211+{
110212+#ifdef CONFIG_DEBUG_LIST
110213+ if (!__list_del_entry_debug(entry))
110214+ return;
110215+#endif
110216+
110217+ pax_open_kernel();
110218+ __list_del(entry->prev, entry->next);
110219+ entry->next = LIST_POISON1;
110220+ entry->prev = LIST_POISON2;
110221+ pax_close_kernel();
110222+}
110223+EXPORT_SYMBOL(pax_list_del_rcu);
110224diff --git a/lib/lockref.c b/lib/lockref.c
110225index 494994b..65caf94 100644
110226--- a/lib/lockref.c
110227+++ b/lib/lockref.c
110228@@ -48,13 +48,13 @@
110229 void lockref_get(struct lockref *lockref)
110230 {
110231 CMPXCHG_LOOP(
110232- new.count++;
110233+ __lockref_inc(&new);
110234 ,
110235 return;
110236 );
110237
110238 spin_lock(&lockref->lock);
110239- lockref->count++;
110240+ __lockref_inc(lockref);
110241 spin_unlock(&lockref->lock);
110242 }
110243 EXPORT_SYMBOL(lockref_get);
110244@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110245 int retval;
110246
110247 CMPXCHG_LOOP(
110248- new.count++;
110249- if (old.count <= 0)
110250+ __lockref_inc(&new);
110251+ if (__lockref_read(&old) <= 0)
110252 return 0;
110253 ,
110254 return 1;
110255@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110256
110257 spin_lock(&lockref->lock);
110258 retval = 0;
110259- if (lockref->count > 0) {
110260- lockref->count++;
110261+ if (__lockref_read(lockref) > 0) {
110262+ __lockref_inc(lockref);
110263 retval = 1;
110264 }
110265 spin_unlock(&lockref->lock);
110266@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
110267 int lockref_get_or_lock(struct lockref *lockref)
110268 {
110269 CMPXCHG_LOOP(
110270- new.count++;
110271- if (old.count <= 0)
110272+ __lockref_inc(&new);
110273+ if (__lockref_read(&old) <= 0)
110274 break;
110275 ,
110276 return 1;
110277 );
110278
110279 spin_lock(&lockref->lock);
110280- if (lockref->count <= 0)
110281+ if (__lockref_read(lockref) <= 0)
110282 return 0;
110283- lockref->count++;
110284+ __lockref_inc(lockref);
110285 spin_unlock(&lockref->lock);
110286 return 1;
110287 }
110288@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
110289 int lockref_put_return(struct lockref *lockref)
110290 {
110291 CMPXCHG_LOOP(
110292- new.count--;
110293- if (old.count <= 0)
110294+ __lockref_dec(&new);
110295+ if (__lockref_read(&old) <= 0)
110296 return -1;
110297 ,
110298- return new.count;
110299+ return __lockref_read(&new);
110300 );
110301 return -1;
110302 }
110303@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
110304 int lockref_put_or_lock(struct lockref *lockref)
110305 {
110306 CMPXCHG_LOOP(
110307- new.count--;
110308- if (old.count <= 1)
110309+ __lockref_dec(&new);
110310+ if (__lockref_read(&old) <= 1)
110311 break;
110312 ,
110313 return 1;
110314 );
110315
110316 spin_lock(&lockref->lock);
110317- if (lockref->count <= 1)
110318+ if (__lockref_read(lockref) <= 1)
110319 return 0;
110320- lockref->count--;
110321+ __lockref_dec(lockref);
110322 spin_unlock(&lockref->lock);
110323 return 1;
110324 }
110325@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
110326 void lockref_mark_dead(struct lockref *lockref)
110327 {
110328 assert_spin_locked(&lockref->lock);
110329- lockref->count = -128;
110330+ __lockref_set(lockref, -128);
110331 }
110332 EXPORT_SYMBOL(lockref_mark_dead);
110333
110334@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110335 int retval;
110336
110337 CMPXCHG_LOOP(
110338- new.count++;
110339- if (old.count < 0)
110340+ __lockref_inc(&new);
110341+ if (__lockref_read(&old) < 0)
110342 return 0;
110343 ,
110344 return 1;
110345@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110346
110347 spin_lock(&lockref->lock);
110348 retval = 0;
110349- if (lockref->count >= 0) {
110350- lockref->count++;
110351+ if (__lockref_read(lockref) >= 0) {
110352+ __lockref_inc(lockref);
110353 retval = 1;
110354 }
110355 spin_unlock(&lockref->lock);
110356diff --git a/lib/nlattr.c b/lib/nlattr.c
110357index f5907d2..36072be 100644
110358--- a/lib/nlattr.c
110359+++ b/lib/nlattr.c
110360@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
110361 {
110362 int minlen = min_t(int, count, nla_len(src));
110363
110364+ BUG_ON(minlen < 0);
110365+
110366 memcpy(dest, nla_data(src), minlen);
110367 if (count > minlen)
110368 memset(dest + minlen, 0, count - minlen);
110369diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
110370index 6111bcb..02e816b 100644
110371--- a/lib/percpu-refcount.c
110372+++ b/lib/percpu-refcount.c
110373@@ -31,7 +31,7 @@
110374 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
110375 */
110376
110377-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
110378+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
110379
110380 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
110381
110382diff --git a/lib/radix-tree.c b/lib/radix-tree.c
110383index 3d2aa27..a472f20 100644
110384--- a/lib/radix-tree.c
110385+++ b/lib/radix-tree.c
110386@@ -67,7 +67,7 @@ struct radix_tree_preload {
110387 int nr;
110388 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
110389 };
110390-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
110391+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
110392
110393 static inline void *ptr_to_indirect(void *ptr)
110394 {
110395diff --git a/lib/random32.c b/lib/random32.c
110396index 0bee183..526f12f 100644
110397--- a/lib/random32.c
110398+++ b/lib/random32.c
110399@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
110400 }
110401 #endif
110402
110403-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
110404+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
110405
110406 /**
110407 * prandom_u32_state - seeded pseudo-random number generator.
110408diff --git a/lib/rbtree.c b/lib/rbtree.c
110409index c16c81a..4dcbda1 100644
110410--- a/lib/rbtree.c
110411+++ b/lib/rbtree.c
110412@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
110413 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
110414
110415 static const struct rb_augment_callbacks dummy_callbacks = {
110416- dummy_propagate, dummy_copy, dummy_rotate
110417+ .propagate = dummy_propagate,
110418+ .copy = dummy_copy,
110419+ .rotate = dummy_rotate
110420 };
110421
110422 void rb_insert_color(struct rb_node *node, struct rb_root *root)
110423diff --git a/lib/show_mem.c b/lib/show_mem.c
110424index adc98e18..0ce83c2 100644
110425--- a/lib/show_mem.c
110426+++ b/lib/show_mem.c
110427@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
110428 quicklist_total_size());
110429 #endif
110430 #ifdef CONFIG_MEMORY_FAILURE
110431- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
110432+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
110433 #endif
110434 }
110435diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
110436index e0af6ff..fcc9f15 100644
110437--- a/lib/strncpy_from_user.c
110438+++ b/lib/strncpy_from_user.c
110439@@ -22,7 +22,7 @@
110440 */
110441 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
110442 {
110443- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110444+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110445 long res = 0;
110446
110447 /*
110448diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
110449index fe9a325..85cd8aa 100644
110450--- a/lib/strnlen_user.c
110451+++ b/lib/strnlen_user.c
110452@@ -26,7 +26,7 @@
110453 */
110454 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
110455 {
110456- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110457+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110458 long align, res = 0;
110459 unsigned long c;
110460
110461diff --git a/lib/swiotlb.c b/lib/swiotlb.c
110462index 3c365ab..75b43df 100644
110463--- a/lib/swiotlb.c
110464+++ b/lib/swiotlb.c
110465@@ -683,7 +683,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
110466
110467 void
110468 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
110469- dma_addr_t dev_addr)
110470+ dma_addr_t dev_addr, struct dma_attrs *attrs)
110471 {
110472 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
110473
110474diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
110475index c227cc4..5241df3 100644
110476--- a/lib/test-hexdump.c
110477+++ b/lib/test-hexdump.c
110478@@ -25,19 +25,19 @@ static const char * const test_data_1_le[] __initconst = {
110479 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
110480 };
110481
110482-static const char *test_data_2_le[] __initdata = {
110483+static const char * const test_data_2_le[] __initconst = {
110484 "32be", "7bdb", "180a", "b293",
110485 "ba70", "24c4", "837d", "9b34",
110486 "9ca6", "ad31", "0f9c", "e9ac",
110487 "d14c", "9919", "b143", "0caf",
110488 };
110489
110490-static const char *test_data_4_le[] __initdata = {
110491+static const char * const test_data_4_le[] __initconst = {
110492 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
110493 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
110494 };
110495
110496-static const char *test_data_8_le[] __initdata = {
110497+static const char * const test_data_8_le[] __initconst = {
110498 "b293180a7bdb32be", "9b34837d24c4ba70",
110499 "e9ac0f9cad319ca6", "0cafb1439919d14c",
110500 };
110501diff --git a/lib/usercopy.c b/lib/usercopy.c
110502index 4f5b1dd..7cab418 100644
110503--- a/lib/usercopy.c
110504+++ b/lib/usercopy.c
110505@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
110506 WARN(1, "Buffer overflow detected!\n");
110507 }
110508 EXPORT_SYMBOL(copy_from_user_overflow);
110509+
110510+void copy_to_user_overflow(void)
110511+{
110512+ WARN(1, "Buffer overflow detected!\n");
110513+}
110514+EXPORT_SYMBOL(copy_to_user_overflow);
110515diff --git a/lib/vsprintf.c b/lib/vsprintf.c
110516index da39c60..ac91239 100644
110517--- a/lib/vsprintf.c
110518+++ b/lib/vsprintf.c
110519@@ -16,6 +16,9 @@
110520 * - scnprintf and vscnprintf
110521 */
110522
110523+#ifdef CONFIG_GRKERNSEC_HIDESYM
110524+#define __INCLUDED_BY_HIDESYM 1
110525+#endif
110526 #include <stdarg.h>
110527 #include <linux/clk-provider.h>
110528 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
110529@@ -628,7 +631,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
110530 #ifdef CONFIG_KALLSYMS
110531 if (*fmt == 'B')
110532 sprint_backtrace(sym, value);
110533- else if (*fmt != 'f' && *fmt != 's')
110534+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
110535 sprint_symbol(sym, value);
110536 else
110537 sprint_symbol_no_offset(sym, value);
110538@@ -1360,7 +1363,11 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
110539 }
110540 }
110541
110542-int kptr_restrict __read_mostly;
110543+#ifdef CONFIG_GRKERNSEC_HIDESYM
110544+int kptr_restrict __read_only = 2;
110545+#else
110546+int kptr_restrict __read_only;
110547+#endif
110548
110549 /*
110550 * Show a '%p' thing. A kernel extension is that the '%p' is followed
110551@@ -1371,8 +1378,10 @@ int kptr_restrict __read_mostly;
110552 *
110553 * - 'F' For symbolic function descriptor pointers with offset
110554 * - 'f' For simple symbolic function names without offset
110555+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
110556 * - 'S' For symbolic direct pointers with offset
110557 * - 's' For symbolic direct pointers without offset
110558+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
110559 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
110560 * - 'B' For backtraced symbolic direct pointers with offset
110561 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
110562@@ -1460,12 +1469,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110563
110564 if (!ptr && *fmt != 'K') {
110565 /*
110566- * Print (null) with the same width as a pointer so it makes
110567+ * Print (nil) with the same width as a pointer so it makes
110568 * tabular output look nice.
110569 */
110570 if (spec.field_width == -1)
110571 spec.field_width = default_width;
110572- return string(buf, end, "(null)", spec);
110573+ return string(buf, end, "(nil)", spec);
110574 }
110575
110576 switch (*fmt) {
110577@@ -1475,6 +1484,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110578 /* Fallthrough */
110579 case 'S':
110580 case 's':
110581+#ifdef CONFIG_GRKERNSEC_HIDESYM
110582+ break;
110583+#else
110584+ return symbol_string(buf, end, ptr, spec, fmt);
110585+#endif
110586+ case 'X':
110587+ ptr = dereference_function_descriptor(ptr);
110588+ case 'A':
110589 case 'B':
110590 return symbol_string(buf, end, ptr, spec, fmt);
110591 case 'R':
110592@@ -1539,6 +1556,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110593 va_end(va);
110594 return buf;
110595 }
110596+ case 'P':
110597+ break;
110598 case 'K':
110599 /*
110600 * %pK cannot be used in IRQ context because its test
110601@@ -1598,6 +1617,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110602 ((const struct file *)ptr)->f_path.dentry,
110603 spec, fmt);
110604 }
110605+
110606+#ifdef CONFIG_GRKERNSEC_HIDESYM
110607+ /* 'P' = approved pointers to copy to userland,
110608+ as in the /proc/kallsyms case, as we make it display nothing
110609+ for non-root users, and the real contents for root users
110610+ 'X' = approved simple symbols
110611+ Also ignore 'K' pointers, since we force their NULLing for non-root users
110612+ above
110613+ */
110614+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
110615+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
110616+ dump_stack();
110617+ ptr = NULL;
110618+ }
110619+#endif
110620+
110621 spec.flags |= SMALL;
110622 if (spec.field_width == -1) {
110623 spec.field_width = default_width;
110624@@ -2296,11 +2331,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110625 typeof(type) value; \
110626 if (sizeof(type) == 8) { \
110627 args = PTR_ALIGN(args, sizeof(u32)); \
110628- *(u32 *)&value = *(u32 *)args; \
110629- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
110630+ *(u32 *)&value = *(const u32 *)args; \
110631+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
110632 } else { \
110633 args = PTR_ALIGN(args, sizeof(type)); \
110634- value = *(typeof(type) *)args; \
110635+ value = *(const typeof(type) *)args; \
110636 } \
110637 args += sizeof(type); \
110638 value; \
110639@@ -2363,7 +2398,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110640 case FORMAT_TYPE_STR: {
110641 const char *str_arg = args;
110642 args += strlen(str_arg) + 1;
110643- str = string(str, end, (char *)str_arg, spec);
110644+ str = string(str, end, str_arg, spec);
110645 break;
110646 }
110647
110648diff --git a/localversion-grsec b/localversion-grsec
110649new file mode 100644
110650index 0000000..7cd6065
110651--- /dev/null
110652+++ b/localversion-grsec
110653@@ -0,0 +1 @@
110654+-grsec
110655diff --git a/mm/Kconfig b/mm/Kconfig
110656index 390214d..f96e3b8 100644
110657--- a/mm/Kconfig
110658+++ b/mm/Kconfig
110659@@ -342,10 +342,11 @@ config KSM
110660 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
110661
110662 config DEFAULT_MMAP_MIN_ADDR
110663- int "Low address space to protect from user allocation"
110664+ int "Low address space to protect from user allocation"
110665 depends on MMU
110666- default 4096
110667- help
110668+ default 32768 if ALPHA || ARM || PARISC || SPARC32
110669+ default 65536
110670+ help
110671 This is the portion of low virtual memory which should be protected
110672 from userspace allocation. Keeping a user from writing to low pages
110673 can help reduce the impact of kernel NULL pointer bugs.
110674@@ -376,7 +377,7 @@ config MEMORY_FAILURE
110675
110676 config HWPOISON_INJECT
110677 tristate "HWPoison pages injector"
110678- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
110679+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
110680 select PROC_PAGE_MONITOR
110681
110682 config NOMMU_INITIAL_TRIM_EXCESS
110683diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
110684index 957d3da..1d34e20 100644
110685--- a/mm/Kconfig.debug
110686+++ b/mm/Kconfig.debug
110687@@ -10,6 +10,7 @@ config PAGE_EXTENSION
110688 config DEBUG_PAGEALLOC
110689 bool "Debug page memory allocations"
110690 depends on DEBUG_KERNEL
110691+ depends on !PAX_MEMORY_SANITIZE
110692 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
110693 depends on !KMEMCHECK
110694 select PAGE_EXTENSION
110695diff --git a/mm/backing-dev.c b/mm/backing-dev.c
110696index 000e7b3..aad2605 100644
110697--- a/mm/backing-dev.c
110698+++ b/mm/backing-dev.c
110699@@ -12,7 +12,7 @@
110700 #include <linux/device.h>
110701 #include <trace/events/writeback.h>
110702
110703-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
110704+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
110705
110706 struct backing_dev_info noop_backing_dev_info = {
110707 .name = "noop",
110708@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
110709 return err;
110710
110711 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
110712- atomic_long_inc_return(&bdi_seq));
110713+ atomic_long_inc_return_unchecked(&bdi_seq));
110714 if (err) {
110715 bdi_destroy(bdi);
110716 return err;
110717diff --git a/mm/cma_debug.c b/mm/cma_debug.c
110718index 7621ee3..f8e4b60 100644
110719--- a/mm/cma_debug.c
110720+++ b/mm/cma_debug.c
110721@@ -39,7 +39,7 @@ static int cma_used_get(void *data, u64 *val)
110722
110723 mutex_lock(&cma->lock);
110724 /* pages counter is smaller than sizeof(int) */
110725- used = bitmap_weight(cma->bitmap, (int)cma->count);
110726+ used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma));
110727 mutex_unlock(&cma->lock);
110728 *val = (u64)used << cma->order_per_bit;
110729
110730@@ -52,13 +52,14 @@ static int cma_maxchunk_get(void *data, u64 *val)
110731 struct cma *cma = data;
110732 unsigned long maxchunk = 0;
110733 unsigned long start, end = 0;
110734+ unsigned long bitmap_maxno = cma_bitmap_maxno(cma);
110735
110736 mutex_lock(&cma->lock);
110737 for (;;) {
110738- start = find_next_zero_bit(cma->bitmap, cma->count, end);
110739+ start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end);
110740 if (start >= cma->count)
110741 break;
110742- end = find_next_bit(cma->bitmap, cma->count, start);
110743+ end = find_next_bit(cma->bitmap, bitmap_maxno, start);
110744 maxchunk = max(end - start, maxchunk);
110745 }
110746 mutex_unlock(&cma->lock);
110747@@ -170,10 +171,10 @@ static void cma_debugfs_add_one(struct cma *cma, int idx)
110748
110749 tmp = debugfs_create_dir(name, cma_debugfs_root);
110750
110751- debugfs_create_file("alloc", S_IWUSR, cma_debugfs_root, cma,
110752+ debugfs_create_file("alloc", S_IWUSR, tmp, cma,
110753 &cma_alloc_fops);
110754
110755- debugfs_create_file("free", S_IWUSR, cma_debugfs_root, cma,
110756+ debugfs_create_file("free", S_IWUSR, tmp, cma,
110757 &cma_free_fops);
110758
110759 debugfs_create_file("base_pfn", S_IRUGO, tmp,
110760diff --git a/mm/filemap.c b/mm/filemap.c
110761index 6bf5e42..1e631ee 100644
110762--- a/mm/filemap.c
110763+++ b/mm/filemap.c
110764@@ -2095,7 +2095,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
110765 struct address_space *mapping = file->f_mapping;
110766
110767 if (!mapping->a_ops->readpage)
110768- return -ENOEXEC;
110769+ return -ENODEV;
110770 file_accessed(file);
110771 vma->vm_ops = &generic_file_vm_ops;
110772 return 0;
110773@@ -2276,6 +2276,7 @@ inline ssize_t generic_write_checks(struct kiocb *iocb, struct iov_iter *from)
110774 pos = iocb->ki_pos;
110775
110776 if (limit != RLIM_INFINITY) {
110777+ gr_learn_resource(current, RLIMIT_FSIZE, iocb->ki_pos, 0);
110778 if (iocb->ki_pos >= limit) {
110779 send_sig(SIGXFSZ, current, 0);
110780 return -EFBIG;
110781diff --git a/mm/gup.c b/mm/gup.c
110782index 6297f6b..7652403 100644
110783--- a/mm/gup.c
110784+++ b/mm/gup.c
110785@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
110786 unsigned int fault_flags = 0;
110787 int ret;
110788
110789- /* For mm_populate(), just skip the stack guard page. */
110790- if ((*flags & FOLL_POPULATE) &&
110791- (stack_guard_page_start(vma, address) ||
110792- stack_guard_page_end(vma, address + PAGE_SIZE)))
110793- return -ENOENT;
110794 if (*flags & FOLL_WRITE)
110795 fault_flags |= FAULT_FLAG_WRITE;
110796 if (nonblocking)
110797@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110798 if (!(gup_flags & FOLL_FORCE))
110799 gup_flags |= FOLL_NUMA;
110800
110801- do {
110802+ while (nr_pages) {
110803 struct page *page;
110804 unsigned int foll_flags = gup_flags;
110805 unsigned int page_increm;
110806
110807 /* first iteration or cross vma bound */
110808 if (!vma || start >= vma->vm_end) {
110809- vma = find_extend_vma(mm, start);
110810+ vma = find_vma(mm, start);
110811 if (!vma && in_gate_area(mm, start)) {
110812 int ret;
110813 ret = get_gate_page(mm, start & PAGE_MASK,
110814@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110815 goto next_page;
110816 }
110817
110818- if (!vma || check_vma_flags(vma, gup_flags))
110819+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
110820 return i ? : -EFAULT;
110821 if (is_vm_hugetlb_page(vma)) {
110822 i = follow_hugetlb_page(mm, vma, pages, vmas,
110823@@ -509,7 +504,7 @@ next_page:
110824 i += page_increm;
110825 start += page_increm * PAGE_SIZE;
110826 nr_pages -= page_increm;
110827- } while (nr_pages);
110828+ }
110829 return i;
110830 }
110831 EXPORT_SYMBOL(__get_user_pages);
110832diff --git a/mm/highmem.c b/mm/highmem.c
110833index 123bcd3..0de52ba 100644
110834--- a/mm/highmem.c
110835+++ b/mm/highmem.c
110836@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
110837 * So no dangers, even with speculative execution.
110838 */
110839 page = pte_page(pkmap_page_table[i]);
110840+ pax_open_kernel();
110841 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
110842-
110843+ pax_close_kernel();
110844 set_page_address(page, NULL);
110845 need_flush = 1;
110846 }
110847@@ -259,9 +260,11 @@ start:
110848 }
110849 }
110850 vaddr = PKMAP_ADDR(last_pkmap_nr);
110851+
110852+ pax_open_kernel();
110853 set_pte_at(&init_mm, vaddr,
110854 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
110855-
110856+ pax_close_kernel();
110857 pkmap_count[last_pkmap_nr] = 1;
110858 set_page_address(page, (void *)vaddr);
110859
110860diff --git a/mm/hugetlb.c b/mm/hugetlb.c
110861index 8c4c1f9..7019e3d 100644
110862--- a/mm/hugetlb.c
110863+++ b/mm/hugetlb.c
110864@@ -2365,6 +2365,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110865 struct ctl_table *table, int write,
110866 void __user *buffer, size_t *length, loff_t *ppos)
110867 {
110868+ ctl_table_no_const t;
110869 struct hstate *h = &default_hstate;
110870 unsigned long tmp = h->max_huge_pages;
110871 int ret;
110872@@ -2372,9 +2373,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110873 if (!hugepages_supported())
110874 return -ENOTSUPP;
110875
110876- table->data = &tmp;
110877- table->maxlen = sizeof(unsigned long);
110878- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
110879+ t = *table;
110880+ t.data = &tmp;
110881+ t.maxlen = sizeof(unsigned long);
110882+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
110883 if (ret)
110884 goto out;
110885
110886@@ -2409,6 +2411,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
110887 struct hstate *h = &default_hstate;
110888 unsigned long tmp;
110889 int ret;
110890+ ctl_table_no_const hugetlb_table;
110891
110892 if (!hugepages_supported())
110893 return -ENOTSUPP;
110894@@ -2418,9 +2421,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
110895 if (write && hstate_is_gigantic(h))
110896 return -EINVAL;
110897
110898- table->data = &tmp;
110899- table->maxlen = sizeof(unsigned long);
110900- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
110901+ hugetlb_table = *table;
110902+ hugetlb_table.data = &tmp;
110903+ hugetlb_table.maxlen = sizeof(unsigned long);
110904+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
110905 if (ret)
110906 goto out;
110907
110908@@ -2910,6 +2914,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
110909 i_mmap_unlock_write(mapping);
110910 }
110911
110912+#ifdef CONFIG_PAX_SEGMEXEC
110913+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
110914+{
110915+ struct mm_struct *mm = vma->vm_mm;
110916+ struct vm_area_struct *vma_m;
110917+ unsigned long address_m;
110918+ pte_t *ptep_m;
110919+
110920+ vma_m = pax_find_mirror_vma(vma);
110921+ if (!vma_m)
110922+ return;
110923+
110924+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
110925+ address_m = address + SEGMEXEC_TASK_SIZE;
110926+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
110927+ get_page(page_m);
110928+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
110929+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
110930+}
110931+#endif
110932+
110933 /*
110934 * Hugetlb_cow() should be called with page lock of the original hugepage held.
110935 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
110936@@ -3023,6 +3048,11 @@ retry_avoidcopy:
110937 make_huge_pte(vma, new_page, 1));
110938 page_remove_rmap(old_page);
110939 hugepage_add_new_anon_rmap(new_page, vma, address);
110940+
110941+#ifdef CONFIG_PAX_SEGMEXEC
110942+ pax_mirror_huge_pte(vma, address, new_page);
110943+#endif
110944+
110945 /* Make the old page be freed below */
110946 new_page = old_page;
110947 }
110948@@ -3184,6 +3214,10 @@ retry:
110949 && (vma->vm_flags & VM_SHARED)));
110950 set_huge_pte_at(mm, address, ptep, new_pte);
110951
110952+#ifdef CONFIG_PAX_SEGMEXEC
110953+ pax_mirror_huge_pte(vma, address, page);
110954+#endif
110955+
110956 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
110957 /* Optimization, do the COW without a second fault */
110958 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
110959@@ -3251,6 +3285,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
110960 struct address_space *mapping;
110961 int need_wait_lock = 0;
110962
110963+#ifdef CONFIG_PAX_SEGMEXEC
110964+ struct vm_area_struct *vma_m;
110965+#endif
110966+
110967 address &= huge_page_mask(h);
110968
110969 ptep = huge_pte_offset(mm, address);
110970@@ -3264,6 +3302,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
110971 VM_FAULT_SET_HINDEX(hstate_index(h));
110972 }
110973
110974+#ifdef CONFIG_PAX_SEGMEXEC
110975+ vma_m = pax_find_mirror_vma(vma);
110976+ if (vma_m) {
110977+ unsigned long address_m;
110978+
110979+ if (vma->vm_start > vma_m->vm_start) {
110980+ address_m = address;
110981+ address -= SEGMEXEC_TASK_SIZE;
110982+ vma = vma_m;
110983+ h = hstate_vma(vma);
110984+ } else
110985+ address_m = address + SEGMEXEC_TASK_SIZE;
110986+
110987+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
110988+ return VM_FAULT_OOM;
110989+ address_m &= HPAGE_MASK;
110990+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
110991+ }
110992+#endif
110993+
110994 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
110995 if (!ptep)
110996 return VM_FAULT_OOM;
110997diff --git a/mm/internal.h b/mm/internal.h
110998index a25e359..e2c96e9 100644
110999--- a/mm/internal.h
111000+++ b/mm/internal.h
111001@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
111002
111003 extern int __isolate_free_page(struct page *page, unsigned int order);
111004 extern void __free_pages_bootmem(struct page *page, unsigned int order);
111005+extern void free_compound_page(struct page *page);
111006 extern void prep_compound_page(struct page *page, unsigned long order);
111007 #ifdef CONFIG_MEMORY_FAILURE
111008 extern bool is_free_buddy_page(struct page *page);
111009@@ -413,7 +414,7 @@ extern u32 hwpoison_filter_enable;
111010
111011 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
111012 unsigned long, unsigned long,
111013- unsigned long, unsigned long);
111014+ unsigned long, unsigned long) __intentional_overflow(-1);
111015
111016 extern void set_pageblock_order(void);
111017 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
111018diff --git a/mm/kmemleak.c b/mm/kmemleak.c
111019index 3716cdb..25b97dc 100644
111020--- a/mm/kmemleak.c
111021+++ b/mm/kmemleak.c
111022@@ -368,7 +368,7 @@ static void print_unreferenced(struct seq_file *seq,
111023
111024 for (i = 0; i < object->trace_len; i++) {
111025 void *ptr = (void *)object->trace[i];
111026- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
111027+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
111028 }
111029 }
111030
111031@@ -1926,7 +1926,7 @@ static int __init kmemleak_late_init(void)
111032 return -ENOMEM;
111033 }
111034
111035- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
111036+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
111037 &kmemleak_fops);
111038 if (!dentry)
111039 pr_warning("Failed to create the debugfs kmemleak file\n");
111040diff --git a/mm/maccess.c b/mm/maccess.c
111041index d53adf9..03a24bf 100644
111042--- a/mm/maccess.c
111043+++ b/mm/maccess.c
111044@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
111045 set_fs(KERNEL_DS);
111046 pagefault_disable();
111047 ret = __copy_from_user_inatomic(dst,
111048- (__force const void __user *)src, size);
111049+ (const void __force_user *)src, size);
111050 pagefault_enable();
111051 set_fs(old_fs);
111052
111053@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
111054
111055 set_fs(KERNEL_DS);
111056 pagefault_disable();
111057- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
111058+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
111059 pagefault_enable();
111060 set_fs(old_fs);
111061
111062diff --git a/mm/madvise.c b/mm/madvise.c
111063index d551475..8fdd7f3 100644
111064--- a/mm/madvise.c
111065+++ b/mm/madvise.c
111066@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
111067 pgoff_t pgoff;
111068 unsigned long new_flags = vma->vm_flags;
111069
111070+#ifdef CONFIG_PAX_SEGMEXEC
111071+ struct vm_area_struct *vma_m;
111072+#endif
111073+
111074 switch (behavior) {
111075 case MADV_NORMAL:
111076 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
111077@@ -126,6 +130,13 @@ success:
111078 /*
111079 * vm_flags is protected by the mmap_sem held in write mode.
111080 */
111081+
111082+#ifdef CONFIG_PAX_SEGMEXEC
111083+ vma_m = pax_find_mirror_vma(vma);
111084+ if (vma_m)
111085+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
111086+#endif
111087+
111088 vma->vm_flags = new_flags;
111089
111090 out:
111091@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
111092 struct vm_area_struct **prev,
111093 unsigned long start, unsigned long end)
111094 {
111095+
111096+#ifdef CONFIG_PAX_SEGMEXEC
111097+ struct vm_area_struct *vma_m;
111098+#endif
111099+
111100 *prev = vma;
111101 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111102 return -EINVAL;
111103
111104 zap_page_range(vma, start, end - start, NULL);
111105+
111106+#ifdef CONFIG_PAX_SEGMEXEC
111107+ vma_m = pax_find_mirror_vma(vma);
111108+ if (vma_m) {
111109+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111110+ return -EINVAL;
111111+
111112+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
111113+ }
111114+#endif
111115+
111116 return 0;
111117 }
111118
111119@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
111120 if (end < start)
111121 return error;
111122
111123+#ifdef CONFIG_PAX_SEGMEXEC
111124+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
111125+ if (end > SEGMEXEC_TASK_SIZE)
111126+ return error;
111127+ } else
111128+#endif
111129+
111130+ if (end > TASK_SIZE)
111131+ return error;
111132+
111133 error = 0;
111134 if (end == start)
111135 return error;
111136diff --git a/mm/memory-failure.c b/mm/memory-failure.c
111137index 9f48145..60a2ac1 100644
111138--- a/mm/memory-failure.c
111139+++ b/mm/memory-failure.c
111140@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
111141
111142 int sysctl_memory_failure_recovery __read_mostly = 1;
111143
111144-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111145+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111146
111147 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
111148
111149@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
111150 pfn, t->comm, t->pid);
111151 si.si_signo = SIGBUS;
111152 si.si_errno = 0;
111153- si.si_addr = (void *)addr;
111154+ si.si_addr = (void __user *)addr;
111155 #ifdef __ARCH_SI_TRAPNO
111156 si.si_trapno = trapno;
111157 #endif
111158@@ -825,7 +825,7 @@ static struct page_state {
111159 unsigned long res;
111160 enum action_page_type type;
111161 int (*action)(struct page *p, unsigned long pfn);
111162-} error_states[] = {
111163+} __do_const error_states[] = {
111164 { reserved, reserved, MSG_KERNEL, me_kernel },
111165 /*
111166 * free pages are specially detected outside this table:
111167@@ -1133,7 +1133,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111168 nr_pages = 1 << compound_order(hpage);
111169 else /* normal page or thp */
111170 nr_pages = 1;
111171- atomic_long_add(nr_pages, &num_poisoned_pages);
111172+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
111173
111174 /*
111175 * We need/can do nothing about count=0 pages.
111176@@ -1162,7 +1162,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111177 if (PageHWPoison(hpage)) {
111178 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
111179 || (p != hpage && TestSetPageHWPoison(hpage))) {
111180- atomic_long_sub(nr_pages, &num_poisoned_pages);
111181+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111182 unlock_page(hpage);
111183 return 0;
111184 }
111185@@ -1231,14 +1231,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111186 */
111187 if (!PageHWPoison(p)) {
111188 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
111189- atomic_long_sub(nr_pages, &num_poisoned_pages);
111190+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111191 put_page(hpage);
111192 res = 0;
111193 goto out;
111194 }
111195 if (hwpoison_filter(p)) {
111196 if (TestClearPageHWPoison(p))
111197- atomic_long_sub(nr_pages, &num_poisoned_pages);
111198+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111199 unlock_page(hpage);
111200 put_page(hpage);
111201 return 0;
111202@@ -1467,7 +1467,7 @@ int unpoison_memory(unsigned long pfn)
111203 return 0;
111204 }
111205 if (TestClearPageHWPoison(p))
111206- atomic_long_dec(&num_poisoned_pages);
111207+ atomic_long_dec_unchecked(&num_poisoned_pages);
111208 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
111209 return 0;
111210 }
111211@@ -1481,7 +1481,7 @@ int unpoison_memory(unsigned long pfn)
111212 */
111213 if (TestClearPageHWPoison(page)) {
111214 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
111215- atomic_long_sub(nr_pages, &num_poisoned_pages);
111216+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111217 freeit = 1;
111218 if (PageHuge(page))
111219 clear_page_hwpoison_huge_page(page);
111220@@ -1617,11 +1617,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
111221 if (PageHuge(page)) {
111222 set_page_hwpoison_huge_page(hpage);
111223 dequeue_hwpoisoned_huge_page(hpage);
111224- atomic_long_add(1 << compound_order(hpage),
111225+ atomic_long_add_unchecked(1 << compound_order(hpage),
111226 &num_poisoned_pages);
111227 } else {
111228 SetPageHWPoison(page);
111229- atomic_long_inc(&num_poisoned_pages);
111230+ atomic_long_inc_unchecked(&num_poisoned_pages);
111231 }
111232 }
111233 return ret;
111234@@ -1660,7 +1660,7 @@ static int __soft_offline_page(struct page *page, int flags)
111235 put_page(page);
111236 pr_info("soft_offline: %#lx: invalidated\n", pfn);
111237 SetPageHWPoison(page);
111238- atomic_long_inc(&num_poisoned_pages);
111239+ atomic_long_inc_unchecked(&num_poisoned_pages);
111240 return 0;
111241 }
111242
111243@@ -1709,7 +1709,7 @@ static int __soft_offline_page(struct page *page, int flags)
111244 if (!is_free_buddy_page(page))
111245 pr_info("soft offline: %#lx: page leaked\n",
111246 pfn);
111247- atomic_long_inc(&num_poisoned_pages);
111248+ atomic_long_inc_unchecked(&num_poisoned_pages);
111249 }
111250 } else {
111251 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
111252@@ -1779,11 +1779,11 @@ int soft_offline_page(struct page *page, int flags)
111253 if (PageHuge(page)) {
111254 set_page_hwpoison_huge_page(hpage);
111255 if (!dequeue_hwpoisoned_huge_page(hpage))
111256- atomic_long_add(1 << compound_order(hpage),
111257+ atomic_long_add_unchecked(1 << compound_order(hpage),
111258 &num_poisoned_pages);
111259 } else {
111260 if (!TestSetPageHWPoison(page))
111261- atomic_long_inc(&num_poisoned_pages);
111262+ atomic_long_inc_unchecked(&num_poisoned_pages);
111263 }
111264 }
111265 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
111266diff --git a/mm/memory.c b/mm/memory.c
111267index 2a9e098..37435af 100644
111268--- a/mm/memory.c
111269+++ b/mm/memory.c
111270@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111271 free_pte_range(tlb, pmd, addr);
111272 } while (pmd++, addr = next, addr != end);
111273
111274+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
111275 start &= PUD_MASK;
111276 if (start < floor)
111277 return;
111278@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111279 pud_clear(pud);
111280 pmd_free_tlb(tlb, pmd, start);
111281 mm_dec_nr_pmds(tlb->mm);
111282+#endif
111283 }
111284
111285 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111286@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111287 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
111288 } while (pud++, addr = next, addr != end);
111289
111290+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
111291 start &= PGDIR_MASK;
111292 if (start < floor)
111293 return;
111294@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111295 pud = pud_offset(pgd, start);
111296 pgd_clear(pgd);
111297 pud_free_tlb(tlb, pud, start);
111298+#endif
111299+
111300 }
111301
111302 /*
111303@@ -690,7 +695,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
111304 /*
111305 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
111306 */
111307- pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n",
111308+ pr_alert("file:%pD fault:%pX mmap:%pX readpage:%pX\n",
111309 vma->vm_file,
111310 vma->vm_ops ? vma->vm_ops->fault : NULL,
111311 vma->vm_file ? vma->vm_file->f_op->mmap : NULL,
111312@@ -1463,6 +1468,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
111313 page_add_file_rmap(page);
111314 set_pte_at(mm, addr, pte, mk_pte(page, prot));
111315
111316+#ifdef CONFIG_PAX_SEGMEXEC
111317+ pax_mirror_file_pte(vma, addr, page, ptl);
111318+#endif
111319+
111320 retval = 0;
111321 pte_unmap_unlock(pte, ptl);
111322 return retval;
111323@@ -1507,9 +1516,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
111324 if (!page_count(page))
111325 return -EINVAL;
111326 if (!(vma->vm_flags & VM_MIXEDMAP)) {
111327+
111328+#ifdef CONFIG_PAX_SEGMEXEC
111329+ struct vm_area_struct *vma_m;
111330+#endif
111331+
111332 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
111333 BUG_ON(vma->vm_flags & VM_PFNMAP);
111334 vma->vm_flags |= VM_MIXEDMAP;
111335+
111336+#ifdef CONFIG_PAX_SEGMEXEC
111337+ vma_m = pax_find_mirror_vma(vma);
111338+ if (vma_m)
111339+ vma_m->vm_flags |= VM_MIXEDMAP;
111340+#endif
111341+
111342 }
111343 return insert_page(vma, addr, page, vma->vm_page_prot);
111344 }
111345@@ -1592,6 +1613,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
111346 unsigned long pfn)
111347 {
111348 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
111349+ BUG_ON(vma->vm_mirror);
111350
111351 if (addr < vma->vm_start || addr >= vma->vm_end)
111352 return -EFAULT;
111353@@ -1839,7 +1861,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
111354
111355 BUG_ON(pud_huge(*pud));
111356
111357- pmd = pmd_alloc(mm, pud, addr);
111358+ pmd = (mm == &init_mm) ?
111359+ pmd_alloc_kernel(mm, pud, addr) :
111360+ pmd_alloc(mm, pud, addr);
111361 if (!pmd)
111362 return -ENOMEM;
111363 do {
111364@@ -1859,7 +1883,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
111365 unsigned long next;
111366 int err;
111367
111368- pud = pud_alloc(mm, pgd, addr);
111369+ pud = (mm == &init_mm) ?
111370+ pud_alloc_kernel(mm, pgd, addr) :
111371+ pud_alloc(mm, pgd, addr);
111372 if (!pud)
111373 return -ENOMEM;
111374 do {
111375@@ -2040,6 +2066,196 @@ static inline int wp_page_reuse(struct mm_struct *mm,
111376 return VM_FAULT_WRITE;
111377 }
111378
111379+#ifdef CONFIG_PAX_SEGMEXEC
111380+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
111381+{
111382+ struct mm_struct *mm = vma->vm_mm;
111383+ spinlock_t *ptl;
111384+ pte_t *pte, entry;
111385+
111386+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
111387+ entry = *pte;
111388+ if (pte_none(entry))
111389+ ;
111390+ else if (!pte_present(entry)) {
111391+ swp_entry_t swapentry;
111392+
111393+ swapentry = pte_to_swp_entry(entry);
111394+ if (!non_swap_entry(swapentry))
111395+ dec_mm_counter_fast(mm, MM_SWAPENTS);
111396+ else if (is_migration_entry(swapentry)) {
111397+ if (PageAnon(migration_entry_to_page(swapentry)))
111398+ dec_mm_counter_fast(mm, MM_ANONPAGES);
111399+ else
111400+ dec_mm_counter_fast(mm, MM_FILEPAGES);
111401+ }
111402+ free_swap_and_cache(swapentry);
111403+ pte_clear_not_present_full(mm, address, pte, 0);
111404+ } else {
111405+ struct page *page;
111406+
111407+ flush_cache_page(vma, address, pte_pfn(entry));
111408+ entry = ptep_clear_flush(vma, address, pte);
111409+ BUG_ON(pte_dirty(entry));
111410+ page = vm_normal_page(vma, address, entry);
111411+ if (page) {
111412+ update_hiwater_rss(mm);
111413+ if (PageAnon(page))
111414+ dec_mm_counter_fast(mm, MM_ANONPAGES);
111415+ else
111416+ dec_mm_counter_fast(mm, MM_FILEPAGES);
111417+ page_remove_rmap(page);
111418+ page_cache_release(page);
111419+ }
111420+ }
111421+ pte_unmap_unlock(pte, ptl);
111422+}
111423+
111424+/* PaX: if vma is mirrored, synchronize the mirror's PTE
111425+ *
111426+ * the ptl of the lower mapped page is held on entry and is not released on exit
111427+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
111428+ */
111429+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111430+{
111431+ struct mm_struct *mm = vma->vm_mm;
111432+ unsigned long address_m;
111433+ spinlock_t *ptl_m;
111434+ struct vm_area_struct *vma_m;
111435+ pmd_t *pmd_m;
111436+ pte_t *pte_m, entry_m;
111437+
111438+ BUG_ON(!page_m || !PageAnon(page_m));
111439+
111440+ vma_m = pax_find_mirror_vma(vma);
111441+ if (!vma_m)
111442+ return;
111443+
111444+ BUG_ON(!PageLocked(page_m));
111445+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111446+ address_m = address + SEGMEXEC_TASK_SIZE;
111447+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111448+ pte_m = pte_offset_map(pmd_m, address_m);
111449+ ptl_m = pte_lockptr(mm, pmd_m);
111450+ if (ptl != ptl_m) {
111451+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111452+ if (!pte_none(*pte_m))
111453+ goto out;
111454+ }
111455+
111456+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111457+ page_cache_get(page_m);
111458+ page_add_anon_rmap(page_m, vma_m, address_m);
111459+ inc_mm_counter_fast(mm, MM_ANONPAGES);
111460+ set_pte_at(mm, address_m, pte_m, entry_m);
111461+ update_mmu_cache(vma_m, address_m, pte_m);
111462+out:
111463+ if (ptl != ptl_m)
111464+ spin_unlock(ptl_m);
111465+ pte_unmap(pte_m);
111466+ unlock_page(page_m);
111467+}
111468+
111469+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111470+{
111471+ struct mm_struct *mm = vma->vm_mm;
111472+ unsigned long address_m;
111473+ spinlock_t *ptl_m;
111474+ struct vm_area_struct *vma_m;
111475+ pmd_t *pmd_m;
111476+ pte_t *pte_m, entry_m;
111477+
111478+ BUG_ON(!page_m || PageAnon(page_m));
111479+
111480+ vma_m = pax_find_mirror_vma(vma);
111481+ if (!vma_m)
111482+ return;
111483+
111484+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111485+ address_m = address + SEGMEXEC_TASK_SIZE;
111486+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111487+ pte_m = pte_offset_map(pmd_m, address_m);
111488+ ptl_m = pte_lockptr(mm, pmd_m);
111489+ if (ptl != ptl_m) {
111490+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111491+ if (!pte_none(*pte_m))
111492+ goto out;
111493+ }
111494+
111495+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111496+ page_cache_get(page_m);
111497+ page_add_file_rmap(page_m);
111498+ inc_mm_counter_fast(mm, MM_FILEPAGES);
111499+ set_pte_at(mm, address_m, pte_m, entry_m);
111500+ update_mmu_cache(vma_m, address_m, pte_m);
111501+out:
111502+ if (ptl != ptl_m)
111503+ spin_unlock(ptl_m);
111504+ pte_unmap(pte_m);
111505+}
111506+
111507+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
111508+{
111509+ struct mm_struct *mm = vma->vm_mm;
111510+ unsigned long address_m;
111511+ spinlock_t *ptl_m;
111512+ struct vm_area_struct *vma_m;
111513+ pmd_t *pmd_m;
111514+ pte_t *pte_m, entry_m;
111515+
111516+ vma_m = pax_find_mirror_vma(vma);
111517+ if (!vma_m)
111518+ return;
111519+
111520+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111521+ address_m = address + SEGMEXEC_TASK_SIZE;
111522+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111523+ pte_m = pte_offset_map(pmd_m, address_m);
111524+ ptl_m = pte_lockptr(mm, pmd_m);
111525+ if (ptl != ptl_m) {
111526+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111527+ if (!pte_none(*pte_m))
111528+ goto out;
111529+ }
111530+
111531+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
111532+ set_pte_at(mm, address_m, pte_m, entry_m);
111533+out:
111534+ if (ptl != ptl_m)
111535+ spin_unlock(ptl_m);
111536+ pte_unmap(pte_m);
111537+}
111538+
111539+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
111540+{
111541+ struct page *page_m;
111542+ pte_t entry;
111543+
111544+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
111545+ goto out;
111546+
111547+ entry = *pte;
111548+ page_m = vm_normal_page(vma, address, entry);
111549+ if (!page_m)
111550+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
111551+ else if (PageAnon(page_m)) {
111552+ if (pax_find_mirror_vma(vma)) {
111553+ pte_unmap_unlock(pte, ptl);
111554+ lock_page(page_m);
111555+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
111556+ if (pte_same(entry, *pte))
111557+ pax_mirror_anon_pte(vma, address, page_m, ptl);
111558+ else
111559+ unlock_page(page_m);
111560+ }
111561+ } else
111562+ pax_mirror_file_pte(vma, address, page_m, ptl);
111563+
111564+out:
111565+ pte_unmap_unlock(pte, ptl);
111566+}
111567+#endif
111568+
111569 /*
111570 * Handle the case of a page which we actually need to copy to a new page.
111571 *
111572@@ -2093,6 +2309,12 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111573 */
111574 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111575 if (likely(pte_same(*page_table, orig_pte))) {
111576+
111577+#ifdef CONFIG_PAX_SEGMEXEC
111578+ if (pax_find_mirror_vma(vma))
111579+ BUG_ON(!trylock_page(new_page));
111580+#endif
111581+
111582 if (old_page) {
111583 if (!PageAnon(old_page)) {
111584 dec_mm_counter_fast(mm, MM_FILEPAGES);
111585@@ -2147,6 +2369,10 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111586 page_remove_rmap(old_page);
111587 }
111588
111589+#ifdef CONFIG_PAX_SEGMEXEC
111590+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111591+#endif
111592+
111593 /* Free the old page.. */
111594 new_page = old_page;
111595 page_copied = 1;
111596@@ -2578,6 +2804,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111597 swap_free(entry);
111598 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
111599 try_to_free_swap(page);
111600+
111601+#ifdef CONFIG_PAX_SEGMEXEC
111602+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
111603+#endif
111604+
111605 unlock_page(page);
111606 if (page != swapcache) {
111607 /*
111608@@ -2601,6 +2832,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111609
111610 /* No need to invalidate - it was non-present before */
111611 update_mmu_cache(vma, address, page_table);
111612+
111613+#ifdef CONFIG_PAX_SEGMEXEC
111614+ pax_mirror_anon_pte(vma, address, page, ptl);
111615+#endif
111616+
111617 unlock:
111618 pte_unmap_unlock(page_table, ptl);
111619 out:
111620@@ -2620,40 +2856,6 @@ out_release:
111621 }
111622
111623 /*
111624- * This is like a special single-page "expand_{down|up}wards()",
111625- * except we must first make sure that 'address{-|+}PAGE_SIZE'
111626- * doesn't hit another vma.
111627- */
111628-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
111629-{
111630- address &= PAGE_MASK;
111631- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
111632- struct vm_area_struct *prev = vma->vm_prev;
111633-
111634- /*
111635- * Is there a mapping abutting this one below?
111636- *
111637- * That's only ok if it's the same stack mapping
111638- * that has gotten split..
111639- */
111640- if (prev && prev->vm_end == address)
111641- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
111642-
111643- return expand_downwards(vma, address - PAGE_SIZE);
111644- }
111645- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
111646- struct vm_area_struct *next = vma->vm_next;
111647-
111648- /* As VM_GROWSDOWN but s/below/above/ */
111649- if (next && next->vm_start == address + PAGE_SIZE)
111650- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
111651-
111652- return expand_upwards(vma, address + PAGE_SIZE);
111653- }
111654- return 0;
111655-}
111656-
111657-/*
111658 * We enter with non-exclusive mmap_sem (to exclude vma changes,
111659 * but allow concurrent faults), and pte mapped but not yet locked.
111660 * We return with mmap_sem still held, but pte unmapped and unlocked.
111661@@ -2663,31 +2865,29 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111662 unsigned int flags)
111663 {
111664 struct mem_cgroup *memcg;
111665- struct page *page;
111666+ struct page *page = NULL;
111667 spinlock_t *ptl;
111668 pte_t entry;
111669
111670- pte_unmap(page_table);
111671-
111672 /* File mapping without ->vm_ops ? */
111673- if (vma->vm_flags & VM_SHARED)
111674+ if (vma->vm_flags & VM_SHARED) {
111675+ pte_unmap(page_table);
111676 return VM_FAULT_SIGBUS;
111677+ }
111678
111679- /* Check if we need to add a guard page to the stack */
111680- if (check_stack_guard_page(vma, address) < 0)
111681- return VM_FAULT_SIGSEGV;
111682-
111683- /* Use the zero-page for reads */
111684 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
111685 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
111686 vma->vm_page_prot));
111687- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111688+ ptl = pte_lockptr(mm, pmd);
111689+ spin_lock(ptl);
111690 if (!pte_none(*page_table))
111691 goto unlock;
111692 goto setpte;
111693 }
111694
111695 /* Allocate our own private page. */
111696+ pte_unmap(page_table);
111697+
111698 if (unlikely(anon_vma_prepare(vma)))
111699 goto oom;
111700 page = alloc_zeroed_user_highpage_movable(vma, address);
111701@@ -2711,6 +2911,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111702 if (!pte_none(*page_table))
111703 goto release;
111704
111705+#ifdef CONFIG_PAX_SEGMEXEC
111706+ if (pax_find_mirror_vma(vma))
111707+ BUG_ON(!trylock_page(page));
111708+#endif
111709+
111710 inc_mm_counter_fast(mm, MM_ANONPAGES);
111711 page_add_new_anon_rmap(page, vma, address);
111712 mem_cgroup_commit_charge(page, memcg, false);
111713@@ -2720,6 +2925,12 @@ setpte:
111714
111715 /* No need to invalidate - it was non-present before */
111716 update_mmu_cache(vma, address, page_table);
111717+
111718+#ifdef CONFIG_PAX_SEGMEXEC
111719+ if (page)
111720+ pax_mirror_anon_pte(vma, address, page, ptl);
111721+#endif
111722+
111723 unlock:
111724 pte_unmap_unlock(page_table, ptl);
111725 return 0;
111726@@ -2952,6 +3163,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111727 return ret;
111728 }
111729 do_set_pte(vma, address, fault_page, pte, false, false);
111730+
111731+#ifdef CONFIG_PAX_SEGMEXEC
111732+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111733+#endif
111734+
111735 unlock_page(fault_page);
111736 unlock_out:
111737 pte_unmap_unlock(pte, ptl);
111738@@ -3003,7 +3219,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111739 }
111740 goto uncharge_out;
111741 }
111742+
111743+#ifdef CONFIG_PAX_SEGMEXEC
111744+ if (pax_find_mirror_vma(vma))
111745+ BUG_ON(!trylock_page(new_page));
111746+#endif
111747+
111748 do_set_pte(vma, address, new_page, pte, true, true);
111749+
111750+#ifdef CONFIG_PAX_SEGMEXEC
111751+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111752+#endif
111753+
111754 mem_cgroup_commit_charge(new_page, memcg, false);
111755 lru_cache_add_active_or_unevictable(new_page, vma);
111756 pte_unmap_unlock(pte, ptl);
111757@@ -3061,6 +3288,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111758 return ret;
111759 }
111760 do_set_pte(vma, address, fault_page, pte, true, false);
111761+
111762+#ifdef CONFIG_PAX_SEGMEXEC
111763+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111764+#endif
111765+
111766 pte_unmap_unlock(pte, ptl);
111767
111768 if (set_page_dirty(fault_page))
111769@@ -3286,6 +3518,12 @@ static int handle_pte_fault(struct mm_struct *mm,
111770 if (flags & FAULT_FLAG_WRITE)
111771 flush_tlb_fix_spurious_fault(vma, address);
111772 }
111773+
111774+#ifdef CONFIG_PAX_SEGMEXEC
111775+ pax_mirror_pte(vma, address, pte, pmd, ptl);
111776+ return 0;
111777+#endif
111778+
111779 unlock:
111780 pte_unmap_unlock(pte, ptl);
111781 return 0;
111782@@ -3305,9 +3543,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111783 pmd_t *pmd;
111784 pte_t *pte;
111785
111786+#ifdef CONFIG_PAX_SEGMEXEC
111787+ struct vm_area_struct *vma_m;
111788+#endif
111789+
111790 if (unlikely(is_vm_hugetlb_page(vma)))
111791 return hugetlb_fault(mm, vma, address, flags);
111792
111793+#ifdef CONFIG_PAX_SEGMEXEC
111794+ vma_m = pax_find_mirror_vma(vma);
111795+ if (vma_m) {
111796+ unsigned long address_m;
111797+ pgd_t *pgd_m;
111798+ pud_t *pud_m;
111799+ pmd_t *pmd_m;
111800+
111801+ if (vma->vm_start > vma_m->vm_start) {
111802+ address_m = address;
111803+ address -= SEGMEXEC_TASK_SIZE;
111804+ vma = vma_m;
111805+ } else
111806+ address_m = address + SEGMEXEC_TASK_SIZE;
111807+
111808+ pgd_m = pgd_offset(mm, address_m);
111809+ pud_m = pud_alloc(mm, pgd_m, address_m);
111810+ if (!pud_m)
111811+ return VM_FAULT_OOM;
111812+ pmd_m = pmd_alloc(mm, pud_m, address_m);
111813+ if (!pmd_m)
111814+ return VM_FAULT_OOM;
111815+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
111816+ return VM_FAULT_OOM;
111817+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
111818+ }
111819+#endif
111820+
111821 pgd = pgd_offset(mm, address);
111822 pud = pud_alloc(mm, pgd, address);
111823 if (!pud)
111824@@ -3442,6 +3712,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111825 spin_unlock(&mm->page_table_lock);
111826 return 0;
111827 }
111828+
111829+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111830+{
111831+ pud_t *new = pud_alloc_one(mm, address);
111832+ if (!new)
111833+ return -ENOMEM;
111834+
111835+ smp_wmb(); /* See comment in __pte_alloc */
111836+
111837+ spin_lock(&mm->page_table_lock);
111838+ if (pgd_present(*pgd)) /* Another has populated it */
111839+ pud_free(mm, new);
111840+ else
111841+ pgd_populate_kernel(mm, pgd, new);
111842+ spin_unlock(&mm->page_table_lock);
111843+ return 0;
111844+}
111845 #endif /* __PAGETABLE_PUD_FOLDED */
111846
111847 #ifndef __PAGETABLE_PMD_FOLDED
111848@@ -3474,6 +3761,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
111849 spin_unlock(&mm->page_table_lock);
111850 return 0;
111851 }
111852+
111853+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
111854+{
111855+ pmd_t *new = pmd_alloc_one(mm, address);
111856+ if (!new)
111857+ return -ENOMEM;
111858+
111859+ smp_wmb(); /* See comment in __pte_alloc */
111860+
111861+ spin_lock(&mm->page_table_lock);
111862+#ifndef __ARCH_HAS_4LEVEL_HACK
111863+ if (!pud_present(*pud)) {
111864+ mm_inc_nr_pmds(mm);
111865+ pud_populate_kernel(mm, pud, new);
111866+ } else /* Another has populated it */
111867+ pmd_free(mm, new);
111868+#else
111869+ if (!pgd_present(*pud)) {
111870+ mm_inc_nr_pmds(mm);
111871+ pgd_populate_kernel(mm, pud, new);
111872+ } else /* Another has populated it */
111873+ pmd_free(mm, new);
111874+#endif /* __ARCH_HAS_4LEVEL_HACK */
111875+ spin_unlock(&mm->page_table_lock);
111876+ return 0;
111877+}
111878 #endif /* __PAGETABLE_PMD_FOLDED */
111879
111880 static int __follow_pte(struct mm_struct *mm, unsigned long address,
111881@@ -3583,8 +3896,8 @@ out:
111882 return ret;
111883 }
111884
111885-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
111886- void *buf, int len, int write)
111887+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
111888+ void *buf, size_t len, int write)
111889 {
111890 resource_size_t phys_addr;
111891 unsigned long prot = 0;
111892@@ -3610,8 +3923,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
111893 * Access another process' address space as given in mm. If non-NULL, use the
111894 * given task for page fault accounting.
111895 */
111896-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111897- unsigned long addr, void *buf, int len, int write)
111898+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111899+ unsigned long addr, void *buf, size_t len, int write)
111900 {
111901 struct vm_area_struct *vma;
111902 void *old_buf = buf;
111903@@ -3619,7 +3932,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111904 down_read(&mm->mmap_sem);
111905 /* ignore errors, just check how much was successfully transferred */
111906 while (len) {
111907- int bytes, ret, offset;
111908+ ssize_t bytes, ret, offset;
111909 void *maddr;
111910 struct page *page = NULL;
111911
111912@@ -3680,8 +3993,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111913 *
111914 * The caller must hold a reference on @mm.
111915 */
111916-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
111917- void *buf, int len, int write)
111918+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
111919+ void *buf, size_t len, int write)
111920 {
111921 return __access_remote_vm(NULL, mm, addr, buf, len, write);
111922 }
111923@@ -3691,11 +4004,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
111924 * Source/target buffer must be kernel space,
111925 * Do not walk the page table directly, use get_user_pages
111926 */
111927-int access_process_vm(struct task_struct *tsk, unsigned long addr,
111928- void *buf, int len, int write)
111929+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
111930+ void *buf, size_t len, int write)
111931 {
111932 struct mm_struct *mm;
111933- int ret;
111934+ ssize_t ret;
111935
111936 mm = get_task_mm(tsk);
111937 if (!mm)
111938diff --git a/mm/mempolicy.c b/mm/mempolicy.c
111939index 99d4c1d..a577817 100644
111940--- a/mm/mempolicy.c
111941+++ b/mm/mempolicy.c
111942@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
111943 unsigned long vmstart;
111944 unsigned long vmend;
111945
111946+#ifdef CONFIG_PAX_SEGMEXEC
111947+ struct vm_area_struct *vma_m;
111948+#endif
111949+
111950 vma = find_vma(mm, start);
111951 if (!vma || vma->vm_start > start)
111952 return -EFAULT;
111953@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
111954 err = vma_replace_policy(vma, new_pol);
111955 if (err)
111956 goto out;
111957+
111958+#ifdef CONFIG_PAX_SEGMEXEC
111959+ vma_m = pax_find_mirror_vma(vma);
111960+ if (vma_m) {
111961+ err = vma_replace_policy(vma_m, new_pol);
111962+ if (err)
111963+ goto out;
111964+ }
111965+#endif
111966+
111967 }
111968
111969 out:
111970@@ -1161,6 +1175,17 @@ static long do_mbind(unsigned long start, unsigned long len,
111971
111972 if (end < start)
111973 return -EINVAL;
111974+
111975+#ifdef CONFIG_PAX_SEGMEXEC
111976+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
111977+ if (end > SEGMEXEC_TASK_SIZE)
111978+ return -EINVAL;
111979+ } else
111980+#endif
111981+
111982+ if (end > TASK_SIZE)
111983+ return -EINVAL;
111984+
111985 if (end == start)
111986 return 0;
111987
111988@@ -1386,8 +1411,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
111989 */
111990 tcred = __task_cred(task);
111991 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
111992- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
111993- !capable(CAP_SYS_NICE)) {
111994+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
111995 rcu_read_unlock();
111996 err = -EPERM;
111997 goto out_put;
111998@@ -1418,6 +1442,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
111999 goto out;
112000 }
112001
112002+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112003+ if (mm != current->mm &&
112004+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
112005+ mmput(mm);
112006+ err = -EPERM;
112007+ goto out;
112008+ }
112009+#endif
112010+
112011 err = do_migrate_pages(mm, old, new,
112012 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
112013
112014diff --git a/mm/migrate.c b/mm/migrate.c
112015index f53838f..a26fa94 100644
112016--- a/mm/migrate.c
112017+++ b/mm/migrate.c
112018@@ -1484,8 +1484,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
112019 */
112020 tcred = __task_cred(task);
112021 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
112022- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
112023- !capable(CAP_SYS_NICE)) {
112024+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
112025 rcu_read_unlock();
112026 err = -EPERM;
112027 goto out;
112028diff --git a/mm/mlock.c b/mm/mlock.c
112029index 6fd2cf1..cbae765 100644
112030--- a/mm/mlock.c
112031+++ b/mm/mlock.c
112032@@ -14,6 +14,7 @@
112033 #include <linux/pagevec.h>
112034 #include <linux/mempolicy.h>
112035 #include <linux/syscalls.h>
112036+#include <linux/security.h>
112037 #include <linux/sched.h>
112038 #include <linux/export.h>
112039 #include <linux/rmap.h>
112040@@ -557,7 +558,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
112041 {
112042 unsigned long nstart, end, tmp;
112043 struct vm_area_struct * vma, * prev;
112044- int error;
112045+ int error = 0;
112046
112047 VM_BUG_ON(start & ~PAGE_MASK);
112048 VM_BUG_ON(len != PAGE_ALIGN(len));
112049@@ -566,6 +567,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
112050 return -EINVAL;
112051 if (end == start)
112052 return 0;
112053+ if (end > TASK_SIZE)
112054+ return -EINVAL;
112055+
112056 vma = find_vma(current->mm, start);
112057 if (!vma || vma->vm_start > start)
112058 return -ENOMEM;
112059@@ -577,6 +581,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
112060 for (nstart = start ; ; ) {
112061 vm_flags_t newflags;
112062
112063+#ifdef CONFIG_PAX_SEGMEXEC
112064+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112065+ break;
112066+#endif
112067+
112068 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
112069
112070 newflags = vma->vm_flags & ~VM_LOCKED;
112071@@ -627,6 +636,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
112072 locked += current->mm->locked_vm;
112073
112074 /* check against resource limits */
112075+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
112076 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
112077 error = do_mlock(start, len, 1);
112078
112079@@ -668,6 +678,11 @@ static int do_mlockall(int flags)
112080 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
112081 vm_flags_t newflags;
112082
112083+#ifdef CONFIG_PAX_SEGMEXEC
112084+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112085+ break;
112086+#endif
112087+
112088 newflags = vma->vm_flags & ~VM_LOCKED;
112089 if (flags & MCL_CURRENT)
112090 newflags |= VM_LOCKED;
112091@@ -699,8 +714,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
112092 lock_limit >>= PAGE_SHIFT;
112093
112094 ret = -ENOMEM;
112095+
112096+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
112097+
112098 down_write(&current->mm->mmap_sem);
112099-
112100 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
112101 capable(CAP_IPC_LOCK))
112102 ret = do_mlockall(flags);
112103diff --git a/mm/mm_init.c b/mm/mm_init.c
112104index 5f420f7..dd42fb1b 100644
112105--- a/mm/mm_init.c
112106+++ b/mm/mm_init.c
112107@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
112108 return NOTIFY_OK;
112109 }
112110
112111-static struct notifier_block compute_batch_nb __meminitdata = {
112112+static struct notifier_block compute_batch_nb __meminitconst = {
112113 .notifier_call = mm_compute_batch_notifier,
112114 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
112115 };
112116diff --git a/mm/mmap.c b/mm/mmap.c
112117index bb50cac..6d50a9f 100644
112118--- a/mm/mmap.c
112119+++ b/mm/mmap.c
112120@@ -41,6 +41,7 @@
112121 #include <linux/notifier.h>
112122 #include <linux/memory.h>
112123 #include <linux/printk.h>
112124+#include <linux/random.h>
112125
112126 #include <asm/uaccess.h>
112127 #include <asm/cacheflush.h>
112128@@ -57,6 +58,16 @@
112129 #define arch_rebalance_pgtables(addr, len) (addr)
112130 #endif
112131
112132+static inline void verify_mm_writelocked(struct mm_struct *mm)
112133+{
112134+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
112135+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
112136+ up_read(&mm->mmap_sem);
112137+ BUG();
112138+ }
112139+#endif
112140+}
112141+
112142 static void unmap_region(struct mm_struct *mm,
112143 struct vm_area_struct *vma, struct vm_area_struct *prev,
112144 unsigned long start, unsigned long end);
112145@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
112146 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
112147 *
112148 */
112149-pgprot_t protection_map[16] = {
112150+pgprot_t protection_map[16] __read_only = {
112151 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
112152 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
112153 };
112154
112155-pgprot_t vm_get_page_prot(unsigned long vm_flags)
112156+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
112157 {
112158- return __pgprot(pgprot_val(protection_map[vm_flags &
112159+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
112160 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
112161 pgprot_val(arch_vm_get_page_prot(vm_flags)));
112162+
112163+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112164+ if (!(__supported_pte_mask & _PAGE_NX) &&
112165+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
112166+ (vm_flags & (VM_READ | VM_WRITE)))
112167+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
112168+#endif
112169+
112170+ return prot;
112171 }
112172 EXPORT_SYMBOL(vm_get_page_prot);
112173
112174@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
112175 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
112176 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
112177 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
112178+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
112179 /*
112180 * Make sure vm_committed_as in one cacheline and not cacheline shared with
112181 * other variables. It can be updated by several CPUs frequently.
112182@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
112183 struct vm_area_struct *next = vma->vm_next;
112184
112185 might_sleep();
112186+ BUG_ON(vma->vm_mirror);
112187 if (vma->vm_ops && vma->vm_ops->close)
112188 vma->vm_ops->close(vma);
112189 if (vma->vm_file)
112190@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
112191
112192 SYSCALL_DEFINE1(brk, unsigned long, brk)
112193 {
112194+ unsigned long rlim;
112195 unsigned long retval;
112196 unsigned long newbrk, oldbrk;
112197 struct mm_struct *mm = current->mm;
112198@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
112199 * segment grow beyond its set limit the in case where the limit is
112200 * not page aligned -Ram Gupta
112201 */
112202- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
112203+ rlim = rlimit(RLIMIT_DATA);
112204+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112205+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
112206+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
112207+ rlim = 4096 * PAGE_SIZE;
112208+#endif
112209+ if (check_data_rlimit(rlim, brk, mm->start_brk,
112210 mm->end_data, mm->start_data))
112211 goto out;
112212
112213@@ -967,6 +996,12 @@ static int
112214 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
112215 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112216 {
112217+
112218+#ifdef CONFIG_PAX_SEGMEXEC
112219+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
112220+ return 0;
112221+#endif
112222+
112223 if (is_mergeable_vma(vma, file, vm_flags) &&
112224 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112225 if (vma->vm_pgoff == vm_pgoff)
112226@@ -986,6 +1021,12 @@ static int
112227 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
112228 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112229 {
112230+
112231+#ifdef CONFIG_PAX_SEGMEXEC
112232+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
112233+ return 0;
112234+#endif
112235+
112236 if (is_mergeable_vma(vma, file, vm_flags) &&
112237 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112238 pgoff_t vm_pglen;
112239@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112240 struct vm_area_struct *area, *next;
112241 int err;
112242
112243+#ifdef CONFIG_PAX_SEGMEXEC
112244+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
112245+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
112246+
112247+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
112248+#endif
112249+
112250 /*
112251 * We later require that vma->vm_flags == vm_flags,
112252 * so this tests vma->vm_flags & VM_SPECIAL, too.
112253@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112254 if (next && next->vm_end == end) /* cases 6, 7, 8 */
112255 next = next->vm_next;
112256
112257+#ifdef CONFIG_PAX_SEGMEXEC
112258+ if (prev)
112259+ prev_m = pax_find_mirror_vma(prev);
112260+ if (area)
112261+ area_m = pax_find_mirror_vma(area);
112262+ if (next)
112263+ next_m = pax_find_mirror_vma(next);
112264+#endif
112265+
112266 /*
112267 * Can it merge with the predecessor?
112268 */
112269@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112270 /* cases 1, 6 */
112271 err = vma_adjust(prev, prev->vm_start,
112272 next->vm_end, prev->vm_pgoff, NULL);
112273- } else /* cases 2, 5, 7 */
112274+
112275+#ifdef CONFIG_PAX_SEGMEXEC
112276+ if (!err && prev_m)
112277+ err = vma_adjust(prev_m, prev_m->vm_start,
112278+ next_m->vm_end, prev_m->vm_pgoff, NULL);
112279+#endif
112280+
112281+ } else { /* cases 2, 5, 7 */
112282 err = vma_adjust(prev, prev->vm_start,
112283 end, prev->vm_pgoff, NULL);
112284+
112285+#ifdef CONFIG_PAX_SEGMEXEC
112286+ if (!err && prev_m)
112287+ err = vma_adjust(prev_m, prev_m->vm_start,
112288+ end_m, prev_m->vm_pgoff, NULL);
112289+#endif
112290+
112291+ }
112292 if (err)
112293 return NULL;
112294 khugepaged_enter_vma_merge(prev, vm_flags);
112295@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112296 mpol_equal(policy, vma_policy(next)) &&
112297 can_vma_merge_before(next, vm_flags,
112298 anon_vma, file, pgoff+pglen)) {
112299- if (prev && addr < prev->vm_end) /* case 4 */
112300+ if (prev && addr < prev->vm_end) { /* case 4 */
112301 err = vma_adjust(prev, prev->vm_start,
112302 addr, prev->vm_pgoff, NULL);
112303- else /* cases 3, 8 */
112304+
112305+#ifdef CONFIG_PAX_SEGMEXEC
112306+ if (!err && prev_m)
112307+ err = vma_adjust(prev_m, prev_m->vm_start,
112308+ addr_m, prev_m->vm_pgoff, NULL);
112309+#endif
112310+
112311+ } else { /* cases 3, 8 */
112312 err = vma_adjust(area, addr, next->vm_end,
112313 next->vm_pgoff - pglen, NULL);
112314+
112315+#ifdef CONFIG_PAX_SEGMEXEC
112316+ if (!err && area_m)
112317+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
112318+ next_m->vm_pgoff - pglen, NULL);
112319+#endif
112320+
112321+ }
112322 if (err)
112323 return NULL;
112324 khugepaged_enter_vma_merge(area, vm_flags);
112325@@ -1199,8 +1286,10 @@ none:
112326 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112327 struct file *file, long pages)
112328 {
112329- const unsigned long stack_flags
112330- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
112331+
112332+#ifdef CONFIG_PAX_RANDMMAP
112333+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112334+#endif
112335
112336 mm->total_vm += pages;
112337
112338@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112339 mm->shared_vm += pages;
112340 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
112341 mm->exec_vm += pages;
112342- } else if (flags & stack_flags)
112343+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
112344 mm->stack_vm += pages;
112345 }
112346 #endif /* CONFIG_PROC_FS */
112347@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
112348 locked += mm->locked_vm;
112349 lock_limit = rlimit(RLIMIT_MEMLOCK);
112350 lock_limit >>= PAGE_SHIFT;
112351+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112352 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
112353 return -EAGAIN;
112354 }
112355@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112356 * (the exception is when the underlying filesystem is noexec
112357 * mounted, in which case we dont add PROT_EXEC.)
112358 */
112359- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
112360+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
112361 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
112362 prot |= PROT_EXEC;
112363
112364@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112365 /* Obtain the address to map to. we verify (or select) it and ensure
112366 * that it represents a valid section of the address space.
112367 */
112368- addr = get_unmapped_area(file, addr, len, pgoff, flags);
112369+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
112370 if (addr & ~PAGE_MASK)
112371 return addr;
112372
112373@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112374 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
112375 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
112376
112377+#ifdef CONFIG_PAX_MPROTECT
112378+ if (mm->pax_flags & MF_PAX_MPROTECT) {
112379+
112380+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
112381+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
112382+ mm->binfmt->handle_mmap)
112383+ mm->binfmt->handle_mmap(file);
112384+#endif
112385+
112386+#ifndef CONFIG_PAX_MPROTECT_COMPAT
112387+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
112388+ gr_log_rwxmmap(file);
112389+
112390+#ifdef CONFIG_PAX_EMUPLT
112391+ vm_flags &= ~VM_EXEC;
112392+#else
112393+ return -EPERM;
112394+#endif
112395+
112396+ }
112397+
112398+ if (!(vm_flags & VM_EXEC))
112399+ vm_flags &= ~VM_MAYEXEC;
112400+#else
112401+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
112402+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
112403+#endif
112404+ else
112405+ vm_flags &= ~VM_MAYWRITE;
112406+ }
112407+#endif
112408+
112409+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112410+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
112411+ vm_flags &= ~VM_PAGEEXEC;
112412+#endif
112413+
112414 if (flags & MAP_LOCKED)
112415 if (!can_do_mlock())
112416 return -EPERM;
112417@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112418 vm_flags |= VM_NORESERVE;
112419 }
112420
112421+ if (!gr_acl_handle_mmap(file, prot))
112422+ return -EACCES;
112423+
112424 addr = mmap_region(file, addr, len, vm_flags, pgoff);
112425 if (!IS_ERR_VALUE(addr) &&
112426 ((vm_flags & VM_LOCKED) ||
112427@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
112428 vm_flags_t vm_flags = vma->vm_flags;
112429
112430 /* If it was private or non-writable, the write bit is already clear */
112431- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
112432+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
112433 return 0;
112434
112435 /* The backer wishes to know when pages are first written to? */
112436@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112437 struct rb_node **rb_link, *rb_parent;
112438 unsigned long charged = 0;
112439
112440+#ifdef CONFIG_PAX_SEGMEXEC
112441+ struct vm_area_struct *vma_m = NULL;
112442+#endif
112443+
112444+ /*
112445+ * mm->mmap_sem is required to protect against another thread
112446+ * changing the mappings in case we sleep.
112447+ */
112448+ verify_mm_writelocked(mm);
112449+
112450 /* Check against address space limit. */
112451+
112452+#ifdef CONFIG_PAX_RANDMMAP
112453+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112454+#endif
112455+
112456 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
112457 unsigned long nr_pages;
112458
112459@@ -1555,6 +1700,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112460 &rb_parent)) {
112461 if (do_munmap(mm, addr, len))
112462 return -ENOMEM;
112463+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
112464 }
112465
112466 /*
112467@@ -1586,6 +1732,16 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112468 goto unacct_error;
112469 }
112470
112471+#ifdef CONFIG_PAX_SEGMEXEC
112472+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
112473+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
112474+ if (!vma_m) {
112475+ error = -ENOMEM;
112476+ goto free_vma;
112477+ }
112478+ }
112479+#endif
112480+
112481 vma->vm_mm = mm;
112482 vma->vm_start = addr;
112483 vma->vm_end = addr + len;
112484@@ -1616,6 +1772,13 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112485 if (error)
112486 goto unmap_and_free_vma;
112487
112488+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112489+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
112490+ vma->vm_flags |= VM_PAGEEXEC;
112491+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
112492+ }
112493+#endif
112494+
112495 /* Can addr have changed??
112496 *
112497 * Answer: Yes, several device drivers can do it in their
112498@@ -1634,6 +1797,12 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112499 }
112500
112501 vma_link(mm, vma, prev, rb_link, rb_parent);
112502+
112503+#ifdef CONFIG_PAX_SEGMEXEC
112504+ if (vma_m)
112505+ BUG_ON(pax_mirror_vma(vma_m, vma));
112506+#endif
112507+
112508 /* Once vma denies write, undo our temporary denial count */
112509 if (file) {
112510 if (vm_flags & VM_SHARED)
112511@@ -1646,6 +1815,7 @@ out:
112512 perf_event_mmap(vma);
112513
112514 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
112515+ track_exec_limit(mm, addr, addr + len, vm_flags);
112516 if (vm_flags & VM_LOCKED) {
112517 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
112518 vma == get_gate_vma(current->mm)))
112519@@ -1683,6 +1853,12 @@ allow_write_and_free_vma:
112520 if (vm_flags & VM_DENYWRITE)
112521 allow_write_access(file);
112522 free_vma:
112523+
112524+#ifdef CONFIG_PAX_SEGMEXEC
112525+ if (vma_m)
112526+ kmem_cache_free(vm_area_cachep, vma_m);
112527+#endif
112528+
112529 kmem_cache_free(vm_area_cachep, vma);
112530 unacct_error:
112531 if (charged)
112532@@ -1690,7 +1866,63 @@ unacct_error:
112533 return error;
112534 }
112535
112536-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112537+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
112538+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
112539+{
112540+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
112541+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
112542+
112543+ return 0;
112544+}
112545+#endif
112546+
112547+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
112548+{
112549+ if (!vma) {
112550+#ifdef CONFIG_STACK_GROWSUP
112551+ if (addr > sysctl_heap_stack_gap)
112552+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
112553+ else
112554+ vma = find_vma(current->mm, 0);
112555+ if (vma && (vma->vm_flags & VM_GROWSUP))
112556+ return false;
112557+#endif
112558+ return true;
112559+ }
112560+
112561+ if (addr + len > vma->vm_start)
112562+ return false;
112563+
112564+ if (vma->vm_flags & VM_GROWSDOWN)
112565+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
112566+#ifdef CONFIG_STACK_GROWSUP
112567+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
112568+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
112569+#endif
112570+ else if (offset)
112571+ return offset <= vma->vm_start - addr - len;
112572+
112573+ return true;
112574+}
112575+
112576+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
112577+{
112578+ if (vma->vm_start < len)
112579+ return -ENOMEM;
112580+
112581+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
112582+ if (offset <= vma->vm_start - len)
112583+ return vma->vm_start - len - offset;
112584+ else
112585+ return -ENOMEM;
112586+ }
112587+
112588+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
112589+ return vma->vm_start - len - sysctl_heap_stack_gap;
112590+ return -ENOMEM;
112591+}
112592+
112593+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
112594 {
112595 /*
112596 * We implement the search by looking for an rbtree node that
112597@@ -1738,11 +1970,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112598 }
112599 }
112600
112601- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
112602+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
112603 check_current:
112604 /* Check if current node has a suitable gap */
112605 if (gap_start > high_limit)
112606 return -ENOMEM;
112607+
112608+ if (gap_end - gap_start > info->threadstack_offset)
112609+ gap_start += info->threadstack_offset;
112610+ else
112611+ gap_start = gap_end;
112612+
112613+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112614+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112615+ gap_start += sysctl_heap_stack_gap;
112616+ else
112617+ gap_start = gap_end;
112618+ }
112619+ if (vma->vm_flags & VM_GROWSDOWN) {
112620+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112621+ gap_end -= sysctl_heap_stack_gap;
112622+ else
112623+ gap_end = gap_start;
112624+ }
112625 if (gap_end >= low_limit && gap_end - gap_start >= length)
112626 goto found;
112627
112628@@ -1792,7 +2042,7 @@ found:
112629 return gap_start;
112630 }
112631
112632-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
112633+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
112634 {
112635 struct mm_struct *mm = current->mm;
112636 struct vm_area_struct *vma;
112637@@ -1846,6 +2096,24 @@ check_current:
112638 gap_end = vma->vm_start;
112639 if (gap_end < low_limit)
112640 return -ENOMEM;
112641+
112642+ if (gap_end - gap_start > info->threadstack_offset)
112643+ gap_end -= info->threadstack_offset;
112644+ else
112645+ gap_end = gap_start;
112646+
112647+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112648+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112649+ gap_start += sysctl_heap_stack_gap;
112650+ else
112651+ gap_start = gap_end;
112652+ }
112653+ if (vma->vm_flags & VM_GROWSDOWN) {
112654+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112655+ gap_end -= sysctl_heap_stack_gap;
112656+ else
112657+ gap_end = gap_start;
112658+ }
112659 if (gap_start <= high_limit && gap_end - gap_start >= length)
112660 goto found;
112661
112662@@ -1909,6 +2177,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112663 struct mm_struct *mm = current->mm;
112664 struct vm_area_struct *vma;
112665 struct vm_unmapped_area_info info;
112666+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112667
112668 if (len > TASK_SIZE - mmap_min_addr)
112669 return -ENOMEM;
112670@@ -1916,11 +2185,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112671 if (flags & MAP_FIXED)
112672 return addr;
112673
112674+#ifdef CONFIG_PAX_RANDMMAP
112675+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112676+#endif
112677+
112678 if (addr) {
112679 addr = PAGE_ALIGN(addr);
112680 vma = find_vma(mm, addr);
112681 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112682- (!vma || addr + len <= vma->vm_start))
112683+ check_heap_stack_gap(vma, addr, len, offset))
112684 return addr;
112685 }
112686
112687@@ -1929,6 +2202,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112688 info.low_limit = mm->mmap_base;
112689 info.high_limit = TASK_SIZE;
112690 info.align_mask = 0;
112691+ info.threadstack_offset = offset;
112692 return vm_unmapped_area(&info);
112693 }
112694 #endif
112695@@ -1947,6 +2221,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112696 struct mm_struct *mm = current->mm;
112697 unsigned long addr = addr0;
112698 struct vm_unmapped_area_info info;
112699+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112700
112701 /* requested length too big for entire address space */
112702 if (len > TASK_SIZE - mmap_min_addr)
112703@@ -1955,12 +2230,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112704 if (flags & MAP_FIXED)
112705 return addr;
112706
112707+#ifdef CONFIG_PAX_RANDMMAP
112708+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112709+#endif
112710+
112711 /* requesting a specific address */
112712 if (addr) {
112713 addr = PAGE_ALIGN(addr);
112714 vma = find_vma(mm, addr);
112715 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112716- (!vma || addr + len <= vma->vm_start))
112717+ check_heap_stack_gap(vma, addr, len, offset))
112718 return addr;
112719 }
112720
112721@@ -1969,6 +2248,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112722 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
112723 info.high_limit = mm->mmap_base;
112724 info.align_mask = 0;
112725+ info.threadstack_offset = offset;
112726 addr = vm_unmapped_area(&info);
112727
112728 /*
112729@@ -1981,6 +2261,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112730 VM_BUG_ON(addr != -ENOMEM);
112731 info.flags = 0;
112732 info.low_limit = TASK_UNMAPPED_BASE;
112733+
112734+#ifdef CONFIG_PAX_RANDMMAP
112735+ if (mm->pax_flags & MF_PAX_RANDMMAP)
112736+ info.low_limit += mm->delta_mmap;
112737+#endif
112738+
112739 info.high_limit = TASK_SIZE;
112740 addr = vm_unmapped_area(&info);
112741 }
112742@@ -2081,6 +2367,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
112743 return vma;
112744 }
112745
112746+#ifdef CONFIG_PAX_SEGMEXEC
112747+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
112748+{
112749+ struct vm_area_struct *vma_m;
112750+
112751+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
112752+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
112753+ BUG_ON(vma->vm_mirror);
112754+ return NULL;
112755+ }
112756+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
112757+ vma_m = vma->vm_mirror;
112758+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
112759+ BUG_ON(vma->vm_file != vma_m->vm_file);
112760+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
112761+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
112762+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
112763+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
112764+ return vma_m;
112765+}
112766+#endif
112767+
112768 /*
112769 * Verify that the stack growth is acceptable and
112770 * update accounting. This is shared with both the
112771@@ -2098,8 +2406,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112772
112773 /* Stack limit test */
112774 actual_size = size;
112775- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
112776- actual_size -= PAGE_SIZE;
112777+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
112778 if (actual_size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur))
112779 return -ENOMEM;
112780
112781@@ -2110,6 +2417,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112782 locked = mm->locked_vm + grow;
112783 limit = READ_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
112784 limit >>= PAGE_SHIFT;
112785+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112786 if (locked > limit && !capable(CAP_IPC_LOCK))
112787 return -ENOMEM;
112788 }
112789@@ -2139,37 +2447,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112790 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
112791 * vma is the last one with address > vma->vm_end. Have to extend vma.
112792 */
112793+#ifndef CONFIG_IA64
112794+static
112795+#endif
112796 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112797 {
112798 int error;
112799+ bool locknext;
112800
112801 if (!(vma->vm_flags & VM_GROWSUP))
112802 return -EFAULT;
112803
112804+ /* Also guard against wrapping around to address 0. */
112805+ if (address < PAGE_ALIGN(address+1))
112806+ address = PAGE_ALIGN(address+1);
112807+ else
112808+ return -ENOMEM;
112809+
112810 /*
112811 * We must make sure the anon_vma is allocated
112812 * so that the anon_vma locking is not a noop.
112813 */
112814 if (unlikely(anon_vma_prepare(vma)))
112815 return -ENOMEM;
112816+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
112817+ if (locknext && anon_vma_prepare(vma->vm_next))
112818+ return -ENOMEM;
112819 vma_lock_anon_vma(vma);
112820+ if (locknext)
112821+ vma_lock_anon_vma(vma->vm_next);
112822
112823 /*
112824 * vma->vm_start/vm_end cannot change under us because the caller
112825 * is required to hold the mmap_sem in read mode. We need the
112826- * anon_vma lock to serialize against concurrent expand_stacks.
112827- * Also guard against wrapping around to address 0.
112828+ * anon_vma locks to serialize against concurrent expand_stacks
112829+ * and expand_upwards.
112830 */
112831- if (address < PAGE_ALIGN(address+4))
112832- address = PAGE_ALIGN(address+4);
112833- else {
112834- vma_unlock_anon_vma(vma);
112835- return -ENOMEM;
112836- }
112837 error = 0;
112838
112839 /* Somebody else might have raced and expanded it already */
112840- if (address > vma->vm_end) {
112841+ 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)
112842+ error = -ENOMEM;
112843+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
112844 unsigned long size, grow;
112845
112846 size = address - vma->vm_start;
112847@@ -2204,6 +2523,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112848 }
112849 }
112850 }
112851+ if (locknext)
112852+ vma_unlock_anon_vma(vma->vm_next);
112853 vma_unlock_anon_vma(vma);
112854 khugepaged_enter_vma_merge(vma, vma->vm_flags);
112855 validate_mm(vma->vm_mm);
112856@@ -2218,6 +2539,8 @@ int expand_downwards(struct vm_area_struct *vma,
112857 unsigned long address)
112858 {
112859 int error;
112860+ bool lockprev = false;
112861+ struct vm_area_struct *prev;
112862
112863 /*
112864 * We must make sure the anon_vma is allocated
112865@@ -2231,6 +2554,15 @@ int expand_downwards(struct vm_area_struct *vma,
112866 if (error)
112867 return error;
112868
112869+ prev = vma->vm_prev;
112870+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
112871+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
112872+#endif
112873+ if (lockprev && anon_vma_prepare(prev))
112874+ return -ENOMEM;
112875+ if (lockprev)
112876+ vma_lock_anon_vma(prev);
112877+
112878 vma_lock_anon_vma(vma);
112879
112880 /*
112881@@ -2240,9 +2572,17 @@ int expand_downwards(struct vm_area_struct *vma,
112882 */
112883
112884 /* Somebody else might have raced and expanded it already */
112885- if (address < vma->vm_start) {
112886+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
112887+ error = -ENOMEM;
112888+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
112889 unsigned long size, grow;
112890
112891+#ifdef CONFIG_PAX_SEGMEXEC
112892+ struct vm_area_struct *vma_m;
112893+
112894+ vma_m = pax_find_mirror_vma(vma);
112895+#endif
112896+
112897 size = vma->vm_end - address;
112898 grow = (vma->vm_start - address) >> PAGE_SHIFT;
112899
112900@@ -2267,13 +2607,27 @@ int expand_downwards(struct vm_area_struct *vma,
112901 vma->vm_pgoff -= grow;
112902 anon_vma_interval_tree_post_update_vma(vma);
112903 vma_gap_update(vma);
112904+
112905+#ifdef CONFIG_PAX_SEGMEXEC
112906+ if (vma_m) {
112907+ anon_vma_interval_tree_pre_update_vma(vma_m);
112908+ vma_m->vm_start -= grow << PAGE_SHIFT;
112909+ vma_m->vm_pgoff -= grow;
112910+ anon_vma_interval_tree_post_update_vma(vma_m);
112911+ vma_gap_update(vma_m);
112912+ }
112913+#endif
112914+
112915 spin_unlock(&vma->vm_mm->page_table_lock);
112916
112917+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
112918 perf_event_mmap(vma);
112919 }
112920 }
112921 }
112922 vma_unlock_anon_vma(vma);
112923+ if (lockprev)
112924+ vma_unlock_anon_vma(prev);
112925 khugepaged_enter_vma_merge(vma, vma->vm_flags);
112926 validate_mm(vma->vm_mm);
112927 return error;
112928@@ -2373,6 +2727,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
112929 do {
112930 long nrpages = vma_pages(vma);
112931
112932+#ifdef CONFIG_PAX_SEGMEXEC
112933+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
112934+ vma = remove_vma(vma);
112935+ continue;
112936+ }
112937+#endif
112938+
112939 if (vma->vm_flags & VM_ACCOUNT)
112940 nr_accounted += nrpages;
112941 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
112942@@ -2417,6 +2778,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
112943 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
112944 vma->vm_prev = NULL;
112945 do {
112946+
112947+#ifdef CONFIG_PAX_SEGMEXEC
112948+ if (vma->vm_mirror) {
112949+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
112950+ vma->vm_mirror->vm_mirror = NULL;
112951+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
112952+ vma->vm_mirror = NULL;
112953+ }
112954+#endif
112955+
112956 vma_rb_erase(vma, &mm->mm_rb);
112957 mm->map_count--;
112958 tail_vma = vma;
112959@@ -2444,14 +2815,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
112960 struct vm_area_struct *new;
112961 int err = -ENOMEM;
112962
112963+#ifdef CONFIG_PAX_SEGMEXEC
112964+ struct vm_area_struct *vma_m, *new_m = NULL;
112965+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
112966+#endif
112967+
112968 if (is_vm_hugetlb_page(vma) && (addr &
112969 ~(huge_page_mask(hstate_vma(vma)))))
112970 return -EINVAL;
112971
112972+#ifdef CONFIG_PAX_SEGMEXEC
112973+ vma_m = pax_find_mirror_vma(vma);
112974+#endif
112975+
112976 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
112977 if (!new)
112978 goto out_err;
112979
112980+#ifdef CONFIG_PAX_SEGMEXEC
112981+ if (vma_m) {
112982+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
112983+ if (!new_m) {
112984+ kmem_cache_free(vm_area_cachep, new);
112985+ goto out_err;
112986+ }
112987+ }
112988+#endif
112989+
112990 /* most fields are the same, copy all, and then fixup */
112991 *new = *vma;
112992
112993@@ -2464,6 +2854,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
112994 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
112995 }
112996
112997+#ifdef CONFIG_PAX_SEGMEXEC
112998+ if (vma_m) {
112999+ *new_m = *vma_m;
113000+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
113001+ new_m->vm_mirror = new;
113002+ new->vm_mirror = new_m;
113003+
113004+ if (new_below)
113005+ new_m->vm_end = addr_m;
113006+ else {
113007+ new_m->vm_start = addr_m;
113008+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
113009+ }
113010+ }
113011+#endif
113012+
113013 err = vma_dup_policy(vma, new);
113014 if (err)
113015 goto out_free_vma;
113016@@ -2484,6 +2890,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113017 else
113018 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
113019
113020+#ifdef CONFIG_PAX_SEGMEXEC
113021+ if (!err && vma_m) {
113022+ struct mempolicy *pol = vma_policy(new);
113023+
113024+ if (anon_vma_clone(new_m, vma_m))
113025+ goto out_free_mpol;
113026+
113027+ mpol_get(pol);
113028+ set_vma_policy(new_m, pol);
113029+
113030+ if (new_m->vm_file)
113031+ get_file(new_m->vm_file);
113032+
113033+ if (new_m->vm_ops && new_m->vm_ops->open)
113034+ new_m->vm_ops->open(new_m);
113035+
113036+ if (new_below)
113037+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
113038+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
113039+ else
113040+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
113041+
113042+ if (err) {
113043+ if (new_m->vm_ops && new_m->vm_ops->close)
113044+ new_m->vm_ops->close(new_m);
113045+ if (new_m->vm_file)
113046+ fput(new_m->vm_file);
113047+ mpol_put(pol);
113048+ }
113049+ }
113050+#endif
113051+
113052 /* Success. */
113053 if (!err)
113054 return 0;
113055@@ -2493,10 +2931,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113056 new->vm_ops->close(new);
113057 if (new->vm_file)
113058 fput(new->vm_file);
113059- unlink_anon_vmas(new);
113060 out_free_mpol:
113061 mpol_put(vma_policy(new));
113062 out_free_vma:
113063+
113064+#ifdef CONFIG_PAX_SEGMEXEC
113065+ if (new_m) {
113066+ unlink_anon_vmas(new_m);
113067+ kmem_cache_free(vm_area_cachep, new_m);
113068+ }
113069+#endif
113070+
113071+ unlink_anon_vmas(new);
113072 kmem_cache_free(vm_area_cachep, new);
113073 out_err:
113074 return err;
113075@@ -2509,6 +2955,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113076 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113077 unsigned long addr, int new_below)
113078 {
113079+
113080+#ifdef CONFIG_PAX_SEGMEXEC
113081+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
113082+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
113083+ if (mm->map_count >= sysctl_max_map_count-1)
113084+ return -ENOMEM;
113085+ } else
113086+#endif
113087+
113088 if (mm->map_count >= sysctl_max_map_count)
113089 return -ENOMEM;
113090
113091@@ -2520,11 +2975,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113092 * work. This now handles partial unmappings.
113093 * Jeremy Fitzhardinge <jeremy@goop.org>
113094 */
113095+#ifdef CONFIG_PAX_SEGMEXEC
113096 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113097 {
113098+ int ret = __do_munmap(mm, start, len);
113099+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
113100+ return ret;
113101+
113102+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
113103+}
113104+
113105+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113106+#else
113107+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113108+#endif
113109+{
113110 unsigned long end;
113111 struct vm_area_struct *vma, *prev, *last;
113112
113113+ /*
113114+ * mm->mmap_sem is required to protect against another thread
113115+ * changing the mappings in case we sleep.
113116+ */
113117+ verify_mm_writelocked(mm);
113118+
113119 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
113120 return -EINVAL;
113121
113122@@ -2602,6 +3076,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113123 /* Fix up all other VM information */
113124 remove_vma_list(mm, vma);
113125
113126+ track_exec_limit(mm, start, end, 0UL);
113127+
113128 return 0;
113129 }
113130
113131@@ -2610,6 +3086,13 @@ int vm_munmap(unsigned long start, size_t len)
113132 int ret;
113133 struct mm_struct *mm = current->mm;
113134
113135+
113136+#ifdef CONFIG_PAX_SEGMEXEC
113137+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
113138+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
113139+ return -EINVAL;
113140+#endif
113141+
113142 down_write(&mm->mmap_sem);
113143 ret = do_munmap(mm, start, len);
113144 up_write(&mm->mmap_sem);
113145@@ -2656,6 +3139,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
113146 down_write(&mm->mmap_sem);
113147 vma = find_vma(mm, start);
113148
113149+#ifdef CONFIG_PAX_SEGMEXEC
113150+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
113151+ goto out;
113152+#endif
113153+
113154 if (!vma || !(vma->vm_flags & VM_SHARED))
113155 goto out;
113156
113157@@ -2692,16 +3180,6 @@ out:
113158 return ret;
113159 }
113160
113161-static inline void verify_mm_writelocked(struct mm_struct *mm)
113162-{
113163-#ifdef CONFIG_DEBUG_VM
113164- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
113165- WARN_ON(1);
113166- up_read(&mm->mmap_sem);
113167- }
113168-#endif
113169-}
113170-
113171 /*
113172 * this is really a simplified "do_mmap". it only handles
113173 * anonymous maps. eventually we may be able to do some
113174@@ -2715,6 +3193,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113175 struct rb_node **rb_link, *rb_parent;
113176 pgoff_t pgoff = addr >> PAGE_SHIFT;
113177 int error;
113178+ unsigned long charged;
113179
113180 len = PAGE_ALIGN(len);
113181 if (!len)
113182@@ -2722,10 +3201,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113183
113184 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
113185
113186+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
113187+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
113188+ flags &= ~VM_EXEC;
113189+
113190+#ifdef CONFIG_PAX_MPROTECT
113191+ if (mm->pax_flags & MF_PAX_MPROTECT)
113192+ flags &= ~VM_MAYEXEC;
113193+#endif
113194+
113195+ }
113196+#endif
113197+
113198 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
113199 if (error & ~PAGE_MASK)
113200 return error;
113201
113202+ charged = len >> PAGE_SHIFT;
113203+
113204 error = mlock_future_check(mm, mm->def_flags, len);
113205 if (error)
113206 return error;
113207@@ -2743,16 +3236,17 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113208 &rb_parent)) {
113209 if (do_munmap(mm, addr, len))
113210 return -ENOMEM;
113211+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
113212 }
113213
113214 /* Check against address space limits *after* clearing old maps... */
113215- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
113216+ if (!may_expand_vm(mm, charged))
113217 return -ENOMEM;
113218
113219 if (mm->map_count > sysctl_max_map_count)
113220 return -ENOMEM;
113221
113222- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
113223+ if (security_vm_enough_memory_mm(mm, charged))
113224 return -ENOMEM;
113225
113226 /* Can we just expand an old private anonymous mapping? */
113227@@ -2766,7 +3260,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113228 */
113229 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113230 if (!vma) {
113231- vm_unacct_memory(len >> PAGE_SHIFT);
113232+ vm_unacct_memory(charged);
113233 return -ENOMEM;
113234 }
113235
113236@@ -2780,10 +3274,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113237 vma_link(mm, vma, prev, rb_link, rb_parent);
113238 out:
113239 perf_event_mmap(vma);
113240- mm->total_vm += len >> PAGE_SHIFT;
113241+ mm->total_vm += charged;
113242 if (flags & VM_LOCKED)
113243- mm->locked_vm += (len >> PAGE_SHIFT);
113244+ mm->locked_vm += charged;
113245 vma->vm_flags |= VM_SOFTDIRTY;
113246+ track_exec_limit(mm, addr, addr + len, flags);
113247 return addr;
113248 }
113249
113250@@ -2845,6 +3340,7 @@ void exit_mmap(struct mm_struct *mm)
113251 while (vma) {
113252 if (vma->vm_flags & VM_ACCOUNT)
113253 nr_accounted += vma_pages(vma);
113254+ vma->vm_mirror = NULL;
113255 vma = remove_vma(vma);
113256 }
113257 vm_unacct_memory(nr_accounted);
113258@@ -2859,6 +3355,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113259 struct vm_area_struct *prev;
113260 struct rb_node **rb_link, *rb_parent;
113261
113262+#ifdef CONFIG_PAX_SEGMEXEC
113263+ struct vm_area_struct *vma_m = NULL;
113264+#endif
113265+
113266+ if (security_mmap_addr(vma->vm_start))
113267+ return -EPERM;
113268+
113269 /*
113270 * The vm_pgoff of a purely anonymous vma should be irrelevant
113271 * until its first write fault, when page's anon_vma and index
113272@@ -2882,7 +3385,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113273 security_vm_enough_memory_mm(mm, vma_pages(vma)))
113274 return -ENOMEM;
113275
113276+#ifdef CONFIG_PAX_SEGMEXEC
113277+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
113278+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113279+ if (!vma_m)
113280+ return -ENOMEM;
113281+ }
113282+#endif
113283+
113284 vma_link(mm, vma, prev, rb_link, rb_parent);
113285+
113286+#ifdef CONFIG_PAX_SEGMEXEC
113287+ if (vma_m)
113288+ BUG_ON(pax_mirror_vma(vma_m, vma));
113289+#endif
113290+
113291 return 0;
113292 }
113293
113294@@ -2901,6 +3418,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113295 struct rb_node **rb_link, *rb_parent;
113296 bool faulted_in_anon_vma = true;
113297
113298+ BUG_ON(vma->vm_mirror);
113299+
113300 /*
113301 * If anonymous vma has not yet been faulted, update new pgoff
113302 * to match new location, to increase its chance of merging.
113303@@ -2965,6 +3484,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113304 return NULL;
113305 }
113306
113307+#ifdef CONFIG_PAX_SEGMEXEC
113308+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
113309+{
113310+ struct vm_area_struct *prev_m;
113311+ struct rb_node **rb_link_m, *rb_parent_m;
113312+ struct mempolicy *pol_m;
113313+
113314+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
113315+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
113316+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
113317+ *vma_m = *vma;
113318+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
113319+ if (anon_vma_clone(vma_m, vma))
113320+ return -ENOMEM;
113321+ pol_m = vma_policy(vma_m);
113322+ mpol_get(pol_m);
113323+ set_vma_policy(vma_m, pol_m);
113324+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
113325+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
113326+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
113327+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
113328+ if (vma_m->vm_file)
113329+ get_file(vma_m->vm_file);
113330+ if (vma_m->vm_ops && vma_m->vm_ops->open)
113331+ vma_m->vm_ops->open(vma_m);
113332+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
113333+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
113334+ vma_m->vm_mirror = vma;
113335+ vma->vm_mirror = vma_m;
113336+ return 0;
113337+}
113338+#endif
113339+
113340 /*
113341 * Return true if the calling process may expand its vm space by the passed
113342 * number of pages
113343@@ -2976,6 +3528,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
113344
113345 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
113346
113347+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
113348 if (cur + npages > lim)
113349 return 0;
113350 return 1;
113351@@ -3058,6 +3611,22 @@ static struct vm_area_struct *__install_special_mapping(
113352 vma->vm_start = addr;
113353 vma->vm_end = addr + len;
113354
113355+#ifdef CONFIG_PAX_MPROTECT
113356+ if (mm->pax_flags & MF_PAX_MPROTECT) {
113357+#ifndef CONFIG_PAX_MPROTECT_COMPAT
113358+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
113359+ return ERR_PTR(-EPERM);
113360+ if (!(vm_flags & VM_EXEC))
113361+ vm_flags &= ~VM_MAYEXEC;
113362+#else
113363+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
113364+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
113365+#endif
113366+ else
113367+ vm_flags &= ~VM_MAYWRITE;
113368+ }
113369+#endif
113370+
113371 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
113372 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
113373
113374diff --git a/mm/mprotect.c b/mm/mprotect.c
113375index 8858483..72f2464 100644
113376--- a/mm/mprotect.c
113377+++ b/mm/mprotect.c
113378@@ -24,10 +24,18 @@
113379 #include <linux/migrate.h>
113380 #include <linux/perf_event.h>
113381 #include <linux/ksm.h>
113382+#include <linux/sched/sysctl.h>
113383+
113384+#ifdef CONFIG_PAX_MPROTECT
113385+#include <linux/elf.h>
113386+#include <linux/binfmts.h>
113387+#endif
113388+
113389 #include <asm/uaccess.h>
113390 #include <asm/pgtable.h>
113391 #include <asm/cacheflush.h>
113392 #include <asm/tlbflush.h>
113393+#include <asm/mmu_context.h>
113394
113395 /*
113396 * For a prot_numa update we only hold mmap_sem for read so there is a
113397@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
113398 return pages;
113399 }
113400
113401+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113402+/* called while holding the mmap semaphor for writing except stack expansion */
113403+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
113404+{
113405+ unsigned long oldlimit, newlimit = 0UL;
113406+
113407+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
113408+ return;
113409+
113410+ spin_lock(&mm->page_table_lock);
113411+ oldlimit = mm->context.user_cs_limit;
113412+ if ((prot & VM_EXEC) && oldlimit < end)
113413+ /* USER_CS limit moved up */
113414+ newlimit = end;
113415+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
113416+ /* USER_CS limit moved down */
113417+ newlimit = start;
113418+
113419+ if (newlimit) {
113420+ mm->context.user_cs_limit = newlimit;
113421+
113422+#ifdef CONFIG_SMP
113423+ wmb();
113424+ cpumask_clear(&mm->context.cpu_user_cs_mask);
113425+ cpumask_set_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask);
113426+#endif
113427+
113428+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
113429+ }
113430+ spin_unlock(&mm->page_table_lock);
113431+ if (newlimit == end) {
113432+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
113433+
113434+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
113435+ if (is_vm_hugetlb_page(vma))
113436+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
113437+ else
113438+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
113439+ }
113440+}
113441+#endif
113442+
113443 int
113444 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113445 unsigned long start, unsigned long end, unsigned long newflags)
113446@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113447 int error;
113448 int dirty_accountable = 0;
113449
113450+#ifdef CONFIG_PAX_SEGMEXEC
113451+ struct vm_area_struct *vma_m = NULL;
113452+ unsigned long start_m, end_m;
113453+
113454+ start_m = start + SEGMEXEC_TASK_SIZE;
113455+ end_m = end + SEGMEXEC_TASK_SIZE;
113456+#endif
113457+
113458 if (newflags == oldflags) {
113459 *pprev = vma;
113460 return 0;
113461 }
113462
113463+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
113464+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
113465+
113466+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
113467+ return -ENOMEM;
113468+
113469+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
113470+ return -ENOMEM;
113471+ }
113472+
113473 /*
113474 * If we make a private mapping writable we increase our commit;
113475 * but (without finer accounting) cannot reduce our commit if we
113476@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113477 }
113478 }
113479
113480+#ifdef CONFIG_PAX_SEGMEXEC
113481+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
113482+ if (start != vma->vm_start) {
113483+ error = split_vma(mm, vma, start, 1);
113484+ if (error)
113485+ goto fail;
113486+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
113487+ *pprev = (*pprev)->vm_next;
113488+ }
113489+
113490+ if (end != vma->vm_end) {
113491+ error = split_vma(mm, vma, end, 0);
113492+ if (error)
113493+ goto fail;
113494+ }
113495+
113496+ if (pax_find_mirror_vma(vma)) {
113497+ error = __do_munmap(mm, start_m, end_m - start_m);
113498+ if (error)
113499+ goto fail;
113500+ } else {
113501+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113502+ if (!vma_m) {
113503+ error = -ENOMEM;
113504+ goto fail;
113505+ }
113506+ vma->vm_flags = newflags;
113507+ error = pax_mirror_vma(vma_m, vma);
113508+ if (error) {
113509+ vma->vm_flags = oldflags;
113510+ goto fail;
113511+ }
113512+ }
113513+ }
113514+#endif
113515+
113516 /*
113517 * First try to merge with previous and/or next vma.
113518 */
113519@@ -315,7 +419,19 @@ success:
113520 * vm_flags and vm_page_prot are protected by the mmap_sem
113521 * held in write mode.
113522 */
113523+
113524+#ifdef CONFIG_PAX_SEGMEXEC
113525+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
113526+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
113527+#endif
113528+
113529 vma->vm_flags = newflags;
113530+
113531+#ifdef CONFIG_PAX_MPROTECT
113532+ if (mm->binfmt && mm->binfmt->handle_mprotect)
113533+ mm->binfmt->handle_mprotect(vma, newflags);
113534+#endif
113535+
113536 dirty_accountable = vma_wants_writenotify(vma);
113537 vma_set_page_prot(vma);
113538
113539@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113540 end = start + len;
113541 if (end <= start)
113542 return -ENOMEM;
113543+
113544+#ifdef CONFIG_PAX_SEGMEXEC
113545+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
113546+ if (end > SEGMEXEC_TASK_SIZE)
113547+ return -EINVAL;
113548+ } else
113549+#endif
113550+
113551+ if (end > TASK_SIZE)
113552+ return -EINVAL;
113553+
113554 if (!arch_validate_prot(prot))
113555 return -EINVAL;
113556
113557@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113558 /*
113559 * Does the application expect PROT_READ to imply PROT_EXEC:
113560 */
113561- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
113562+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
113563 prot |= PROT_EXEC;
113564
113565 vm_flags = calc_vm_prot_bits(prot);
113566@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113567 if (start > vma->vm_start)
113568 prev = vma;
113569
113570+#ifdef CONFIG_PAX_MPROTECT
113571+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
113572+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
113573+#endif
113574+
113575 for (nstart = start ; ; ) {
113576 unsigned long newflags;
113577
113578@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113579
113580 /* newflags >> 4 shift VM_MAY% in place of VM_% */
113581 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
113582+ if (prot & (PROT_WRITE | PROT_EXEC))
113583+ gr_log_rwxmprotect(vma);
113584+
113585+ error = -EACCES;
113586+ goto out;
113587+ }
113588+
113589+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
113590 error = -EACCES;
113591 goto out;
113592 }
113593@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113594 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
113595 if (error)
113596 goto out;
113597+
113598+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
113599+
113600 nstart = tmp;
113601
113602 if (nstart < prev->vm_end)
113603diff --git a/mm/mremap.c b/mm/mremap.c
113604index 034e2d3..81deca5 100644
113605--- a/mm/mremap.c
113606+++ b/mm/mremap.c
113607@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
113608 continue;
113609 pte = ptep_get_and_clear(mm, old_addr, old_pte);
113610 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
113611+
113612+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113613+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
113614+ pte = pte_exprotect(pte);
113615+#endif
113616+
113617 pte = move_soft_dirty_pte(pte);
113618 set_pte_at(mm, new_addr, new_pte, pte);
113619 }
113620@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
113621 if (is_vm_hugetlb_page(vma))
113622 return ERR_PTR(-EINVAL);
113623
113624+#ifdef CONFIG_PAX_SEGMEXEC
113625+ if (pax_find_mirror_vma(vma))
113626+ return ERR_PTR(-EINVAL);
113627+#endif
113628+
113629 /* We can't remap across vm area boundaries */
113630 if (old_len > vma->vm_end - addr)
113631 return ERR_PTR(-EFAULT);
113632@@ -396,20 +407,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
113633 unsigned long ret = -EINVAL;
113634 unsigned long charged = 0;
113635 unsigned long map_flags;
113636+ unsigned long pax_task_size = TASK_SIZE;
113637
113638 if (new_addr & ~PAGE_MASK)
113639 goto out;
113640
113641- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
113642+#ifdef CONFIG_PAX_SEGMEXEC
113643+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113644+ pax_task_size = SEGMEXEC_TASK_SIZE;
113645+#endif
113646+
113647+ pax_task_size -= PAGE_SIZE;
113648+
113649+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
113650 goto out;
113651
113652 /* Check if the location we're moving into overlaps the
113653 * old location at all, and fail if it does.
113654 */
113655- if ((new_addr <= addr) && (new_addr+new_len) > addr)
113656- goto out;
113657-
113658- if ((addr <= new_addr) && (addr+old_len) > new_addr)
113659+ if (addr + old_len > new_addr && new_addr + new_len > addr)
113660 goto out;
113661
113662 ret = do_munmap(mm, new_addr, new_len);
113663@@ -478,6 +494,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113664 unsigned long ret = -EINVAL;
113665 unsigned long charged = 0;
113666 bool locked = false;
113667+ unsigned long pax_task_size = TASK_SIZE;
113668
113669 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
113670 return ret;
113671@@ -499,6 +516,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113672 if (!new_len)
113673 return ret;
113674
113675+#ifdef CONFIG_PAX_SEGMEXEC
113676+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113677+ pax_task_size = SEGMEXEC_TASK_SIZE;
113678+#endif
113679+
113680+ pax_task_size -= PAGE_SIZE;
113681+
113682+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
113683+ old_len > pax_task_size || addr > pax_task_size-old_len)
113684+ return ret;
113685+
113686 down_write(&current->mm->mmap_sem);
113687
113688 if (flags & MREMAP_FIXED) {
113689@@ -549,6 +577,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113690 new_addr = addr;
113691 }
113692 ret = addr;
113693+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
113694 goto out;
113695 }
113696 }
113697@@ -572,7 +601,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113698 goto out;
113699 }
113700
113701+ map_flags = vma->vm_flags;
113702 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
113703+ if (!(ret & ~PAGE_MASK)) {
113704+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
113705+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
113706+ }
113707 }
113708 out:
113709 if (ret & ~PAGE_MASK)
113710diff --git a/mm/nommu.c b/mm/nommu.c
113711index e544508..b56ce7a 100644
113712--- a/mm/nommu.c
113713+++ b/mm/nommu.c
113714@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
113715 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
113716 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
113717 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
113718-int heap_stack_gap = 0;
113719
113720 atomic_long_t mmap_pages_allocated;
113721
113722@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
113723 EXPORT_SYMBOL(find_vma);
113724
113725 /*
113726- * find a VMA
113727- * - we don't extend stack VMAs under NOMMU conditions
113728- */
113729-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
113730-{
113731- return find_vma(mm, addr);
113732-}
113733-
113734-/*
113735 * expand a stack to a given address
113736 * - not supported under NOMMU conditions
113737 */
113738@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113739
113740 /* most fields are the same, copy all, and then fixup */
113741 *new = *vma;
113742+ INIT_LIST_HEAD(&new->anon_vma_chain);
113743 *region = *vma->vm_region;
113744 new->vm_region = region;
113745
113746@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
113747 }
113748 EXPORT_SYMBOL(filemap_map_pages);
113749
113750-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113751- unsigned long addr, void *buf, int len, int write)
113752+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113753+ unsigned long addr, void *buf, size_t len, int write)
113754 {
113755 struct vm_area_struct *vma;
113756
113757@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113758 *
113759 * The caller must hold a reference on @mm.
113760 */
113761-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113762- void *buf, int len, int write)
113763+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
113764+ void *buf, size_t len, int write)
113765 {
113766 return __access_remote_vm(NULL, mm, addr, buf, len, write);
113767 }
113768@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113769 * Access another process' address space.
113770 * - source/target buffer must be kernel space
113771 */
113772-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
113773+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
113774 {
113775 struct mm_struct *mm;
113776
113777diff --git a/mm/page-writeback.c b/mm/page-writeback.c
113778index eb59f7e..b23a2a8 100644
113779--- a/mm/page-writeback.c
113780+++ b/mm/page-writeback.c
113781@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
113782 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
113783 * - the bdi dirty thresh drops quickly due to change of JBOD workload
113784 */
113785-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
113786+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
113787 unsigned long thresh,
113788 unsigned long bg_thresh,
113789 unsigned long dirty,
113790diff --git a/mm/page_alloc.c b/mm/page_alloc.c
113791index ebffa0e..a5ae7f7 100644
113792--- a/mm/page_alloc.c
113793+++ b/mm/page_alloc.c
113794@@ -61,6 +61,7 @@
113795 #include <linux/hugetlb.h>
113796 #include <linux/sched/rt.h>
113797 #include <linux/page_owner.h>
113798+#include <linux/random.h>
113799
113800 #include <asm/sections.h>
113801 #include <asm/tlbflush.h>
113802@@ -357,7 +358,7 @@ out:
113803 * This usage means that zero-order pages may not be compound.
113804 */
113805
113806-static void free_compound_page(struct page *page)
113807+void free_compound_page(struct page *page)
113808 {
113809 __free_pages_ok(page, compound_order(page));
113810 }
113811@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
113812 __mod_zone_freepage_state(zone, (1 << order), migratetype);
113813 }
113814 #else
113815-struct page_ext_operations debug_guardpage_ops = { NULL, };
113816+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
113817 static inline void set_page_guard(struct zone *zone, struct page *page,
113818 unsigned int order, int migratetype) {}
113819 static inline void clear_page_guard(struct zone *zone, struct page *page,
113820@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113821 bool compound = PageCompound(page);
113822 int i, bad = 0;
113823
113824+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113825+ unsigned long index = 1UL << order;
113826+#endif
113827+
113828 VM_BUG_ON_PAGE(PageTail(page), page);
113829 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
113830
113831@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113832 debug_check_no_obj_freed(page_address(page),
113833 PAGE_SIZE << order);
113834 }
113835+
113836+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113837+ for (; index; --index)
113838+ sanitize_highpage(page + index - 1);
113839+#endif
113840+
113841 arch_free_page(page, order);
113842 kernel_map_pages(page, 1 << order, 0);
113843
113844@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
113845 local_irq_restore(flags);
113846 }
113847
113848+#ifdef CONFIG_PAX_LATENT_ENTROPY
113849+bool __meminitdata extra_latent_entropy;
113850+
113851+static int __init setup_pax_extra_latent_entropy(char *str)
113852+{
113853+ extra_latent_entropy = true;
113854+ return 0;
113855+}
113856+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
113857+
113858+volatile u64 latent_entropy __latent_entropy;
113859+EXPORT_SYMBOL(latent_entropy);
113860+#endif
113861+
113862 void __init __free_pages_bootmem(struct page *page, unsigned int order)
113863 {
113864 unsigned int nr_pages = 1 << order;
113865@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
113866 __ClearPageReserved(p);
113867 set_page_count(p, 0);
113868
113869+#ifdef CONFIG_PAX_LATENT_ENTROPY
113870+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
113871+ u64 hash = 0;
113872+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
113873+ const u64 *data = lowmem_page_address(page);
113874+
113875+ for (index = 0; index < end; index++)
113876+ hash ^= hash + data[index];
113877+ latent_entropy ^= hash;
113878+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
113879+ }
113880+#endif
113881+
113882 page_zone(page)->managed_pages += nr_pages;
113883 set_page_refcounted(page);
113884 __free_pages(page, order);
113885@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
113886 kernel_map_pages(page, 1 << order, 1);
113887 kasan_alloc_pages(page, order);
113888
113889+#ifndef CONFIG_PAX_MEMORY_SANITIZE
113890 if (gfp_flags & __GFP_ZERO)
113891 prep_zero_page(page, order, gfp_flags);
113892+#endif
113893
113894 if (order && (gfp_flags & __GFP_COMP))
113895 prep_compound_page(page, order);
113896@@ -983,12 +1023,15 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
113897 set_page_owner(page, order, gfp_flags);
113898
113899 /*
113900- * page->pfmemalloc is set when ALLOC_NO_WATERMARKS was necessary to
113901+ * page is set pfmemalloc when ALLOC_NO_WATERMARKS was necessary to
113902 * allocate the page. The expectation is that the caller is taking
113903 * steps that will free more memory. The caller should avoid the page
113904 * being used for !PFMEMALLOC purposes.
113905 */
113906- page->pfmemalloc = !!(alloc_flags & ALLOC_NO_WATERMARKS);
113907+ if (alloc_flags & ALLOC_NO_WATERMARKS)
113908+ set_page_pfmemalloc(page);
113909+ else
113910+ clear_page_pfmemalloc(page);
113911
113912 return 0;
113913 }
113914@@ -1649,6 +1692,8 @@ int __isolate_free_page(struct page *page, unsigned int order)
113915 zone->free_area[order].nr_free--;
113916 rmv_page_order(page);
113917
113918+ set_page_owner(page, order, 0);
113919+
113920 /* Set the pageblock if the isolated page is at least a pageblock */
113921 if (order >= pageblock_order - 1) {
113922 struct page *endpage = page + (1 << order) - 1;
113923@@ -1660,7 +1705,7 @@ int __isolate_free_page(struct page *page, unsigned int order)
113924 }
113925 }
113926
113927- set_page_owner(page, order, 0);
113928+
113929 return 1UL << order;
113930 }
113931
113932@@ -1749,7 +1794,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
113933 }
113934
113935 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
113936- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
113937+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
113938 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
113939 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
113940
113941@@ -2068,7 +2113,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
113942 do {
113943 mod_zone_page_state(zone, NR_ALLOC_BATCH,
113944 high_wmark_pages(zone) - low_wmark_pages(zone) -
113945- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
113946+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
113947 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
113948 } while (zone++ != preferred_zone);
113949 }
113950@@ -5781,7 +5826,7 @@ static void __setup_per_zone_wmarks(void)
113951
113952 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
113953 high_wmark_pages(zone) - low_wmark_pages(zone) -
113954- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
113955+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
113956
113957 setup_zone_migrate_reserve(zone);
113958 spin_unlock_irqrestore(&zone->lock, flags);
113959diff --git a/mm/percpu.c b/mm/percpu.c
113960index 2dd7448..9bb6305 100644
113961--- a/mm/percpu.c
113962+++ b/mm/percpu.c
113963@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
113964 static unsigned int pcpu_high_unit_cpu __read_mostly;
113965
113966 /* the address of the first chunk which starts with the kernel static area */
113967-void *pcpu_base_addr __read_mostly;
113968+void *pcpu_base_addr __read_only;
113969 EXPORT_SYMBOL_GPL(pcpu_base_addr);
113970
113971 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
113972diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
113973index e88d071..d80e01a 100644
113974--- a/mm/process_vm_access.c
113975+++ b/mm/process_vm_access.c
113976@@ -13,6 +13,7 @@
113977 #include <linux/uio.h>
113978 #include <linux/sched.h>
113979 #include <linux/highmem.h>
113980+#include <linux/security.h>
113981 #include <linux/ptrace.h>
113982 #include <linux/slab.h>
113983 #include <linux/syscalls.h>
113984@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
113985 ssize_t iov_len;
113986 size_t total_len = iov_iter_count(iter);
113987
113988+ return -ENOSYS; // PaX: until properly audited
113989+
113990 /*
113991 * Work out how many pages of struct pages we're going to need
113992 * when eventually calling get_user_pages
113993 */
113994 for (i = 0; i < riovcnt; i++) {
113995 iov_len = rvec[i].iov_len;
113996- if (iov_len > 0) {
113997- nr_pages_iov = ((unsigned long)rvec[i].iov_base
113998- + iov_len)
113999- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
114000- / PAGE_SIZE + 1;
114001- nr_pages = max(nr_pages, nr_pages_iov);
114002- }
114003+ if (iov_len <= 0)
114004+ continue;
114005+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
114006+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
114007+ nr_pages = max(nr_pages, nr_pages_iov);
114008 }
114009
114010 if (nr_pages == 0)
114011@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
114012 goto free_proc_pages;
114013 }
114014
114015+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
114016+ rc = -EPERM;
114017+ goto put_task_struct;
114018+ }
114019+
114020 mm = mm_access(task, PTRACE_MODE_ATTACH);
114021 if (!mm || IS_ERR(mm)) {
114022 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
114023diff --git a/mm/rmap.c b/mm/rmap.c
114024index 24dd3f9..4eb43f4 100644
114025--- a/mm/rmap.c
114026+++ b/mm/rmap.c
114027@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114028 struct anon_vma *anon_vma = vma->anon_vma;
114029 struct anon_vma_chain *avc;
114030
114031+#ifdef CONFIG_PAX_SEGMEXEC
114032+ struct anon_vma_chain *avc_m = NULL;
114033+#endif
114034+
114035 might_sleep();
114036 if (unlikely(!anon_vma)) {
114037 struct mm_struct *mm = vma->vm_mm;
114038@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114039 if (!avc)
114040 goto out_enomem;
114041
114042+#ifdef CONFIG_PAX_SEGMEXEC
114043+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
114044+ if (!avc_m)
114045+ goto out_enomem_free_avc;
114046+#endif
114047+
114048 anon_vma = find_mergeable_anon_vma(vma);
114049 allocated = NULL;
114050 if (!anon_vma) {
114051@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114052 /* page_table_lock to protect against threads */
114053 spin_lock(&mm->page_table_lock);
114054 if (likely(!vma->anon_vma)) {
114055+
114056+#ifdef CONFIG_PAX_SEGMEXEC
114057+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
114058+
114059+ if (vma_m) {
114060+ BUG_ON(vma_m->anon_vma);
114061+ vma_m->anon_vma = anon_vma;
114062+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
114063+ anon_vma->degree++;
114064+ avc_m = NULL;
114065+ }
114066+#endif
114067+
114068 vma->anon_vma = anon_vma;
114069 anon_vma_chain_link(vma, avc, anon_vma);
114070 /* vma reference or self-parent link for new root */
114071@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114072
114073 if (unlikely(allocated))
114074 put_anon_vma(allocated);
114075+
114076+#ifdef CONFIG_PAX_SEGMEXEC
114077+ if (unlikely(avc_m))
114078+ anon_vma_chain_free(avc_m);
114079+#endif
114080+
114081 if (unlikely(avc))
114082 anon_vma_chain_free(avc);
114083 }
114084 return 0;
114085
114086 out_enomem_free_avc:
114087+
114088+#ifdef CONFIG_PAX_SEGMEXEC
114089+ if (avc_m)
114090+ anon_vma_chain_free(avc_m);
114091+#endif
114092+
114093 anon_vma_chain_free(avc);
114094 out_enomem:
114095 return -ENOMEM;
114096@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
114097 * good chance of avoiding scanning the whole hierarchy when it searches where
114098 * page is mapped.
114099 */
114100-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114101+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
114102 {
114103 struct anon_vma_chain *avc, *pavc;
114104 struct anon_vma *root = NULL;
114105@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114106 * the corresponding VMA in the parent process is attached to.
114107 * Returns 0 on success, non-zero on failure.
114108 */
114109-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
114110+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
114111 {
114112 struct anon_vma_chain *avc;
114113 struct anon_vma *anon_vma;
114114@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
114115 void __init anon_vma_init(void)
114116 {
114117 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
114118- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
114119- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
114120+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
114121+ anon_vma_ctor);
114122+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
114123+ SLAB_PANIC|SLAB_NO_SANITIZE);
114124 }
114125
114126 /*
114127diff --git a/mm/shmem.c b/mm/shmem.c
114128index 47d536e..8321b4e 100644
114129--- a/mm/shmem.c
114130+++ b/mm/shmem.c
114131@@ -33,7 +33,7 @@
114132 #include <linux/swap.h>
114133 #include <linux/uio.h>
114134
114135-static struct vfsmount *shm_mnt;
114136+struct vfsmount *shm_mnt;
114137
114138 #ifdef CONFIG_SHMEM
114139 /*
114140@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
114141 #define BOGO_DIRENT_SIZE 20
114142
114143 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
114144-#define SHORT_SYMLINK_LEN 128
114145+#define SHORT_SYMLINK_LEN 64
114146
114147 /*
114148 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
114149@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
114150 static int shmem_xattr_validate(const char *name)
114151 {
114152 struct { const char *prefix; size_t len; } arr[] = {
114153+
114154+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114155+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
114156+#endif
114157+
114158 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
114159 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
114160 };
114161@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
114162 if (err)
114163 return err;
114164
114165+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114166+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
114167+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
114168+ return -EOPNOTSUPP;
114169+ if (size > 8)
114170+ return -EINVAL;
114171+ }
114172+#endif
114173+
114174 return simple_xattr_set(&info->xattrs, name, value, size, flags);
114175 }
114176
114177@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
114178 int err = -ENOMEM;
114179
114180 /* Round up to L1_CACHE_BYTES to resist false sharing */
114181- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
114182- L1_CACHE_BYTES), GFP_KERNEL);
114183+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
114184 if (!sbinfo)
114185 return -ENOMEM;
114186
114187diff --git a/mm/slab.c b/mm/slab.c
114188index 7eb38dd..0451459 100644
114189--- a/mm/slab.c
114190+++ b/mm/slab.c
114191@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114192 if ((x)->max_freeable < i) \
114193 (x)->max_freeable = i; \
114194 } while (0)
114195-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
114196-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
114197-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
114198-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
114199+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
114200+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
114201+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
114202+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
114203+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
114204+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
114205 #else
114206 #define STATS_INC_ACTIVE(x) do { } while (0)
114207 #define STATS_DEC_ACTIVE(x) do { } while (0)
114208@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114209 #define STATS_INC_ALLOCMISS(x) do { } while (0)
114210 #define STATS_INC_FREEHIT(x) do { } while (0)
114211 #define STATS_INC_FREEMISS(x) do { } while (0)
114212+#define STATS_INC_SANITIZED(x) do { } while (0)
114213+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
114214 #endif
114215
114216 #if DEBUG
114217@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
114218 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
114219 */
114220 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
114221- const struct page *page, void *obj)
114222+ const struct page *page, const void *obj)
114223 {
114224 u32 offset = (obj - page->s_mem);
114225 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
114226@@ -1452,7 +1456,7 @@ void __init kmem_cache_init(void)
114227 * structures first. Without this, further allocations will bug.
114228 */
114229 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
114230- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
114231+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
114232 slab_state = PARTIAL_NODE;
114233
114234 slab_early_init = 0;
114235@@ -1602,7 +1606,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
114236 }
114237
114238 /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */
114239- if (unlikely(page->pfmemalloc))
114240+ if (page_is_pfmemalloc(page))
114241 pfmemalloc_active = true;
114242
114243 nr_pages = (1 << cachep->gfporder);
114244@@ -1613,7 +1617,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
114245 add_zone_page_state(page_zone(page),
114246 NR_SLAB_UNRECLAIMABLE, nr_pages);
114247 __SetPageSlab(page);
114248- if (page->pfmemalloc)
114249+ if (page_is_pfmemalloc(page))
114250 SetPageSlabPfmemalloc(page);
114251
114252 if (kmemcheck_enabled && !(cachep->flags & SLAB_NOTRACK)) {
114253@@ -2073,7 +2077,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
114254
114255 cachep = find_mergeable(size, align, flags, name, ctor);
114256 if (cachep) {
114257- cachep->refcount++;
114258+ atomic_inc(&cachep->refcount);
114259
114260 /*
114261 * Adjust the object sizes so that we clear
114262@@ -3371,6 +3375,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
114263 struct array_cache *ac = cpu_cache_get(cachep);
114264
114265 check_irq_off();
114266+
114267+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114268+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
114269+ STATS_INC_NOT_SANITIZED(cachep);
114270+ else {
114271+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
114272+
114273+ if (cachep->ctor)
114274+ cachep->ctor(objp);
114275+
114276+ STATS_INC_SANITIZED(cachep);
114277+ }
114278+#endif
114279+
114280 kmemleak_free_recursive(objp, cachep->flags);
114281 objp = cache_free_debugcheck(cachep, objp, caller);
114282
114283@@ -3483,7 +3501,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
114284 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
114285 }
114286
114287-void *__kmalloc_node(size_t size, gfp_t flags, int node)
114288+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
114289 {
114290 return __do_kmalloc_node(size, flags, node, _RET_IP_);
114291 }
114292@@ -3503,7 +3521,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
114293 * @flags: the type of memory to allocate (see kmalloc).
114294 * @caller: function caller for debug tracking of the caller
114295 */
114296-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
114297+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
114298 unsigned long caller)
114299 {
114300 struct kmem_cache *cachep;
114301@@ -3576,6 +3594,7 @@ void kfree(const void *objp)
114302
114303 if (unlikely(ZERO_OR_NULL_PTR(objp)))
114304 return;
114305+ VM_BUG_ON(!virt_addr_valid(objp));
114306 local_irq_save(flags);
114307 kfree_debugcheck(objp);
114308 c = virt_to_cache(objp);
114309@@ -3995,14 +4014,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
114310 }
114311 /* cpu stats */
114312 {
114313- unsigned long allochit = atomic_read(&cachep->allochit);
114314- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
114315- unsigned long freehit = atomic_read(&cachep->freehit);
114316- unsigned long freemiss = atomic_read(&cachep->freemiss);
114317+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
114318+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
114319+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
114320+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
114321
114322 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
114323 allochit, allocmiss, freehit, freemiss);
114324 }
114325+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114326+ {
114327+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
114328+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
114329+
114330+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
114331+ }
114332+#endif
114333 #endif
114334 }
114335
114336@@ -4210,13 +4237,80 @@ static const struct file_operations proc_slabstats_operations = {
114337 static int __init slab_proc_init(void)
114338 {
114339 #ifdef CONFIG_DEBUG_SLAB_LEAK
114340- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
114341+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
114342 #endif
114343 return 0;
114344 }
114345 module_init(slab_proc_init);
114346 #endif
114347
114348+bool is_usercopy_object(const void *ptr)
114349+{
114350+ struct page *page;
114351+ struct kmem_cache *cachep;
114352+
114353+ if (ZERO_OR_NULL_PTR(ptr))
114354+ return false;
114355+
114356+ if (!slab_is_available())
114357+ return false;
114358+
114359+ if (is_vmalloc_addr(ptr)
114360+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
114361+ && !object_starts_on_stack(ptr)
114362+#endif
114363+ ) {
114364+ struct vm_struct *vm = find_vm_area(ptr);
114365+ if (vm && (vm->flags & VM_USERCOPY))
114366+ return true;
114367+ return false;
114368+ }
114369+
114370+ if (!virt_addr_valid(ptr))
114371+ return false;
114372+
114373+ page = virt_to_head_page(ptr);
114374+
114375+ if (!PageSlab(page))
114376+ return false;
114377+
114378+ cachep = page->slab_cache;
114379+ return cachep->flags & SLAB_USERCOPY;
114380+}
114381+
114382+#ifdef CONFIG_PAX_USERCOPY
114383+const char *check_heap_object(const void *ptr, unsigned long n)
114384+{
114385+ struct page *page;
114386+ struct kmem_cache *cachep;
114387+ unsigned int objnr;
114388+ unsigned long offset;
114389+
114390+ if (ZERO_OR_NULL_PTR(ptr))
114391+ return "<null>";
114392+
114393+ if (!virt_addr_valid(ptr))
114394+ return NULL;
114395+
114396+ page = virt_to_head_page(ptr);
114397+
114398+ if (!PageSlab(page))
114399+ return NULL;
114400+
114401+ cachep = page->slab_cache;
114402+ if (!(cachep->flags & SLAB_USERCOPY))
114403+ return cachep->name;
114404+
114405+ objnr = obj_to_index(cachep, page, ptr);
114406+ BUG_ON(objnr >= cachep->num);
114407+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
114408+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
114409+ return NULL;
114410+
114411+ return cachep->name;
114412+}
114413+#endif
114414+
114415 /**
114416 * ksize - get the actual amount of memory allocated for a given object
114417 * @objp: Pointer to the object
114418diff --git a/mm/slab.h b/mm/slab.h
114419index 4c3ac12..7b2e470 100644
114420--- a/mm/slab.h
114421+++ b/mm/slab.h
114422@@ -22,7 +22,7 @@ struct kmem_cache {
114423 unsigned int align; /* Alignment as calculated */
114424 unsigned long flags; /* Active flags on the slab */
114425 const char *name; /* Slab name for sysfs */
114426- int refcount; /* Use counter */
114427+ atomic_t refcount; /* Use counter */
114428 void (*ctor)(void *); /* Called on object slot creation */
114429 struct list_head list; /* List of all slab caches on the system */
114430 };
114431@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
114432 /* The slab cache that manages slab cache information */
114433 extern struct kmem_cache *kmem_cache;
114434
114435+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114436+#ifdef CONFIG_X86_64
114437+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
114438+#else
114439+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
114440+#endif
114441+enum pax_sanitize_mode {
114442+ PAX_SANITIZE_SLAB_OFF = 0,
114443+ PAX_SANITIZE_SLAB_FAST,
114444+ PAX_SANITIZE_SLAB_FULL,
114445+};
114446+extern enum pax_sanitize_mode pax_sanitize_slab;
114447+#endif
114448+
114449 unsigned long calculate_alignment(unsigned long flags,
114450 unsigned long align, unsigned long size);
114451
114452@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
114453
114454 /* Legal flag mask for kmem_cache_create(), for various configurations */
114455 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
114456- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
114457+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
114458+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
114459
114460 #if defined(CONFIG_DEBUG_SLAB)
114461 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
114462@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
114463 return s;
114464
114465 page = virt_to_head_page(x);
114466+
114467+ BUG_ON(!PageSlab(page));
114468+
114469 cachep = page->slab_cache;
114470 if (slab_equal_or_root(cachep, s))
114471 return cachep;
114472diff --git a/mm/slab_common.c b/mm/slab_common.c
114473index 999bb34..9843aea 100644
114474--- a/mm/slab_common.c
114475+++ b/mm/slab_common.c
114476@@ -25,11 +25,35 @@
114477
114478 #include "slab.h"
114479
114480-enum slab_state slab_state;
114481+enum slab_state slab_state __read_only;
114482 LIST_HEAD(slab_caches);
114483 DEFINE_MUTEX(slab_mutex);
114484 struct kmem_cache *kmem_cache;
114485
114486+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114487+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
114488+static int __init pax_sanitize_slab_setup(char *str)
114489+{
114490+ if (!str)
114491+ return 0;
114492+
114493+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
114494+ pr_info("PaX slab sanitization: %s\n", "disabled");
114495+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
114496+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
114497+ pr_info("PaX slab sanitization: %s\n", "fast");
114498+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
114499+ } else if (!strcmp(str, "full")) {
114500+ pr_info("PaX slab sanitization: %s\n", "full");
114501+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
114502+ } else
114503+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
114504+
114505+ return 0;
114506+}
114507+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
114508+#endif
114509+
114510 /*
114511 * Set of flags that will prevent slab merging
114512 */
114513@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
114514 * Merge control. If this is set then no merging of slab caches will occur.
114515 * (Could be removed. This was introduced to pacify the merge skeptics.)
114516 */
114517-static int slab_nomerge;
114518+static int slab_nomerge = 1;
114519
114520 static int __init setup_slab_nomerge(char *str)
114521 {
114522@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
114523 /*
114524 * We may have set a slab to be unmergeable during bootstrap.
114525 */
114526- if (s->refcount < 0)
114527+ if (atomic_read(&s->refcount) < 0)
114528 return 1;
114529
114530 return 0;
114531@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
114532 if (err)
114533 goto out_free_cache;
114534
114535- s->refcount = 1;
114536+ atomic_set(&s->refcount, 1);
114537 list_add(&s->list, &slab_caches);
114538 out:
114539 if (err)
114540@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
114541 */
114542 flags &= CACHE_CREATE_MASK;
114543
114544+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114545+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
114546+ flags |= SLAB_NO_SANITIZE;
114547+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
114548+ flags &= ~SLAB_NO_SANITIZE;
114549+#endif
114550+
114551 s = __kmem_cache_alias(name, size, align, flags, ctor);
114552 if (s)
114553 goto out_unlock;
114554@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
114555 rcu_barrier();
114556
114557 list_for_each_entry_safe(s, s2, release, list) {
114558-#ifdef SLAB_SUPPORTS_SYSFS
114559+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
114560 sysfs_slab_remove(s);
114561 #else
114562 slab_kmem_cache_release(s);
114563@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
114564
114565 mutex_lock(&slab_mutex);
114566
114567- s->refcount--;
114568- if (s->refcount)
114569+ if (!atomic_dec_and_test(&s->refcount))
114570 goto out_unlock;
114571
114572 for_each_memcg_cache_safe(c, c2, s) {
114573@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
114574 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
114575 name, size, err);
114576
114577- s->refcount = -1; /* Exempt from merging for now */
114578+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
114579 }
114580
114581 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114582@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114583
114584 create_boot_cache(s, name, size, flags);
114585 list_add(&s->list, &slab_caches);
114586- s->refcount = 1;
114587+ atomic_set(&s->refcount, 1);
114588 return s;
114589 }
114590
114591@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
114592 EXPORT_SYMBOL(kmalloc_dma_caches);
114593 #endif
114594
114595+#ifdef CONFIG_PAX_USERCOPY_SLABS
114596+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
114597+EXPORT_SYMBOL(kmalloc_usercopy_caches);
114598+#endif
114599+
114600 /*
114601 * Conversion table for small slabs sizes / 8 to the index in the
114602 * kmalloc array. This is necessary for slabs < 192 since we have non power
114603@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
114604 return kmalloc_dma_caches[index];
114605
114606 #endif
114607+
114608+#ifdef CONFIG_PAX_USERCOPY_SLABS
114609+ if (unlikely((flags & GFP_USERCOPY)))
114610+ return kmalloc_usercopy_caches[index];
114611+
114612+#endif
114613+
114614 return kmalloc_caches[index];
114615 }
114616
114617@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
114618 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
114619 if (!kmalloc_caches[i]) {
114620 kmalloc_caches[i] = create_kmalloc_cache(NULL,
114621- 1 << i, flags);
114622+ 1 << i, SLAB_USERCOPY | flags);
114623 }
114624
114625 /*
114626@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
114627 * earlier power of two caches
114628 */
114629 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
114630- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
114631+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
114632
114633 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
114634- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
114635+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
114636 }
114637
114638 /* Kmalloc array is now usable */
114639@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
114640 }
114641 }
114642 #endif
114643+
114644+#ifdef CONFIG_PAX_USERCOPY_SLABS
114645+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
114646+ struct kmem_cache *s = kmalloc_caches[i];
114647+
114648+ if (s) {
114649+ int size = kmalloc_size(i);
114650+ char *n = kasprintf(GFP_NOWAIT,
114651+ "usercopy-kmalloc-%d", size);
114652+
114653+ BUG_ON(!n);
114654+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
114655+ size, SLAB_USERCOPY | flags);
114656+ }
114657+ }
114658+#endif
114659+
114660 }
114661 #endif /* !CONFIG_SLOB */
114662
114663@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
114664 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
114665 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
114666 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
114667+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114668+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
114669+#endif
114670 #endif
114671 seq_putc(m, '\n');
114672 }
114673@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
114674 module_init(slab_proc_init);
114675 #endif /* CONFIG_SLABINFO */
114676
114677-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
114678+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
114679 gfp_t flags)
114680 {
114681 void *ret;
114682diff --git a/mm/slob.c b/mm/slob.c
114683index 4765f65..f17284d 100644
114684--- a/mm/slob.c
114685+++ b/mm/slob.c
114686@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
114687 /*
114688 * Return the size of a slob block.
114689 */
114690-static slobidx_t slob_units(slob_t *s)
114691+static slobidx_t slob_units(const slob_t *s)
114692 {
114693 if (s->units > 0)
114694 return s->units;
114695@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
114696 /*
114697 * Return the next free slob block pointer after this one.
114698 */
114699-static slob_t *slob_next(slob_t *s)
114700+static slob_t *slob_next(const slob_t *s)
114701 {
114702 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
114703 slobidx_t next;
114704@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
114705 /*
114706 * Returns true if s is the last free block in its page.
114707 */
114708-static int slob_last(slob_t *s)
114709+static int slob_last(const slob_t *s)
114710 {
114711 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
114712 }
114713
114714-static void *slob_new_pages(gfp_t gfp, int order, int node)
114715+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
114716 {
114717- void *page;
114718+ struct page *page;
114719
114720 #ifdef CONFIG_NUMA
114721 if (node != NUMA_NO_NODE)
114722@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
114723 if (!page)
114724 return NULL;
114725
114726- return page_address(page);
114727+ __SetPageSlab(page);
114728+ return page;
114729 }
114730
114731-static void slob_free_pages(void *b, int order)
114732+static void slob_free_pages(struct page *sp, int order)
114733 {
114734 if (current->reclaim_state)
114735 current->reclaim_state->reclaimed_slab += 1 << order;
114736- free_pages((unsigned long)b, order);
114737+ __ClearPageSlab(sp);
114738+ page_mapcount_reset(sp);
114739+ sp->private = 0;
114740+ __free_pages(sp, order);
114741 }
114742
114743 /*
114744@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114745
114746 /* Not enough space: must allocate a new page */
114747 if (!b) {
114748- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114749- if (!b)
114750+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114751+ if (!sp)
114752 return NULL;
114753- sp = virt_to_page(b);
114754- __SetPageSlab(sp);
114755+ b = page_address(sp);
114756
114757 spin_lock_irqsave(&slob_lock, flags);
114758 sp->units = SLOB_UNITS(PAGE_SIZE);
114759 sp->freelist = b;
114760+ sp->private = 0;
114761 INIT_LIST_HEAD(&sp->lru);
114762 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
114763 set_slob_page_free(sp, slob_list);
114764@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114765 /*
114766 * slob_free: entry point into the slob allocator.
114767 */
114768-static void slob_free(void *block, int size)
114769+static void slob_free(struct kmem_cache *c, void *block, int size)
114770 {
114771 struct page *sp;
114772 slob_t *prev, *next, *b = (slob_t *)block;
114773@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
114774 if (slob_page_free(sp))
114775 clear_slob_page_free(sp);
114776 spin_unlock_irqrestore(&slob_lock, flags);
114777- __ClearPageSlab(sp);
114778- page_mapcount_reset(sp);
114779- slob_free_pages(b, 0);
114780+ slob_free_pages(sp, 0);
114781 return;
114782 }
114783
114784+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114785+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
114786+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
114787+#endif
114788+
114789 if (!slob_page_free(sp)) {
114790 /* This slob page is about to become partially free. Easy! */
114791 sp->units = units;
114792@@ -424,11 +431,10 @@ out:
114793 */
114794
114795 static __always_inline void *
114796-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114797+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
114798 {
114799- unsigned int *m;
114800- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114801- void *ret;
114802+ slob_t *m;
114803+ void *ret = NULL;
114804
114805 gfp &= gfp_allowed_mask;
114806
114807@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114808
114809 if (!m)
114810 return NULL;
114811- *m = size;
114812+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
114813+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
114814+ m[0].units = size;
114815+ m[1].units = align;
114816 ret = (void *)m + align;
114817
114818 trace_kmalloc_node(caller, ret,
114819 size, size + align, gfp, node);
114820 } else {
114821 unsigned int order = get_order(size);
114822+ struct page *page;
114823
114824 if (likely(order))
114825 gfp |= __GFP_COMP;
114826- ret = slob_new_pages(gfp, order, node);
114827+ page = slob_new_pages(gfp, order, node);
114828+ if (page) {
114829+ ret = page_address(page);
114830+ page->private = size;
114831+ }
114832
114833 trace_kmalloc_node(caller, ret,
114834 size, PAGE_SIZE << order, gfp, node);
114835 }
114836
114837- kmemleak_alloc(ret, size, 1, gfp);
114838 return ret;
114839 }
114840
114841-void *__kmalloc(size_t size, gfp_t gfp)
114842+static __always_inline void *
114843+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114844+{
114845+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114846+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
114847+
114848+ if (!ZERO_OR_NULL_PTR(ret))
114849+ kmemleak_alloc(ret, size, 1, gfp);
114850+ return ret;
114851+}
114852+
114853+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
114854 {
114855 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
114856 }
114857@@ -491,34 +515,123 @@ void kfree(const void *block)
114858 return;
114859 kmemleak_free(block);
114860
114861+ VM_BUG_ON(!virt_addr_valid(block));
114862 sp = virt_to_page(block);
114863- if (PageSlab(sp)) {
114864+ VM_BUG_ON(!PageSlab(sp));
114865+ if (!sp->private) {
114866 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114867- unsigned int *m = (unsigned int *)(block - align);
114868- slob_free(m, *m + align);
114869- } else
114870+ slob_t *m = (slob_t *)(block - align);
114871+ slob_free(NULL, m, m[0].units + align);
114872+ } else {
114873+ __ClearPageSlab(sp);
114874+ page_mapcount_reset(sp);
114875+ sp->private = 0;
114876 __free_pages(sp, compound_order(sp));
114877+ }
114878 }
114879 EXPORT_SYMBOL(kfree);
114880
114881+bool is_usercopy_object(const void *ptr)
114882+{
114883+ if (!slab_is_available())
114884+ return false;
114885+
114886+ if (is_vmalloc_addr(ptr)
114887+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
114888+ && !object_starts_on_stack(ptr)
114889+#endif
114890+ ) {
114891+ struct vm_struct *vm = find_vm_area(ptr);
114892+ if (vm && (vm->flags & VM_USERCOPY))
114893+ return true;
114894+ return false;
114895+ }
114896+
114897+ // PAX: TODO
114898+
114899+ return false;
114900+}
114901+
114902+#ifdef CONFIG_PAX_USERCOPY
114903+const char *check_heap_object(const void *ptr, unsigned long n)
114904+{
114905+ struct page *page;
114906+ const slob_t *free;
114907+ const void *base;
114908+ unsigned long flags;
114909+
114910+ if (ZERO_OR_NULL_PTR(ptr))
114911+ return "<null>";
114912+
114913+ if (!virt_addr_valid(ptr))
114914+ return NULL;
114915+
114916+ page = virt_to_head_page(ptr);
114917+ if (!PageSlab(page))
114918+ return NULL;
114919+
114920+ if (page->private) {
114921+ base = page;
114922+ if (base <= ptr && n <= page->private - (ptr - base))
114923+ return NULL;
114924+ return "<slob>";
114925+ }
114926+
114927+ /* some tricky double walking to find the chunk */
114928+ spin_lock_irqsave(&slob_lock, flags);
114929+ base = (void *)((unsigned long)ptr & PAGE_MASK);
114930+ free = page->freelist;
114931+
114932+ while (!slob_last(free) && (void *)free <= ptr) {
114933+ base = free + slob_units(free);
114934+ free = slob_next(free);
114935+ }
114936+
114937+ while (base < (void *)free) {
114938+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
114939+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
114940+ int offset;
114941+
114942+ if (ptr < base + align)
114943+ break;
114944+
114945+ offset = ptr - base - align;
114946+ if (offset >= m) {
114947+ base += size;
114948+ continue;
114949+ }
114950+
114951+ if (n > m - offset)
114952+ break;
114953+
114954+ spin_unlock_irqrestore(&slob_lock, flags);
114955+ return NULL;
114956+ }
114957+
114958+ spin_unlock_irqrestore(&slob_lock, flags);
114959+ return "<slob>";
114960+}
114961+#endif
114962+
114963 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
114964 size_t ksize(const void *block)
114965 {
114966 struct page *sp;
114967 int align;
114968- unsigned int *m;
114969+ slob_t *m;
114970
114971 BUG_ON(!block);
114972 if (unlikely(block == ZERO_SIZE_PTR))
114973 return 0;
114974
114975 sp = virt_to_page(block);
114976- if (unlikely(!PageSlab(sp)))
114977- return PAGE_SIZE << compound_order(sp);
114978+ VM_BUG_ON(!PageSlab(sp));
114979+ if (sp->private)
114980+ return sp->private;
114981
114982 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114983- m = (unsigned int *)(block - align);
114984- return SLOB_UNITS(*m) * SLOB_UNIT;
114985+ m = (slob_t *)(block - align);
114986+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
114987 }
114988 EXPORT_SYMBOL(ksize);
114989
114990@@ -534,23 +647,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
114991
114992 static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
114993 {
114994- void *b;
114995+ void *b = NULL;
114996
114997 flags &= gfp_allowed_mask;
114998
114999 lockdep_trace_alloc(flags);
115000
115001+#ifdef CONFIG_PAX_USERCOPY_SLABS
115002+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
115003+#else
115004 if (c->size < PAGE_SIZE) {
115005 b = slob_alloc(c->size, flags, c->align, node);
115006 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115007 SLOB_UNITS(c->size) * SLOB_UNIT,
115008 flags, node);
115009 } else {
115010- b = slob_new_pages(flags, get_order(c->size), node);
115011+ struct page *sp;
115012+
115013+ sp = slob_new_pages(flags, get_order(c->size), node);
115014+ if (sp) {
115015+ b = page_address(sp);
115016+ sp->private = c->size;
115017+ }
115018 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115019 PAGE_SIZE << get_order(c->size),
115020 flags, node);
115021 }
115022+#endif
115023
115024 if (b && c->ctor)
115025 c->ctor(b);
115026@@ -566,7 +689,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
115027 EXPORT_SYMBOL(kmem_cache_alloc);
115028
115029 #ifdef CONFIG_NUMA
115030-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
115031+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
115032 {
115033 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
115034 }
115035@@ -579,12 +702,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
115036 EXPORT_SYMBOL(kmem_cache_alloc_node);
115037 #endif
115038
115039-static void __kmem_cache_free(void *b, int size)
115040+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
115041 {
115042- if (size < PAGE_SIZE)
115043- slob_free(b, size);
115044+ struct page *sp;
115045+
115046+ sp = virt_to_page(b);
115047+ BUG_ON(!PageSlab(sp));
115048+ if (!sp->private)
115049+ slob_free(c, b, size);
115050 else
115051- slob_free_pages(b, get_order(size));
115052+ slob_free_pages(sp, get_order(size));
115053 }
115054
115055 static void kmem_rcu_free(struct rcu_head *head)
115056@@ -592,22 +719,36 @@ static void kmem_rcu_free(struct rcu_head *head)
115057 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
115058 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
115059
115060- __kmem_cache_free(b, slob_rcu->size);
115061+ __kmem_cache_free(NULL, b, slob_rcu->size);
115062 }
115063
115064 void kmem_cache_free(struct kmem_cache *c, void *b)
115065 {
115066+ int size = c->size;
115067+
115068+#ifdef CONFIG_PAX_USERCOPY_SLABS
115069+ if (size + c->align < PAGE_SIZE) {
115070+ size += c->align;
115071+ b -= c->align;
115072+ }
115073+#endif
115074+
115075 kmemleak_free_recursive(b, c->flags);
115076 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
115077 struct slob_rcu *slob_rcu;
115078- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
115079- slob_rcu->size = c->size;
115080+ slob_rcu = b + (size - sizeof(struct slob_rcu));
115081+ slob_rcu->size = size;
115082 call_rcu(&slob_rcu->head, kmem_rcu_free);
115083 } else {
115084- __kmem_cache_free(b, c->size);
115085+ __kmem_cache_free(c, b, size);
115086 }
115087
115088+#ifdef CONFIG_PAX_USERCOPY_SLABS
115089+ trace_kfree(_RET_IP_, b);
115090+#else
115091 trace_kmem_cache_free(_RET_IP_, b);
115092+#endif
115093+
115094 }
115095 EXPORT_SYMBOL(kmem_cache_free);
115096
115097diff --git a/mm/slub.c b/mm/slub.c
115098index 54c0876..61847f8 100644
115099--- a/mm/slub.c
115100+++ b/mm/slub.c
115101@@ -198,7 +198,7 @@ struct track {
115102
115103 enum track_item { TRACK_ALLOC, TRACK_FREE };
115104
115105-#ifdef CONFIG_SYSFS
115106+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115107 static int sysfs_slab_add(struct kmem_cache *);
115108 static int sysfs_slab_alias(struct kmem_cache *, const char *);
115109 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
115110@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
115111 if (!t->addr)
115112 return;
115113
115114- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
115115+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
115116 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
115117 #ifdef CONFIG_STACKTRACE
115118 {
115119@@ -1427,7 +1427,7 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node)
115120 inc_slabs_node(s, page_to_nid(page), page->objects);
115121 page->slab_cache = s;
115122 __SetPageSlab(page);
115123- if (page->pfmemalloc)
115124+ if (page_is_pfmemalloc(page))
115125 SetPageSlabPfmemalloc(page);
115126
115127 start = page_address(page);
115128@@ -2707,6 +2707,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
115129
115130 slab_free_hook(s, x);
115131
115132+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115133+ if (!(s->flags & SLAB_NO_SANITIZE)) {
115134+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
115135+ if (s->ctor)
115136+ s->ctor(x);
115137+ }
115138+#endif
115139+
115140 redo:
115141 /*
115142 * Determine the currently cpus per cpu slab.
115143@@ -3048,6 +3056,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
115144 s->inuse = size;
115145
115146 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
115147+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115148+ (!(flags & SLAB_NO_SANITIZE)) ||
115149+#endif
115150 s->ctor)) {
115151 /*
115152 * Relocate free pointer after the object if it is not
115153@@ -3302,7 +3313,7 @@ static int __init setup_slub_min_objects(char *str)
115154
115155 __setup("slub_min_objects=", setup_slub_min_objects);
115156
115157-void *__kmalloc(size_t size, gfp_t flags)
115158+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
115159 {
115160 struct kmem_cache *s;
115161 void *ret;
115162@@ -3340,7 +3351,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
115163 return ptr;
115164 }
115165
115166-void *__kmalloc_node(size_t size, gfp_t flags, int node)
115167+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
115168 {
115169 struct kmem_cache *s;
115170 void *ret;
115171@@ -3388,6 +3399,70 @@ static size_t __ksize(const void *object)
115172 return slab_ksize(page->slab_cache);
115173 }
115174
115175+bool is_usercopy_object(const void *ptr)
115176+{
115177+ struct page *page;
115178+ struct kmem_cache *s;
115179+
115180+ if (ZERO_OR_NULL_PTR(ptr))
115181+ return false;
115182+
115183+ if (!slab_is_available())
115184+ return false;
115185+
115186+ if (is_vmalloc_addr(ptr)
115187+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115188+ && !object_starts_on_stack(ptr)
115189+#endif
115190+ ) {
115191+ struct vm_struct *vm = find_vm_area(ptr);
115192+ if (vm && (vm->flags & VM_USERCOPY))
115193+ return true;
115194+ return false;
115195+ }
115196+
115197+ if (!virt_addr_valid(ptr))
115198+ return false;
115199+
115200+ page = virt_to_head_page(ptr);
115201+
115202+ if (!PageSlab(page))
115203+ return false;
115204+
115205+ s = page->slab_cache;
115206+ return s->flags & SLAB_USERCOPY;
115207+}
115208+
115209+#ifdef CONFIG_PAX_USERCOPY
115210+const char *check_heap_object(const void *ptr, unsigned long n)
115211+{
115212+ struct page *page;
115213+ struct kmem_cache *s;
115214+ unsigned long offset;
115215+
115216+ if (ZERO_OR_NULL_PTR(ptr))
115217+ return "<null>";
115218+
115219+ if (!virt_addr_valid(ptr))
115220+ return NULL;
115221+
115222+ page = virt_to_head_page(ptr);
115223+
115224+ if (!PageSlab(page))
115225+ return NULL;
115226+
115227+ s = page->slab_cache;
115228+ if (!(s->flags & SLAB_USERCOPY))
115229+ return s->name;
115230+
115231+ offset = (ptr - page_address(page)) % s->size;
115232+ if (offset <= s->object_size && n <= s->object_size - offset)
115233+ return NULL;
115234+
115235+ return s->name;
115236+}
115237+#endif
115238+
115239 size_t ksize(const void *object)
115240 {
115241 size_t size = __ksize(object);
115242@@ -3408,6 +3483,7 @@ void kfree(const void *x)
115243 if (unlikely(ZERO_OR_NULL_PTR(x)))
115244 return;
115245
115246+ VM_BUG_ON(!virt_addr_valid(x));
115247 page = virt_to_head_page(x);
115248 if (unlikely(!PageSlab(page))) {
115249 BUG_ON(!PageCompound(page));
115250@@ -3724,7 +3800,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115251
115252 s = find_mergeable(size, align, flags, name, ctor);
115253 if (s) {
115254- s->refcount++;
115255+ atomic_inc(&s->refcount);
115256
115257 /*
115258 * Adjust the object sizes so that we clear
115259@@ -3740,7 +3816,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115260 }
115261
115262 if (sysfs_slab_alias(s, name)) {
115263- s->refcount--;
115264+ atomic_dec(&s->refcount);
115265 s = NULL;
115266 }
115267 }
115268@@ -3857,7 +3933,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
115269 }
115270 #endif
115271
115272-#ifdef CONFIG_SYSFS
115273+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115274 static int count_inuse(struct page *page)
115275 {
115276 return page->inuse;
115277@@ -4138,7 +4214,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
115278 len += sprintf(buf + len, "%7ld ", l->count);
115279
115280 if (l->addr)
115281+#ifdef CONFIG_GRKERNSEC_HIDESYM
115282+ len += sprintf(buf + len, "%pS", NULL);
115283+#else
115284 len += sprintf(buf + len, "%pS", (void *)l->addr);
115285+#endif
115286 else
115287 len += sprintf(buf + len, "<not-available>");
115288
115289@@ -4236,12 +4316,12 @@ static void __init resiliency_test(void)
115290 validate_slab_cache(kmalloc_caches[9]);
115291 }
115292 #else
115293-#ifdef CONFIG_SYSFS
115294+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115295 static void resiliency_test(void) {};
115296 #endif
115297 #endif
115298
115299-#ifdef CONFIG_SYSFS
115300+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115301 enum slab_stat_type {
115302 SL_ALL, /* All slabs */
115303 SL_PARTIAL, /* Only partially allocated slabs */
115304@@ -4478,13 +4558,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
115305 {
115306 if (!s->ctor)
115307 return 0;
115308+#ifdef CONFIG_GRKERNSEC_HIDESYM
115309+ return sprintf(buf, "%pS\n", NULL);
115310+#else
115311 return sprintf(buf, "%pS\n", s->ctor);
115312+#endif
115313 }
115314 SLAB_ATTR_RO(ctor);
115315
115316 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
115317 {
115318- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
115319+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
115320 }
115321 SLAB_ATTR_RO(aliases);
115322
115323@@ -4572,6 +4656,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
115324 SLAB_ATTR_RO(cache_dma);
115325 #endif
115326
115327+#ifdef CONFIG_PAX_USERCOPY_SLABS
115328+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
115329+{
115330+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
115331+}
115332+SLAB_ATTR_RO(usercopy);
115333+#endif
115334+
115335+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115336+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
115337+{
115338+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
115339+}
115340+SLAB_ATTR_RO(sanitize);
115341+#endif
115342+
115343 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
115344 {
115345 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
115346@@ -4627,7 +4727,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
115347 * as well as cause other issues like converting a mergeable
115348 * cache into an umergeable one.
115349 */
115350- if (s->refcount > 1)
115351+ if (atomic_read(&s->refcount) > 1)
115352 return -EINVAL;
115353
115354 s->flags &= ~SLAB_TRACE;
115355@@ -4747,7 +4847,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
115356 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
115357 size_t length)
115358 {
115359- if (s->refcount > 1)
115360+ if (atomic_read(&s->refcount) > 1)
115361 return -EINVAL;
115362
115363 s->flags &= ~SLAB_FAILSLAB;
115364@@ -4914,6 +5014,12 @@ static struct attribute *slab_attrs[] = {
115365 #ifdef CONFIG_ZONE_DMA
115366 &cache_dma_attr.attr,
115367 #endif
115368+#ifdef CONFIG_PAX_USERCOPY_SLABS
115369+ &usercopy_attr.attr,
115370+#endif
115371+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115372+ &sanitize_attr.attr,
115373+#endif
115374 #ifdef CONFIG_NUMA
115375 &remote_node_defrag_ratio_attr.attr,
115376 #endif
115377@@ -5155,6 +5261,7 @@ static char *create_unique_id(struct kmem_cache *s)
115378 return name;
115379 }
115380
115381+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115382 static int sysfs_slab_add(struct kmem_cache *s)
115383 {
115384 int err;
115385@@ -5228,6 +5335,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
115386 kobject_del(&s->kobj);
115387 kobject_put(&s->kobj);
115388 }
115389+#endif
115390
115391 /*
115392 * Need to buffer aliases during bootup until sysfs becomes
115393@@ -5241,6 +5349,7 @@ struct saved_alias {
115394
115395 static struct saved_alias *alias_list;
115396
115397+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115398 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115399 {
115400 struct saved_alias *al;
115401@@ -5263,6 +5372,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115402 alias_list = al;
115403 return 0;
115404 }
115405+#endif
115406
115407 static int __init slab_sysfs_init(void)
115408 {
115409diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
115410index 4cba9c2..b4f9fcc 100644
115411--- a/mm/sparse-vmemmap.c
115412+++ b/mm/sparse-vmemmap.c
115413@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
115414 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115415 if (!p)
115416 return NULL;
115417- pud_populate(&init_mm, pud, p);
115418+ pud_populate_kernel(&init_mm, pud, p);
115419 }
115420 return pud;
115421 }
115422@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
115423 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115424 if (!p)
115425 return NULL;
115426- pgd_populate(&init_mm, pgd, p);
115427+ pgd_populate_kernel(&init_mm, pgd, p);
115428 }
115429 return pgd;
115430 }
115431diff --git a/mm/sparse.c b/mm/sparse.c
115432index d1b48b6..6e8590e 100644
115433--- a/mm/sparse.c
115434+++ b/mm/sparse.c
115435@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
115436
115437 for (i = 0; i < PAGES_PER_SECTION; i++) {
115438 if (PageHWPoison(&memmap[i])) {
115439- atomic_long_sub(1, &num_poisoned_pages);
115440+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
115441 ClearPageHWPoison(&memmap[i]);
115442 }
115443 }
115444diff --git a/mm/swap.c b/mm/swap.c
115445index a7251a8..ac754a9 100644
115446--- a/mm/swap.c
115447+++ b/mm/swap.c
115448@@ -85,6 +85,8 @@ static void __put_compound_page(struct page *page)
115449 if (!PageHuge(page))
115450 __page_cache_release(page);
115451 dtor = get_compound_page_dtor(page);
115452+ if (!PageHuge(page))
115453+ BUG_ON(dtor != free_compound_page);
115454 (*dtor)(page);
115455 }
115456
115457diff --git a/mm/swapfile.c b/mm/swapfile.c
115458index a7e7210..b286e7d 100644
115459--- a/mm/swapfile.c
115460+++ b/mm/swapfile.c
115461@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
115462
115463 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
115464 /* Activity counter to indicate that a swapon or swapoff has occurred */
115465-static atomic_t proc_poll_event = ATOMIC_INIT(0);
115466+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
115467
115468 static inline unsigned char swap_count(unsigned char ent)
115469 {
115470@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
115471 spin_unlock(&swap_lock);
115472
115473 err = 0;
115474- atomic_inc(&proc_poll_event);
115475+ atomic_inc_unchecked(&proc_poll_event);
115476 wake_up_interruptible(&proc_poll_wait);
115477
115478 out_dput:
115479@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
115480
115481 poll_wait(file, &proc_poll_wait, wait);
115482
115483- if (seq->poll_event != atomic_read(&proc_poll_event)) {
115484- seq->poll_event = atomic_read(&proc_poll_event);
115485+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
115486+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115487 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
115488 }
115489
115490@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
115491 return ret;
115492
115493 seq = file->private_data;
115494- seq->poll_event = atomic_read(&proc_poll_event);
115495+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115496 return 0;
115497 }
115498
115499@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
115500 (frontswap_map) ? "FS" : "");
115501
115502 mutex_unlock(&swapon_mutex);
115503- atomic_inc(&proc_poll_event);
115504+ atomic_inc_unchecked(&proc_poll_event);
115505 wake_up_interruptible(&proc_poll_wait);
115506
115507 if (S_ISREG(inode->i_mode))
115508diff --git a/mm/util.c b/mm/util.c
115509index 68ff8a5..40c7a70 100644
115510--- a/mm/util.c
115511+++ b/mm/util.c
115512@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
115513 void arch_pick_mmap_layout(struct mm_struct *mm)
115514 {
115515 mm->mmap_base = TASK_UNMAPPED_BASE;
115516+
115517+#ifdef CONFIG_PAX_RANDMMAP
115518+ if (mm->pax_flags & MF_PAX_RANDMMAP)
115519+ mm->mmap_base += mm->delta_mmap;
115520+#endif
115521+
115522 mm->get_unmapped_area = arch_get_unmapped_area;
115523 }
115524 #endif
115525@@ -434,6 +440,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
115526 if (!mm->arg_end)
115527 goto out_mm; /* Shh! No looking before we're done */
115528
115529+ if (gr_acl_handle_procpidmem(task))
115530+ goto out_mm;
115531+
115532 len = mm->arg_end - mm->arg_start;
115533
115534 if (len > buflen)
115535diff --git a/mm/vmalloc.c b/mm/vmalloc.c
115536index 2faaa29..37314a8 100644
115537--- a/mm/vmalloc.c
115538+++ b/mm/vmalloc.c
115539@@ -40,20 +40,65 @@ struct vfree_deferred {
115540 struct work_struct wq;
115541 };
115542 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
115543+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
115544+
115545+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115546+struct stack_deferred_llist {
115547+ struct llist_head list;
115548+ void *stack;
115549+ void *lowmem_stack;
115550+};
115551+
115552+struct stack_deferred {
115553+ struct stack_deferred_llist list;
115554+ struct work_struct wq;
115555+};
115556+
115557+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
115558+#endif
115559
115560 static void __vunmap(const void *, int);
115561
115562-static void free_work(struct work_struct *w)
115563+static void vfree_work(struct work_struct *w)
115564 {
115565 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115566 struct llist_node *llnode = llist_del_all(&p->list);
115567 while (llnode) {
115568- void *p = llnode;
115569+ void *x = llnode;
115570 llnode = llist_next(llnode);
115571- __vunmap(p, 1);
115572+ __vunmap(x, 1);
115573 }
115574 }
115575
115576+static void vunmap_work(struct work_struct *w)
115577+{
115578+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115579+ struct llist_node *llnode = llist_del_all(&p->list);
115580+ while (llnode) {
115581+ void *x = llnode;
115582+ llnode = llist_next(llnode);
115583+ __vunmap(x, 0);
115584+ }
115585+}
115586+
115587+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115588+static void unmap_work(struct work_struct *w)
115589+{
115590+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
115591+ struct llist_node *llnode = llist_del_all(&p->list.list);
115592+ while (llnode) {
115593+ struct stack_deferred_llist *x =
115594+ llist_entry((struct llist_head *)llnode,
115595+ struct stack_deferred_llist, list);
115596+ void *stack = ACCESS_ONCE(x->stack);
115597+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
115598+ llnode = llist_next(llnode);
115599+ __vunmap(stack, 0);
115600+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
115601+ }
115602+}
115603+#endif
115604+
115605 /*** Page table manipulation functions ***/
115606
115607 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115608@@ -62,8 +107,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115609
115610 pte = pte_offset_kernel(pmd, addr);
115611 do {
115612- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115613- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115614+
115615+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115616+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
115617+ BUG_ON(!pte_exec(*pte));
115618+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
115619+ continue;
115620+ }
115621+#endif
115622+
115623+ {
115624+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115625+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115626+ }
115627 } while (pte++, addr += PAGE_SIZE, addr != end);
115628 }
115629
115630@@ -127,16 +183,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
115631 pte = pte_alloc_kernel(pmd, addr);
115632 if (!pte)
115633 return -ENOMEM;
115634+
115635+ pax_open_kernel();
115636 do {
115637 struct page *page = pages[*nr];
115638
115639- if (WARN_ON(!pte_none(*pte)))
115640+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115641+ if (pgprot_val(prot) & _PAGE_NX)
115642+#endif
115643+
115644+ if (!pte_none(*pte)) {
115645+ pax_close_kernel();
115646+ WARN_ON(1);
115647 return -EBUSY;
115648- if (WARN_ON(!page))
115649+ }
115650+ if (!page) {
115651+ pax_close_kernel();
115652+ WARN_ON(1);
115653 return -ENOMEM;
115654+ }
115655 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
115656 (*nr)++;
115657 } while (pte++, addr += PAGE_SIZE, addr != end);
115658+ pax_close_kernel();
115659 return 0;
115660 }
115661
115662@@ -146,7 +215,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
115663 pmd_t *pmd;
115664 unsigned long next;
115665
115666- pmd = pmd_alloc(&init_mm, pud, addr);
115667+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
115668 if (!pmd)
115669 return -ENOMEM;
115670 do {
115671@@ -163,7 +232,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
115672 pud_t *pud;
115673 unsigned long next;
115674
115675- pud = pud_alloc(&init_mm, pgd, addr);
115676+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
115677 if (!pud)
115678 return -ENOMEM;
115679 do {
115680@@ -223,6 +292,12 @@ int is_vmalloc_or_module_addr(const void *x)
115681 if (addr >= MODULES_VADDR && addr < MODULES_END)
115682 return 1;
115683 #endif
115684+
115685+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115686+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
115687+ return 1;
115688+#endif
115689+
115690 return is_vmalloc_addr(x);
115691 }
115692
115693@@ -243,8 +318,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
115694
115695 if (!pgd_none(*pgd)) {
115696 pud_t *pud = pud_offset(pgd, addr);
115697+#ifdef CONFIG_X86
115698+ if (!pud_large(*pud))
115699+#endif
115700 if (!pud_none(*pud)) {
115701 pmd_t *pmd = pmd_offset(pud, addr);
115702+#ifdef CONFIG_X86
115703+ if (!pmd_large(*pmd))
115704+#endif
115705 if (!pmd_none(*pmd)) {
115706 pte_t *ptep, pte;
115707
115708@@ -346,7 +427,7 @@ static void purge_vmap_area_lazy(void);
115709 * Allocate a region of KVA of the specified size and alignment, within the
115710 * vstart and vend.
115711 */
115712-static struct vmap_area *alloc_vmap_area(unsigned long size,
115713+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
115714 unsigned long align,
115715 unsigned long vstart, unsigned long vend,
115716 int node, gfp_t gfp_mask)
115717@@ -1202,13 +1283,27 @@ void __init vmalloc_init(void)
115718 for_each_possible_cpu(i) {
115719 struct vmap_block_queue *vbq;
115720 struct vfree_deferred *p;
115721+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115722+ struct stack_deferred *p2;
115723+#endif
115724
115725 vbq = &per_cpu(vmap_block_queue, i);
115726 spin_lock_init(&vbq->lock);
115727 INIT_LIST_HEAD(&vbq->free);
115728+
115729 p = &per_cpu(vfree_deferred, i);
115730 init_llist_head(&p->list);
115731- INIT_WORK(&p->wq, free_work);
115732+ INIT_WORK(&p->wq, vfree_work);
115733+
115734+ p = &per_cpu(vunmap_deferred, i);
115735+ init_llist_head(&p->list);
115736+ INIT_WORK(&p->wq, vunmap_work);
115737+
115738+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115739+ p2 = &per_cpu(stack_deferred, i);
115740+ init_llist_head(&p2->list.list);
115741+ INIT_WORK(&p2->wq, unmap_work);
115742+#endif
115743 }
115744
115745 /* Import existing vmlist entries. */
115746@@ -1333,6 +1428,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
115747 struct vm_struct *area;
115748
115749 BUG_ON(in_interrupt());
115750+
115751+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115752+ if (flags & VM_KERNEXEC) {
115753+ if (start != VMALLOC_START || end != VMALLOC_END)
115754+ return NULL;
115755+ start = (unsigned long)MODULES_EXEC_VADDR;
115756+ end = (unsigned long)MODULES_EXEC_END;
115757+ }
115758+#endif
115759+
115760 if (flags & VM_IOREMAP)
115761 align = 1ul << clamp_t(int, fls_long(size),
115762 PAGE_SHIFT, IOREMAP_MAX_ORDER);
115763@@ -1531,13 +1636,36 @@ EXPORT_SYMBOL(vfree);
115764 */
115765 void vunmap(const void *addr)
115766 {
115767- BUG_ON(in_interrupt());
115768- might_sleep();
115769- if (addr)
115770+ if (!addr)
115771+ return;
115772+ if (unlikely(in_interrupt())) {
115773+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
115774+ if (llist_add((struct llist_node *)addr, &p->list))
115775+ schedule_work(&p->wq);
115776+ } else {
115777+ might_sleep();
115778 __vunmap(addr, 0);
115779+ }
115780 }
115781 EXPORT_SYMBOL(vunmap);
115782
115783+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115784+void unmap_process_stacks(struct task_struct *task)
115785+{
115786+ if (unlikely(in_interrupt())) {
115787+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
115788+ struct stack_deferred_llist *list = task->stack;
115789+ list->stack = task->stack;
115790+ list->lowmem_stack = task->lowmem_stack;
115791+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
115792+ schedule_work(&p->wq);
115793+ } else {
115794+ __vunmap(task->stack, 0);
115795+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
115796+ }
115797+}
115798+#endif
115799+
115800 /**
115801 * vmap - map an array of pages into virtually contiguous space
115802 * @pages: array of page pointers
115803@@ -1558,6 +1686,11 @@ void *vmap(struct page **pages, unsigned int count,
115804 if (count > totalram_pages)
115805 return NULL;
115806
115807+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115808+ if (!(pgprot_val(prot) & _PAGE_NX))
115809+ flags |= VM_KERNEXEC;
115810+#endif
115811+
115812 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
115813 __builtin_return_address(0));
115814 if (!area)
115815@@ -1662,6 +1795,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
115816 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
115817 goto fail;
115818
115819+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115820+ if (!(pgprot_val(prot) & _PAGE_NX)) {
115821+ vm_flags |= VM_KERNEXEC;
115822+ start = VMALLOC_START;
115823+ end = VMALLOC_END;
115824+ }
115825+#endif
115826+
115827 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
115828 vm_flags, start, end, node, gfp_mask, caller);
115829 if (!area)
115830@@ -1715,6 +1856,14 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
115831 gfp_mask, prot, 0, node, caller);
115832 }
115833
115834+void *vmalloc_usercopy(unsigned long size)
115835+{
115836+ return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
115837+ GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
115838+ VM_USERCOPY, NUMA_NO_NODE,
115839+ __builtin_return_address(0));
115840+}
115841+
115842 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
115843 {
115844 return __vmalloc_node(size, 1, gfp_mask, prot, NUMA_NO_NODE,
115845@@ -1838,10 +1987,9 @@ EXPORT_SYMBOL(vzalloc_node);
115846 * For tight control over page level allocator and protection flags
115847 * use __vmalloc() instead.
115848 */
115849-
115850 void *vmalloc_exec(unsigned long size)
115851 {
115852- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
115853+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
115854 NUMA_NO_NODE, __builtin_return_address(0));
115855 }
115856
115857@@ -2148,6 +2296,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
115858 {
115859 struct vm_struct *area;
115860
115861+ BUG_ON(vma->vm_mirror);
115862+
115863 size = PAGE_ALIGN(size);
115864
115865 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
115866@@ -2630,7 +2780,11 @@ static int s_show(struct seq_file *m, void *p)
115867 v->addr, v->addr + v->size, v->size);
115868
115869 if (v->caller)
115870+#ifdef CONFIG_GRKERNSEC_HIDESYM
115871+ seq_printf(m, " %pK", v->caller);
115872+#else
115873 seq_printf(m, " %pS", v->caller);
115874+#endif
115875
115876 if (v->nr_pages)
115877 seq_printf(m, " pages=%d", v->nr_pages);
115878diff --git a/mm/vmstat.c b/mm/vmstat.c
115879index 4f5cd97..9fb715a 100644
115880--- a/mm/vmstat.c
115881+++ b/mm/vmstat.c
115882@@ -27,6 +27,7 @@
115883 #include <linux/mm_inline.h>
115884 #include <linux/page_ext.h>
115885 #include <linux/page_owner.h>
115886+#include <linux/grsecurity.h>
115887
115888 #include "internal.h"
115889
115890@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
115891 *
115892 * vm_stat contains the global counters
115893 */
115894-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
115895+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
115896 EXPORT_SYMBOL(vm_stat);
115897
115898 #ifdef CONFIG_SMP
115899@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
115900
115901 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
115902 if (diff[i]) {
115903- atomic_long_add(diff[i], &vm_stat[i]);
115904+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
115905 changes++;
115906 }
115907 return changes;
115908@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
115909 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
115910 if (v) {
115911
115912- atomic_long_add(v, &zone->vm_stat[i]);
115913+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115914 global_diff[i] += v;
115915 #ifdef CONFIG_NUMA
115916 /* 3 seconds idle till flush */
115917@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
115918
115919 v = p->vm_stat_diff[i];
115920 p->vm_stat_diff[i] = 0;
115921- atomic_long_add(v, &zone->vm_stat[i]);
115922+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115923 global_diff[i] += v;
115924 }
115925 }
115926@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
115927 if (pset->vm_stat_diff[i]) {
115928 int v = pset->vm_stat_diff[i];
115929 pset->vm_stat_diff[i] = 0;
115930- atomic_long_add(v, &zone->vm_stat[i]);
115931- atomic_long_add(v, &vm_stat[i]);
115932+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115933+ atomic_long_add_unchecked(v, &vm_stat[i]);
115934 }
115935 }
115936 #endif
115937@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
115938 stat_items_size += sizeof(struct vm_event_state);
115939 #endif
115940
115941- v = kmalloc(stat_items_size, GFP_KERNEL);
115942+ v = kzalloc(stat_items_size, GFP_KERNEL);
115943 m->private = v;
115944 if (!v)
115945 return ERR_PTR(-ENOMEM);
115946+
115947+#ifdef CONFIG_GRKERNSEC_PROC_ADD
115948+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
115949+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
115950+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
115951+ && !in_group_p(grsec_proc_gid)
115952+#endif
115953+ )
115954+ return (unsigned long *)m->private + *pos;
115955+#endif
115956+#endif
115957+
115958 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
115959 v[i] = global_page_state(i);
115960 v += NR_VM_ZONE_STAT_ITEMS;
115961@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
115962 cpu_notifier_register_done();
115963 #endif
115964 #ifdef CONFIG_PROC_FS
115965- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
115966- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
115967- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
115968- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
115969+ {
115970+ mode_t gr_mode = S_IRUGO;
115971+#ifdef CONFIG_GRKERNSEC_PROC_ADD
115972+ gr_mode = S_IRUSR;
115973+#endif
115974+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
115975+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
115976+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
115977+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
115978+ }
115979 #endif
115980 return 0;
115981 }
115982diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
115983index 59555f0..fd7ade9 100644
115984--- a/net/8021q/vlan.c
115985+++ b/net/8021q/vlan.c
115986@@ -491,7 +491,7 @@ out:
115987 return NOTIFY_DONE;
115988 }
115989
115990-static struct notifier_block vlan_notifier_block __read_mostly = {
115991+static struct notifier_block vlan_notifier_block = {
115992 .notifier_call = vlan_device_event,
115993 };
115994
115995@@ -566,8 +566,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
115996 err = -EPERM;
115997 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
115998 break;
115999- if ((args.u.name_type >= 0) &&
116000- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
116001+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
116002 struct vlan_net *vn;
116003
116004 vn = net_generic(net, vlan_net_id);
116005diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
116006index c92b52f..006c052 100644
116007--- a/net/8021q/vlan_netlink.c
116008+++ b/net/8021q/vlan_netlink.c
116009@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
116010 return dev_net(real_dev);
116011 }
116012
116013-struct rtnl_link_ops vlan_link_ops __read_mostly = {
116014+struct rtnl_link_ops vlan_link_ops = {
116015 .kind = "vlan",
116016 .maxtype = IFLA_VLAN_MAX,
116017 .policy = vlan_policy,
116018diff --git a/net/9p/mod.c b/net/9p/mod.c
116019index 6ab36ae..6f1841b 100644
116020--- a/net/9p/mod.c
116021+++ b/net/9p/mod.c
116022@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
116023 void v9fs_register_trans(struct p9_trans_module *m)
116024 {
116025 spin_lock(&v9fs_trans_lock);
116026- list_add_tail(&m->list, &v9fs_trans_list);
116027+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
116028 spin_unlock(&v9fs_trans_lock);
116029 }
116030 EXPORT_SYMBOL(v9fs_register_trans);
116031@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
116032 void v9fs_unregister_trans(struct p9_trans_module *m)
116033 {
116034 spin_lock(&v9fs_trans_lock);
116035- list_del_init(&m->list);
116036+ pax_list_del_init((struct list_head *)&m->list);
116037 spin_unlock(&v9fs_trans_lock);
116038 }
116039 EXPORT_SYMBOL(v9fs_unregister_trans);
116040diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
116041index bced8c0..ef253b7 100644
116042--- a/net/9p/trans_fd.c
116043+++ b/net/9p/trans_fd.c
116044@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
116045 oldfs = get_fs();
116046 set_fs(get_ds());
116047 /* The cast to a user pointer is valid due to the set_fs() */
116048- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
116049+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
116050 set_fs(oldfs);
116051
116052 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
116053diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
116054index af46bc4..f9adfcd 100644
116055--- a/net/appletalk/atalk_proc.c
116056+++ b/net/appletalk/atalk_proc.c
116057@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
116058 struct proc_dir_entry *p;
116059 int rc = -ENOMEM;
116060
116061- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
116062+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
116063 if (!atalk_proc_dir)
116064 goto out;
116065
116066diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
116067index 876fbe8..8bbea9f 100644
116068--- a/net/atm/atm_misc.c
116069+++ b/net/atm/atm_misc.c
116070@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
116071 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
116072 return 1;
116073 atm_return(vcc, truesize);
116074- atomic_inc(&vcc->stats->rx_drop);
116075+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116076 return 0;
116077 }
116078 EXPORT_SYMBOL(atm_charge);
116079@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
116080 }
116081 }
116082 atm_return(vcc, guess);
116083- atomic_inc(&vcc->stats->rx_drop);
116084+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116085 return NULL;
116086 }
116087 EXPORT_SYMBOL(atm_alloc_charge);
116088@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
116089
116090 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116091 {
116092-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116093+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116094 __SONET_ITEMS
116095 #undef __HANDLE_ITEM
116096 }
116097@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
116098
116099 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116100 {
116101-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116102+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
116103 __SONET_ITEMS
116104 #undef __HANDLE_ITEM
116105 }
116106diff --git a/net/atm/lec.c b/net/atm/lec.c
116107index cd3b379..977a3c9 100644
116108--- a/net/atm/lec.c
116109+++ b/net/atm/lec.c
116110@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
116111 }
116112
116113 static struct lane2_ops lane2_ops = {
116114- lane2_resolve, /* resolve, spec 3.1.3 */
116115- lane2_associate_req, /* associate_req, spec 3.1.4 */
116116- NULL /* associate indicator, spec 3.1.5 */
116117+ .resolve = lane2_resolve,
116118+ .associate_req = lane2_associate_req,
116119+ .associate_indicator = NULL
116120 };
116121
116122 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
116123diff --git a/net/atm/lec.h b/net/atm/lec.h
116124index 4149db1..f2ab682 100644
116125--- a/net/atm/lec.h
116126+++ b/net/atm/lec.h
116127@@ -48,7 +48,7 @@ struct lane2_ops {
116128 const u8 *tlvs, u32 sizeoftlvs);
116129 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
116130 const u8 *tlvs, u32 sizeoftlvs);
116131-};
116132+} __no_const;
116133
116134 /*
116135 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
116136diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
116137index d1b2d9a..d549f7f 100644
116138--- a/net/atm/mpoa_caches.c
116139+++ b/net/atm/mpoa_caches.c
116140@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
116141
116142
116143 static struct in_cache_ops ingress_ops = {
116144- in_cache_add_entry, /* add_entry */
116145- in_cache_get, /* get */
116146- in_cache_get_with_mask, /* get_with_mask */
116147- in_cache_get_by_vcc, /* get_by_vcc */
116148- in_cache_put, /* put */
116149- in_cache_remove_entry, /* remove_entry */
116150- cache_hit, /* cache_hit */
116151- clear_count_and_expired, /* clear_count */
116152- check_resolving_entries, /* check_resolving */
116153- refresh_entries, /* refresh */
116154- in_destroy_cache /* destroy_cache */
116155+ .add_entry = in_cache_add_entry,
116156+ .get = in_cache_get,
116157+ .get_with_mask = in_cache_get_with_mask,
116158+ .get_by_vcc = in_cache_get_by_vcc,
116159+ .put = in_cache_put,
116160+ .remove_entry = in_cache_remove_entry,
116161+ .cache_hit = cache_hit,
116162+ .clear_count = clear_count_and_expired,
116163+ .check_resolving = check_resolving_entries,
116164+ .refresh = refresh_entries,
116165+ .destroy_cache = in_destroy_cache
116166 };
116167
116168 static struct eg_cache_ops egress_ops = {
116169- eg_cache_add_entry, /* add_entry */
116170- eg_cache_get_by_cache_id, /* get_by_cache_id */
116171- eg_cache_get_by_tag, /* get_by_tag */
116172- eg_cache_get_by_vcc, /* get_by_vcc */
116173- eg_cache_get_by_src_ip, /* get_by_src_ip */
116174- eg_cache_put, /* put */
116175- eg_cache_remove_entry, /* remove_entry */
116176- update_eg_cache_entry, /* update */
116177- clear_expired, /* clear_expired */
116178- eg_destroy_cache /* destroy_cache */
116179+ .add_entry = eg_cache_add_entry,
116180+ .get_by_cache_id = eg_cache_get_by_cache_id,
116181+ .get_by_tag = eg_cache_get_by_tag,
116182+ .get_by_vcc = eg_cache_get_by_vcc,
116183+ .get_by_src_ip = eg_cache_get_by_src_ip,
116184+ .put = eg_cache_put,
116185+ .remove_entry = eg_cache_remove_entry,
116186+ .update = update_eg_cache_entry,
116187+ .clear_expired = clear_expired,
116188+ .destroy_cache = eg_destroy_cache
116189 };
116190
116191
116192diff --git a/net/atm/proc.c b/net/atm/proc.c
116193index bbb6461..cf04016 100644
116194--- a/net/atm/proc.c
116195+++ b/net/atm/proc.c
116196@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
116197 const struct k_atm_aal_stats *stats)
116198 {
116199 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
116200- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
116201- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
116202- atomic_read(&stats->rx_drop));
116203+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
116204+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
116205+ atomic_read_unchecked(&stats->rx_drop));
116206 }
116207
116208 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
116209diff --git a/net/atm/resources.c b/net/atm/resources.c
116210index 0447d5d..3cf4728 100644
116211--- a/net/atm/resources.c
116212+++ b/net/atm/resources.c
116213@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
116214 static void copy_aal_stats(struct k_atm_aal_stats *from,
116215 struct atm_aal_stats *to)
116216 {
116217-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116218+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116219 __AAL_STAT_ITEMS
116220 #undef __HANDLE_ITEM
116221 }
116222@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
116223 static void subtract_aal_stats(struct k_atm_aal_stats *from,
116224 struct atm_aal_stats *to)
116225 {
116226-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116227+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
116228 __AAL_STAT_ITEMS
116229 #undef __HANDLE_ITEM
116230 }
116231diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
116232index 1997538..3b78e84 100644
116233--- a/net/ax25/ax25_subr.c
116234+++ b/net/ax25/ax25_subr.c
116235@@ -264,6 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
116236 {
116237 ax25_clear_queues(ax25);
116238
116239+ ax25_stop_heartbeat(ax25);
116240 ax25_stop_t1timer(ax25);
116241 ax25_stop_t2timer(ax25);
116242 ax25_stop_t3timer(ax25);
116243diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
116244index 919a5ce..cc6b444 100644
116245--- a/net/ax25/sysctl_net_ax25.c
116246+++ b/net/ax25/sysctl_net_ax25.c
116247@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
116248 {
116249 char path[sizeof("net/ax25/") + IFNAMSIZ];
116250 int k;
116251- struct ctl_table *table;
116252+ ctl_table_no_const *table;
116253
116254 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
116255 if (!table)
116256diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
116257index 00e00e0..710fcd2 100644
116258--- a/net/batman-adv/bat_iv_ogm.c
116259+++ b/net/batman-adv/bat_iv_ogm.c
116260@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
116261
116262 /* randomize initial seqno to avoid collision */
116263 get_random_bytes(&random_seqno, sizeof(random_seqno));
116264- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116265+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116266
116267 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
116268 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
116269@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
116270 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
116271
116272 /* change sequence number to network order */
116273- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
116274+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
116275 batadv_ogm_packet->seqno = htonl(seqno);
116276- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
116277+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
116278
116279 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
116280
116281@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
116282 return;
116283
116284 /* could be changed by schedule_own_packet() */
116285- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
116286+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
116287
116288 if (ogm_packet->flags & BATADV_DIRECTLINK)
116289 has_directlink_flag = true;
116290diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
116291index 3d1dcaa..4699f4e 100644
116292--- a/net/batman-adv/fragmentation.c
116293+++ b/net/batman-adv/fragmentation.c
116294@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
116295 frag_header.packet_type = BATADV_UNICAST_FRAG;
116296 frag_header.version = BATADV_COMPAT_VERSION;
116297 frag_header.ttl = BATADV_TTL;
116298- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
116299+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
116300 frag_header.reserved = 0;
116301 frag_header.no = 0;
116302 frag_header.total_size = htons(skb->len);
116303diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
116304index 5ec31d7..e371631 100644
116305--- a/net/batman-adv/soft-interface.c
116306+++ b/net/batman-adv/soft-interface.c
116307@@ -295,7 +295,7 @@ send:
116308 primary_if->net_dev->dev_addr);
116309
116310 /* set broadcast sequence number */
116311- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
116312+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
116313 bcast_packet->seqno = htonl(seqno);
116314
116315 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
116316@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116317 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
116318
116319 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
116320- atomic_set(&bat_priv->bcast_seqno, 1);
116321+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
116322 atomic_set(&bat_priv->tt.vn, 0);
116323 atomic_set(&bat_priv->tt.local_changes, 0);
116324 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
116325@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116326
116327 /* randomize initial seqno to avoid collision */
116328 get_random_bytes(&random_seqno, sizeof(random_seqno));
116329- atomic_set(&bat_priv->frag_seqno, random_seqno);
116330+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
116331
116332 bat_priv->primary_if = NULL;
116333 bat_priv->num_ifaces = 0;
116334@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
116335 return 0;
116336 }
116337
116338-struct rtnl_link_ops batadv_link_ops __read_mostly = {
116339+struct rtnl_link_ops batadv_link_ops = {
116340 .kind = "batadv",
116341 .priv_size = sizeof(struct batadv_priv),
116342 .setup = batadv_softif_init_early,
116343diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
116344index 9398c3f..0e79657 100644
116345--- a/net/batman-adv/types.h
116346+++ b/net/batman-adv/types.h
116347@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
116348 struct batadv_hard_iface_bat_iv {
116349 unsigned char *ogm_buff;
116350 int ogm_buff_len;
116351- atomic_t ogm_seqno;
116352+ atomic_unchecked_t ogm_seqno;
116353 };
116354
116355 /**
116356@@ -766,7 +766,7 @@ struct batadv_priv {
116357 atomic_t bonding;
116358 atomic_t fragmentation;
116359 atomic_t packet_size_max;
116360- atomic_t frag_seqno;
116361+ atomic_unchecked_t frag_seqno;
116362 #ifdef CONFIG_BATMAN_ADV_BLA
116363 atomic_t bridge_loop_avoidance;
116364 #endif
116365@@ -785,7 +785,7 @@ struct batadv_priv {
116366 #endif
116367 uint32_t isolation_mark;
116368 uint32_t isolation_mark_mask;
116369- atomic_t bcast_seqno;
116370+ atomic_unchecked_t bcast_seqno;
116371 atomic_t bcast_queue_left;
116372 atomic_t batman_queue_left;
116373 char num_ifaces;
116374diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
116375index e11a5cf..02864cd 100644
116376--- a/net/bluetooth/hci_sock.c
116377+++ b/net/bluetooth/hci_sock.c
116378@@ -1253,7 +1253,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
116379 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
116380 }
116381
116382- len = min_t(unsigned int, len, sizeof(uf));
116383+ len = min((size_t)len, sizeof(uf));
116384 if (copy_from_user(&uf, optval, len)) {
116385 err = -EFAULT;
116386 break;
116387diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
116388index dad4197..253bbdf 100644
116389--- a/net/bluetooth/l2cap_core.c
116390+++ b/net/bluetooth/l2cap_core.c
116391@@ -3541,8 +3541,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
116392 break;
116393
116394 case L2CAP_CONF_RFC:
116395- if (olen == sizeof(rfc))
116396- memcpy(&rfc, (void *)val, olen);
116397+ if (olen != sizeof(rfc))
116398+ break;
116399+
116400+ memcpy(&rfc, (void *)val, olen);
116401
116402 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
116403 rfc.mode != chan->mode)
116404diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
116405index a7278f0..3443626 100644
116406--- a/net/bluetooth/l2cap_sock.c
116407+++ b/net/bluetooth/l2cap_sock.c
116408@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116409 struct sock *sk = sock->sk;
116410 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
116411 struct l2cap_options opts;
116412- int len, err = 0;
116413+ int err = 0;
116414+ size_t len = optlen;
116415 u32 opt;
116416
116417 BT_DBG("sk %p", sk);
116418@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116419 opts.max_tx = chan->max_tx;
116420 opts.txwin_size = chan->tx_win;
116421
116422- len = min_t(unsigned int, sizeof(opts), optlen);
116423+ len = min(sizeof(opts), len);
116424 if (copy_from_user((char *) &opts, optval, len)) {
116425 err = -EFAULT;
116426 break;
116427@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116428 struct bt_security sec;
116429 struct bt_power pwr;
116430 struct l2cap_conn *conn;
116431- int len, err = 0;
116432+ int err = 0;
116433+ size_t len = optlen;
116434 u32 opt;
116435
116436 BT_DBG("sk %p", sk);
116437@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116438
116439 sec.level = BT_SECURITY_LOW;
116440
116441- len = min_t(unsigned int, sizeof(sec), optlen);
116442+ len = min(sizeof(sec), len);
116443 if (copy_from_user((char *) &sec, optval, len)) {
116444 err = -EFAULT;
116445 break;
116446@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116447
116448 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
116449
116450- len = min_t(unsigned int, sizeof(pwr), optlen);
116451+ len = min(sizeof(pwr), len);
116452 if (copy_from_user((char *) &pwr, optval, len)) {
116453 err = -EFAULT;
116454 break;
116455diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
116456index 825e8fb..efc24a4 100644
116457--- a/net/bluetooth/rfcomm/sock.c
116458+++ b/net/bluetooth/rfcomm/sock.c
116459@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116460 struct sock *sk = sock->sk;
116461 struct bt_security sec;
116462 int err = 0;
116463- size_t len;
116464+ size_t len = optlen;
116465 u32 opt;
116466
116467 BT_DBG("sk %p", sk);
116468@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116469
116470 sec.level = BT_SECURITY_LOW;
116471
116472- len = min_t(unsigned int, sizeof(sec), optlen);
116473+ len = min(sizeof(sec), len);
116474 if (copy_from_user((char *) &sec, optval, len)) {
116475 err = -EFAULT;
116476 break;
116477diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
116478index 8e385a0..a5bdd8e 100644
116479--- a/net/bluetooth/rfcomm/tty.c
116480+++ b/net/bluetooth/rfcomm/tty.c
116481@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
116482 BT_DBG("tty %p id %d", tty, tty->index);
116483
116484 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
116485- dev->channel, dev->port.count);
116486+ dev->channel, atomic_read(&dev->port.count));
116487
116488 err = tty_port_open(&dev->port, tty, filp);
116489 if (err)
116490@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
116491 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
116492
116493 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
116494- dev->port.count);
116495+ atomic_read(&dev->port.count));
116496
116497 tty_port_close(&dev->port, tty, filp);
116498 }
116499diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
116500index e29ad70b..cc00066 100644
116501--- a/net/bridge/br_mdb.c
116502+++ b/net/bridge/br_mdb.c
116503@@ -371,6 +371,7 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br,
116504 if (!p || p->br != br || p->state == BR_STATE_DISABLED)
116505 return -EINVAL;
116506
116507+ memset(&ip, 0, sizeof(ip));
116508 ip.proto = entry->addr.proto;
116509 if (ip.proto == htons(ETH_P_IP))
116510 ip.u.ip4 = entry->addr.u.ip4;
116511@@ -417,6 +418,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)
116512 if (!netif_running(br->dev) || br->multicast_disabled)
116513 return -EINVAL;
116514
116515+ memset(&ip, 0, sizeof(ip));
116516 ip.proto = entry->addr.proto;
116517 if (ip.proto == htons(ETH_P_IP)) {
116518 if (timer_pending(&br->ip4_other_query.timer))
116519diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
116520index 4b5c236..f303683 100644
116521--- a/net/bridge/br_netlink.c
116522+++ b/net/bridge/br_netlink.c
116523@@ -112,6 +112,8 @@ static inline size_t br_port_info_size(void)
116524 + nla_total_size(1) /* IFLA_BRPORT_FAST_LEAVE */
116525 + nla_total_size(1) /* IFLA_BRPORT_LEARNING */
116526 + nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */
116527+ + nla_total_size(1) /* IFLA_BRPORT_PROXYARP */
116528+ + nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */
116529 + 0;
116530 }
116531
116532@@ -504,6 +506,8 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
116533 [IFLA_BRPORT_FAST_LEAVE]= { .type = NLA_U8 },
116534 [IFLA_BRPORT_LEARNING] = { .type = NLA_U8 },
116535 [IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 },
116536+ [IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 },
116537+ [IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
116538 };
116539
116540 /* Change the state of the port and notify spanning tree */
116541@@ -841,7 +845,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
116542 .get_link_af_size = br_get_link_af_size,
116543 };
116544
116545-struct rtnl_link_ops br_link_ops __read_mostly = {
116546+struct rtnl_link_ops br_link_ops = {
116547 .kind = "bridge",
116548 .priv_size = sizeof(struct net_bridge),
116549 .setup = br_dev_setup,
116550diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
116551index 91180a7..1301daa 100644
116552--- a/net/bridge/netfilter/ebtables.c
116553+++ b/net/bridge/netfilter/ebtables.c
116554@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
116555 tmp.valid_hooks = t->table->valid_hooks;
116556 }
116557 mutex_unlock(&ebt_mutex);
116558- if (copy_to_user(user, &tmp, *len) != 0) {
116559+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116560 BUGPRINT("c2u Didn't work\n");
116561 ret = -EFAULT;
116562 break;
116563@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116564 goto out;
116565 tmp.valid_hooks = t->valid_hooks;
116566
116567- if (copy_to_user(user, &tmp, *len) != 0) {
116568+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116569 ret = -EFAULT;
116570 break;
116571 }
116572@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116573 tmp.entries_size = t->table->entries_size;
116574 tmp.valid_hooks = t->table->valid_hooks;
116575
116576- if (copy_to_user(user, &tmp, *len) != 0) {
116577+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116578 ret = -EFAULT;
116579 break;
116580 }
116581diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
116582index f5afda1..dcf770a 100644
116583--- a/net/caif/cfctrl.c
116584+++ b/net/caif/cfctrl.c
116585@@ -10,6 +10,7 @@
116586 #include <linux/spinlock.h>
116587 #include <linux/slab.h>
116588 #include <linux/pkt_sched.h>
116589+#include <linux/sched.h>
116590 #include <net/caif/caif_layer.h>
116591 #include <net/caif/cfpkt.h>
116592 #include <net/caif/cfctrl.h>
116593@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
116594 memset(&dev_info, 0, sizeof(dev_info));
116595 dev_info.id = 0xff;
116596 cfsrvl_init(&this->serv, 0, &dev_info, false);
116597- atomic_set(&this->req_seq_no, 1);
116598- atomic_set(&this->rsp_seq_no, 1);
116599+ atomic_set_unchecked(&this->req_seq_no, 1);
116600+ atomic_set_unchecked(&this->rsp_seq_no, 1);
116601 this->serv.layer.receive = cfctrl_recv;
116602 sprintf(this->serv.layer.name, "ctrl");
116603 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
116604@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
116605 struct cfctrl_request_info *req)
116606 {
116607 spin_lock_bh(&ctrl->info_list_lock);
116608- atomic_inc(&ctrl->req_seq_no);
116609- req->sequence_no = atomic_read(&ctrl->req_seq_no);
116610+ atomic_inc_unchecked(&ctrl->req_seq_no);
116611+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
116612 list_add_tail(&req->list, &ctrl->list);
116613 spin_unlock_bh(&ctrl->info_list_lock);
116614 }
116615@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
116616 if (p != first)
116617 pr_warn("Requests are not received in order\n");
116618
116619- atomic_set(&ctrl->rsp_seq_no,
116620+ atomic_set_unchecked(&ctrl->rsp_seq_no,
116621 p->sequence_no);
116622 list_del(&p->list);
116623 goto out;
116624diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
116625index 67a4a36..8d28068 100644
116626--- a/net/caif/chnl_net.c
116627+++ b/net/caif/chnl_net.c
116628@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
116629 };
116630
116631
116632-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
116633+static struct rtnl_link_ops ipcaif_link_ops = {
116634 .kind = "caif",
116635 .priv_size = sizeof(struct chnl_net),
116636 .setup = ipcaif_net_setup,
116637diff --git a/net/can/af_can.c b/net/can/af_can.c
116638index 62c635f..0b59618 100644
116639--- a/net/can/af_can.c
116640+++ b/net/can/af_can.c
116641@@ -890,7 +890,7 @@ static const struct net_proto_family can_family_ops = {
116642 };
116643
116644 /* notifier block for netdevice event */
116645-static struct notifier_block can_netdev_notifier __read_mostly = {
116646+static struct notifier_block can_netdev_notifier = {
116647 .notifier_call = can_notifier,
116648 };
116649
116650diff --git a/net/can/bcm.c b/net/can/bcm.c
116651index a1ba687..aafaec5 100644
116652--- a/net/can/bcm.c
116653+++ b/net/can/bcm.c
116654@@ -1620,7 +1620,7 @@ static int __init bcm_module_init(void)
116655 }
116656
116657 /* create /proc/net/can-bcm directory */
116658- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
116659+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
116660 return 0;
116661 }
116662
116663diff --git a/net/can/gw.c b/net/can/gw.c
116664index a6f448e..5902171 100644
116665--- a/net/can/gw.c
116666+++ b/net/can/gw.c
116667@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
116668 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
116669
116670 static HLIST_HEAD(cgw_list);
116671-static struct notifier_block notifier;
116672
116673 static struct kmem_cache *cgw_cache __read_mostly;
116674
116675@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
116676 return err;
116677 }
116678
116679+static struct notifier_block notifier = {
116680+ .notifier_call = cgw_notifier
116681+};
116682+
116683 static __init int cgw_module_init(void)
116684 {
116685 /* sanitize given module parameter */
116686@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
116687 return -ENOMEM;
116688
116689 /* set notifier */
116690- notifier.notifier_call = cgw_notifier;
116691 register_netdevice_notifier(&notifier);
116692
116693 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
116694diff --git a/net/can/proc.c b/net/can/proc.c
116695index 1a19b98..df2b4ec 100644
116696--- a/net/can/proc.c
116697+++ b/net/can/proc.c
116698@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
116699 void can_init_proc(void)
116700 {
116701 /* create /proc/net/can directory */
116702- can_dir = proc_mkdir("can", init_net.proc_net);
116703+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
116704
116705 if (!can_dir) {
116706 printk(KERN_INFO "can: failed to create /proc/net/can . "
116707diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
116708index 967080a..5e75f04 100644
116709--- a/net/ceph/messenger.c
116710+++ b/net/ceph/messenger.c
116711@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
116712 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
116713
116714 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
116715-static atomic_t addr_str_seq = ATOMIC_INIT(0);
116716+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
116717
116718 static struct page *zero_page; /* used in certain error cases */
116719
116720@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
116721 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
116722 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
116723
116724- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116725+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116726 s = addr_str[i];
116727
116728 switch (ss->ss_family) {
116729diff --git a/net/compat.c b/net/compat.c
116730index 5cfd26a..7e43828 100644
116731--- a/net/compat.c
116732+++ b/net/compat.c
116733@@ -98,20 +98,20 @@ int get_compat_msghdr(struct msghdr *kmsg,
116734
116735 #define CMSG_COMPAT_FIRSTHDR(msg) \
116736 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
116737- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
116738+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
116739 (struct compat_cmsghdr __user *)NULL)
116740
116741 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
116742 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
116743 (ucmlen) <= (unsigned long) \
116744 ((mhdr)->msg_controllen - \
116745- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
116746+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
116747
116748 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
116749 struct compat_cmsghdr __user *cmsg, int cmsg_len)
116750 {
116751 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
116752- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
116753+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
116754 msg->msg_controllen)
116755 return NULL;
116756 return (struct compat_cmsghdr __user *)ptr;
116757@@ -201,7 +201,7 @@ Efault:
116758
116759 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
116760 {
116761- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116762+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116763 struct compat_cmsghdr cmhdr;
116764 struct compat_timeval ctv;
116765 struct compat_timespec cts[3];
116766@@ -257,7 +257,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
116767
116768 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
116769 {
116770- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116771+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116772 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
116773 int fdnum = scm->fp->count;
116774 struct file **fp = scm->fp->fp;
116775@@ -345,7 +345,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
116776 return -EFAULT;
116777 old_fs = get_fs();
116778 set_fs(KERNEL_DS);
116779- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
116780+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
116781 set_fs(old_fs);
116782
116783 return err;
116784@@ -406,7 +406,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
116785 len = sizeof(ktime);
116786 old_fs = get_fs();
116787 set_fs(KERNEL_DS);
116788- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
116789+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
116790 set_fs(old_fs);
116791
116792 if (!err) {
116793@@ -549,7 +549,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116794 case MCAST_JOIN_GROUP:
116795 case MCAST_LEAVE_GROUP:
116796 {
116797- struct compat_group_req __user *gr32 = (void *)optval;
116798+ struct compat_group_req __user *gr32 = (void __user *)optval;
116799 struct group_req __user *kgr =
116800 compat_alloc_user_space(sizeof(struct group_req));
116801 u32 interface;
116802@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116803 case MCAST_BLOCK_SOURCE:
116804 case MCAST_UNBLOCK_SOURCE:
116805 {
116806- struct compat_group_source_req __user *gsr32 = (void *)optval;
116807+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
116808 struct group_source_req __user *kgsr = compat_alloc_user_space(
116809 sizeof(struct group_source_req));
116810 u32 interface;
116811@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116812 }
116813 case MCAST_MSFILTER:
116814 {
116815- struct compat_group_filter __user *gf32 = (void *)optval;
116816+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116817 struct group_filter __user *kgf;
116818 u32 interface, fmode, numsrc;
116819
116820@@ -629,7 +629,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
116821 char __user *optval, int __user *optlen,
116822 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
116823 {
116824- struct compat_group_filter __user *gf32 = (void *)optval;
116825+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116826 struct group_filter __user *kgf;
116827 int __user *koptlen;
116828 u32 interface, fmode, numsrc;
116829@@ -773,7 +773,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
116830
116831 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
116832 return -EINVAL;
116833- if (copy_from_user(a, args, nas[call]))
116834+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
116835 return -EFAULT;
116836 a0 = a[0];
116837 a1 = a[1];
116838diff --git a/net/core/datagram.c b/net/core/datagram.c
116839index b80fb91..0364f4f 100644
116840--- a/net/core/datagram.c
116841+++ b/net/core/datagram.c
116842@@ -131,6 +131,35 @@ out_noerr:
116843 goto out;
116844 }
116845
116846+static struct sk_buff *skb_set_peeked(struct sk_buff *skb)
116847+{
116848+ struct sk_buff *nskb;
116849+
116850+ if (skb->peeked)
116851+ return skb;
116852+
116853+ /* We have to unshare an skb before modifying it. */
116854+ if (!skb_shared(skb))
116855+ goto done;
116856+
116857+ nskb = skb_clone(skb, GFP_ATOMIC);
116858+ if (!nskb)
116859+ return ERR_PTR(-ENOMEM);
116860+
116861+ skb->prev->next = nskb;
116862+ skb->next->prev = nskb;
116863+ nskb->prev = skb->prev;
116864+ nskb->next = skb->next;
116865+
116866+ consume_skb(skb);
116867+ skb = nskb;
116868+
116869+done:
116870+ skb->peeked = 1;
116871+
116872+ return skb;
116873+}
116874+
116875 /**
116876 * __skb_recv_datagram - Receive a datagram skbuff
116877 * @sk: socket
116878@@ -165,7 +194,9 @@ out_noerr:
116879 struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116880 int *peeked, int *off, int *err)
116881 {
116882+ struct sk_buff_head *queue = &sk->sk_receive_queue;
116883 struct sk_buff *skb, *last;
116884+ unsigned long cpu_flags;
116885 long timeo;
116886 /*
116887 * Caller is allowed not to check sk->sk_err before skb_recv_datagram()
116888@@ -184,8 +215,6 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116889 * Look at current nfs client by the way...
116890 * However, this function was correct in any case. 8)
116891 */
116892- unsigned long cpu_flags;
116893- struct sk_buff_head *queue = &sk->sk_receive_queue;
116894 int _off = *off;
116895
116896 last = (struct sk_buff *)queue;
116897@@ -199,7 +228,12 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116898 _off -= skb->len;
116899 continue;
116900 }
116901- skb->peeked = 1;
116902+
116903+ skb = skb_set_peeked(skb);
116904+ error = PTR_ERR(skb);
116905+ if (IS_ERR(skb))
116906+ goto unlock_err;
116907+
116908 atomic_inc(&skb->users);
116909 } else
116910 __skb_unlink(skb, queue);
116911@@ -223,6 +257,8 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116912
116913 return NULL;
116914
116915+unlock_err:
116916+ spin_unlock_irqrestore(&queue->lock, cpu_flags);
116917 no_packet:
116918 *err = error;
116919 return NULL;
116920@@ -302,7 +338,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
116921 }
116922
116923 kfree_skb(skb);
116924- atomic_inc(&sk->sk_drops);
116925+ atomic_inc_unchecked(&sk->sk_drops);
116926 sk_mem_reclaim_partial(sk);
116927
116928 return err;
116929@@ -622,7 +658,8 @@ __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
116930 !skb->csum_complete_sw)
116931 netdev_rx_csum_fault(skb->dev);
116932 }
116933- skb->csum_valid = !sum;
116934+ if (!skb_shared(skb))
116935+ skb->csum_valid = !sum;
116936 return sum;
116937 }
116938 EXPORT_SYMBOL(__skb_checksum_complete_head);
116939@@ -642,11 +679,13 @@ __sum16 __skb_checksum_complete(struct sk_buff *skb)
116940 netdev_rx_csum_fault(skb->dev);
116941 }
116942
116943- /* Save full packet checksum */
116944- skb->csum = csum;
116945- skb->ip_summed = CHECKSUM_COMPLETE;
116946- skb->csum_complete_sw = 1;
116947- skb->csum_valid = !sum;
116948+ if (!skb_shared(skb)) {
116949+ /* Save full packet checksum */
116950+ skb->csum = csum;
116951+ skb->ip_summed = CHECKSUM_COMPLETE;
116952+ skb->csum_complete_sw = 1;
116953+ skb->csum_valid = !sum;
116954+ }
116955
116956 return sum;
116957 }
116958diff --git a/net/core/dev.c b/net/core/dev.c
116959index aa82f9a..f28b00e 100644
116960--- a/net/core/dev.c
116961+++ b/net/core/dev.c
116962@@ -1720,7 +1720,7 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
116963 {
116964 if (skb_orphan_frags(skb, GFP_ATOMIC) ||
116965 unlikely(!is_skb_forwardable(dev, skb))) {
116966- atomic_long_inc(&dev->rx_dropped);
116967+ atomic_long_inc_unchecked(&dev->rx_dropped);
116968 kfree_skb(skb);
116969 return NET_RX_DROP;
116970 }
116971@@ -3018,7 +3018,7 @@ recursion_alert:
116972 drop:
116973 rcu_read_unlock_bh();
116974
116975- atomic_long_inc(&dev->tx_dropped);
116976+ atomic_long_inc_unchecked(&dev->tx_dropped);
116977 kfree_skb_list(skb);
116978 return rc;
116979 out:
116980@@ -3367,7 +3367,7 @@ enqueue:
116981
116982 local_irq_restore(flags);
116983
116984- atomic_long_inc(&skb->dev->rx_dropped);
116985+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
116986 kfree_skb(skb);
116987 return NET_RX_DROP;
116988 }
116989@@ -3444,7 +3444,7 @@ int netif_rx_ni(struct sk_buff *skb)
116990 }
116991 EXPORT_SYMBOL(netif_rx_ni);
116992
116993-static void net_tx_action(struct softirq_action *h)
116994+static __latent_entropy void net_tx_action(void)
116995 {
116996 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
116997
116998@@ -3783,7 +3783,7 @@ ncls:
116999 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
117000 } else {
117001 drop:
117002- atomic_long_inc(&skb->dev->rx_dropped);
117003+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
117004 kfree_skb(skb);
117005 /* Jamal, now you will not able to escape explaining
117006 * me how you were going to use this. :-)
117007@@ -4672,7 +4672,7 @@ out_unlock:
117008 return work;
117009 }
117010
117011-static void net_rx_action(struct softirq_action *h)
117012+static __latent_entropy void net_rx_action(void)
117013 {
117014 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
117015 unsigned long time_limit = jiffies + 2;
117016@@ -6721,8 +6721,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
117017 } else {
117018 netdev_stats_to_stats64(storage, &dev->stats);
117019 }
117020- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
117021- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
117022+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
117023+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
117024 return storage;
117025 }
117026 EXPORT_SYMBOL(dev_get_stats);
117027diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
117028index b94b1d2..da3ed7c 100644
117029--- a/net/core/dev_ioctl.c
117030+++ b/net/core/dev_ioctl.c
117031@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
117032 no_module = !dev;
117033 if (no_module && capable(CAP_NET_ADMIN))
117034 no_module = request_module("netdev-%s", name);
117035- if (no_module && capable(CAP_SYS_MODULE))
117036+ if (no_module && capable(CAP_SYS_MODULE)) {
117037+#ifdef CONFIG_GRKERNSEC_MODHARDEN
117038+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
117039+#else
117040 request_module("%s", name);
117041+#endif
117042+ }
117043 }
117044 EXPORT_SYMBOL(dev_load);
117045
117046diff --git a/net/core/dst.c b/net/core/dst.c
117047index e956ce6..002144be 100644
117048--- a/net/core/dst.c
117049+++ b/net/core/dst.c
117050@@ -284,7 +284,9 @@ void dst_release(struct dst_entry *dst)
117051 int newrefcnt;
117052
117053 newrefcnt = atomic_dec_return(&dst->__refcnt);
117054- WARN_ON(newrefcnt < 0);
117055+ if (unlikely(newrefcnt < 0))
117056+ net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
117057+ __func__, dst, newrefcnt);
117058 if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
117059 call_rcu(&dst->rcu_head, dst_destroy_rcu);
117060 }
117061diff --git a/net/core/filter.c b/net/core/filter.c
117062index bf831a8..8d2c4c2 100644
117063--- a/net/core/filter.c
117064+++ b/net/core/filter.c
117065@@ -579,7 +579,11 @@ do_pass:
117066
117067 /* Unknown instruction. */
117068 default:
117069- goto err;
117070+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
117071+ fp->code, fp->jt, fp->jf, fp->k);
117072+ kfree(addrs);
117073+ BUG();
117074+ return -EINVAL;
117075 }
117076
117077 insn++;
117078@@ -623,7 +627,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
117079 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
117080 int pc, ret = 0;
117081
117082- BUILD_BUG_ON(BPF_MEMWORDS > 16);
117083+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
117084
117085 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
117086 if (!masks)
117087@@ -1038,7 +1042,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
117088 if (!fp)
117089 return -ENOMEM;
117090
117091- memcpy(fp->insns, fprog->filter, fsize);
117092+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
117093
117094 fp->len = fprog->len;
117095 /* Since unattached filters are not copied back to user
117096diff --git a/net/core/flow.c b/net/core/flow.c
117097index 1033725..340f65d 100644
117098--- a/net/core/flow.c
117099+++ b/net/core/flow.c
117100@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
117101 static int flow_entry_valid(struct flow_cache_entry *fle,
117102 struct netns_xfrm *xfrm)
117103 {
117104- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
117105+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
117106 return 0;
117107 if (fle->object && !fle->object->ops->check(fle->object))
117108 return 0;
117109@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
117110 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
117111 fcp->hash_count++;
117112 }
117113- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
117114+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
117115 flo = fle->object;
117116 if (!flo)
117117 goto ret_object;
117118@@ -263,7 +263,7 @@ nocache:
117119 }
117120 flo = resolver(net, key, family, dir, flo, ctx);
117121 if (fle) {
117122- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
117123+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
117124 if (!IS_ERR(flo))
117125 fle->object = flo;
117126 else
117127diff --git a/net/core/neighbour.c b/net/core/neighbour.c
117128index 2237c1b..c0c80ab 100644
117129--- a/net/core/neighbour.c
117130+++ b/net/core/neighbour.c
117131@@ -2818,7 +2818,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
117132 void __user *buffer, size_t *lenp, loff_t *ppos)
117133 {
117134 int size, ret;
117135- struct ctl_table tmp = *ctl;
117136+ ctl_table_no_const tmp = *ctl;
117137
117138 tmp.extra1 = &zero;
117139 tmp.extra2 = &unres_qlen_max;
117140@@ -2880,7 +2880,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
117141 void __user *buffer,
117142 size_t *lenp, loff_t *ppos)
117143 {
117144- struct ctl_table tmp = *ctl;
117145+ ctl_table_no_const tmp = *ctl;
117146 int ret;
117147
117148 tmp.extra1 = &zero;
117149diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
117150index 2bf8329..2eb1423 100644
117151--- a/net/core/net-procfs.c
117152+++ b/net/core/net-procfs.c
117153@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
117154 struct rtnl_link_stats64 temp;
117155 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
117156
117157- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117158+ if (gr_proc_is_restricted())
117159+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117160+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117161+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
117162+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
117163+ else
117164+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117165 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117166 dev->name, stats->rx_bytes, stats->rx_packets,
117167 stats->rx_errors,
117168@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
117169 return 0;
117170 }
117171
117172-static const struct seq_operations dev_seq_ops = {
117173+const struct seq_operations dev_seq_ops = {
117174 .start = dev_seq_start,
117175 .next = dev_seq_next,
117176 .stop = dev_seq_stop,
117177@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
117178
117179 static int softnet_seq_open(struct inode *inode, struct file *file)
117180 {
117181- return seq_open(file, &softnet_seq_ops);
117182+ return seq_open_restrict(file, &softnet_seq_ops);
117183 }
117184
117185 static const struct file_operations softnet_seq_fops = {
117186@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
117187 else
117188 seq_printf(seq, "%04x", ntohs(pt->type));
117189
117190+#ifdef CONFIG_GRKERNSEC_HIDESYM
117191+ seq_printf(seq, " %-8s %pf\n",
117192+ pt->dev ? pt->dev->name : "", NULL);
117193+#else
117194 seq_printf(seq, " %-8s %pf\n",
117195 pt->dev ? pt->dev->name : "", pt->func);
117196+#endif
117197 }
117198
117199 return 0;
117200diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
117201index 4238d6d..e6b605c 100644
117202--- a/net/core/net-sysfs.c
117203+++ b/net/core/net-sysfs.c
117204@@ -288,7 +288,7 @@ static ssize_t carrier_changes_show(struct device *dev,
117205 {
117206 struct net_device *netdev = to_net_dev(dev);
117207 return sprintf(buf, fmt_dec,
117208- atomic_read(&netdev->carrier_changes));
117209+ atomic_read_unchecked(&netdev->carrier_changes));
117210 }
117211 static DEVICE_ATTR_RO(carrier_changes);
117212
117213diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
117214index 572af00..5acf072 100644
117215--- a/net/core/net_namespace.c
117216+++ b/net/core/net_namespace.c
117217@@ -734,7 +734,7 @@ static int __register_pernet_operations(struct list_head *list,
117218 int error;
117219 LIST_HEAD(net_exit_list);
117220
117221- list_add_tail(&ops->list, list);
117222+ pax_list_add_tail((struct list_head *)&ops->list, list);
117223 if (ops->init || (ops->id && ops->size)) {
117224 for_each_net(net) {
117225 error = ops_init(ops, net);
117226@@ -747,7 +747,7 @@ static int __register_pernet_operations(struct list_head *list,
117227
117228 out_undo:
117229 /* If I have an error cleanup all namespaces I initialized */
117230- list_del(&ops->list);
117231+ pax_list_del((struct list_head *)&ops->list);
117232 ops_exit_list(ops, &net_exit_list);
117233 ops_free_list(ops, &net_exit_list);
117234 return error;
117235@@ -758,7 +758,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
117236 struct net *net;
117237 LIST_HEAD(net_exit_list);
117238
117239- list_del(&ops->list);
117240+ pax_list_del((struct list_head *)&ops->list);
117241 for_each_net(net)
117242 list_add_tail(&net->exit_list, &net_exit_list);
117243 ops_exit_list(ops, &net_exit_list);
117244@@ -892,7 +892,7 @@ int register_pernet_device(struct pernet_operations *ops)
117245 mutex_lock(&net_mutex);
117246 error = register_pernet_operations(&pernet_list, ops);
117247 if (!error && (first_device == &pernet_list))
117248- first_device = &ops->list;
117249+ first_device = (struct list_head *)&ops->list;
117250 mutex_unlock(&net_mutex);
117251 return error;
117252 }
117253diff --git a/net/core/netpoll.c b/net/core/netpoll.c
117254index c126a87..10ad89d 100644
117255--- a/net/core/netpoll.c
117256+++ b/net/core/netpoll.c
117257@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117258 struct udphdr *udph;
117259 struct iphdr *iph;
117260 struct ethhdr *eth;
117261- static atomic_t ip_ident;
117262+ static atomic_unchecked_t ip_ident;
117263 struct ipv6hdr *ip6h;
117264
117265 udp_len = len + sizeof(*udph);
117266@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117267 put_unaligned(0x45, (unsigned char *)iph);
117268 iph->tos = 0;
117269 put_unaligned(htons(ip_len), &(iph->tot_len));
117270- iph->id = htons(atomic_inc_return(&ip_ident));
117271+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
117272 iph->frag_off = 0;
117273 iph->ttl = 64;
117274 iph->protocol = IPPROTO_UDP;
117275diff --git a/net/core/pktgen.c b/net/core/pktgen.c
117276index 508155b..fad080f 100644
117277--- a/net/core/pktgen.c
117278+++ b/net/core/pktgen.c
117279@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
117280 pn->net = net;
117281 INIT_LIST_HEAD(&pn->pktgen_threads);
117282 pn->pktgen_exiting = false;
117283- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
117284+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
117285 if (!pn->proc_dir) {
117286 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
117287 return -ENODEV;
117288diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
117289index 8de3682..fcb8a5e 100644
117290--- a/net/core/rtnetlink.c
117291+++ b/net/core/rtnetlink.c
117292@@ -61,7 +61,7 @@ struct rtnl_link {
117293 rtnl_doit_func doit;
117294 rtnl_dumpit_func dumpit;
117295 rtnl_calcit_func calcit;
117296-};
117297+} __no_const;
117298
117299 static DEFINE_MUTEX(rtnl_mutex);
117300
117301@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
117302 * to use the ops for creating device. So do not
117303 * fill up dellink as well. That disables rtnl_dellink.
117304 */
117305- if (ops->setup && !ops->dellink)
117306- ops->dellink = unregister_netdevice_queue;
117307+ if (ops->setup && !ops->dellink) {
117308+ pax_open_kernel();
117309+ *(void **)&ops->dellink = unregister_netdevice_queue;
117310+ pax_close_kernel();
117311+ }
117312
117313- list_add_tail(&ops->list, &link_ops);
117314+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
117315 return 0;
117316 }
117317 EXPORT_SYMBOL_GPL(__rtnl_link_register);
117318@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
117319 for_each_net(net) {
117320 __rtnl_kill_links(net, ops);
117321 }
117322- list_del(&ops->list);
117323+ pax_list_del((struct list_head *)&ops->list);
117324 }
117325 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
117326
117327@@ -1066,7 +1069,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
117328 (dev->ifalias &&
117329 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
117330 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
117331- atomic_read(&dev->carrier_changes)))
117332+ atomic_read_unchecked(&dev->carrier_changes)))
117333 goto nla_put_failure;
117334
117335 if (1) {
117336@@ -1748,10 +1751,13 @@ static int do_setlink(const struct sk_buff *skb,
117337 goto errout;
117338
117339 nla_for_each_nested(attr, tb[IFLA_VF_PORTS], rem) {
117340- if (nla_type(attr) != IFLA_VF_PORT)
117341- continue;
117342- err = nla_parse_nested(port, IFLA_PORT_MAX,
117343- attr, ifla_port_policy);
117344+ if (nla_type(attr) != IFLA_VF_PORT ||
117345+ nla_len(attr) < NLA_HDRLEN) {
117346+ err = -EINVAL;
117347+ goto errout;
117348+ }
117349+ err = nla_parse_nested(port, IFLA_PORT_MAX, attr,
117350+ ifla_port_policy);
117351 if (err < 0)
117352 goto errout;
117353 if (!port[IFLA_PORT_VF]) {
117354diff --git a/net/core/scm.c b/net/core/scm.c
117355index 3b6899b..cf36238 100644
117356--- a/net/core/scm.c
117357+++ b/net/core/scm.c
117358@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
117359 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117360 {
117361 struct cmsghdr __user *cm
117362- = (__force struct cmsghdr __user *)msg->msg_control;
117363+ = (struct cmsghdr __force_user *)msg->msg_control;
117364 struct cmsghdr cmhdr;
117365 int cmlen = CMSG_LEN(len);
117366 int err;
117367@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117368 err = -EFAULT;
117369 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
117370 goto out;
117371- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
117372+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
117373 goto out;
117374 cmlen = CMSG_SPACE(len);
117375 if (msg->msg_controllen < cmlen)
117376@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
117377 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117378 {
117379 struct cmsghdr __user *cm
117380- = (__force struct cmsghdr __user*)msg->msg_control;
117381+ = (struct cmsghdr __force_user *)msg->msg_control;
117382
117383 int fdmax = 0;
117384 int fdnum = scm->fp->count;
117385@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117386 if (fdnum < fdmax)
117387 fdmax = fdnum;
117388
117389- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
117390+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
117391 i++, cmfptr++)
117392 {
117393 struct socket *sock;
117394diff --git a/net/core/skbuff.c b/net/core/skbuff.c
117395index 41ec022..89b1df7 100644
117396--- a/net/core/skbuff.c
117397+++ b/net/core/skbuff.c
117398@@ -340,7 +340,7 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size)
117399
117400 if (skb && frag_size) {
117401 skb->head_frag = 1;
117402- if (virt_to_head_page(data)->pfmemalloc)
117403+ if (page_is_pfmemalloc(virt_to_head_page(data)))
117404 skb->pfmemalloc = 1;
117405 }
117406 return skb;
117407@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
117408 __wsum skb_checksum(const struct sk_buff *skb, int offset,
117409 int len, __wsum csum)
117410 {
117411- const struct skb_checksum_ops ops = {
117412+ static const struct skb_checksum_ops ops = {
117413 .update = csum_partial_ext,
117414 .combine = csum_block_add_ext,
117415 };
117416@@ -3335,12 +3335,14 @@ void __init skb_init(void)
117417 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
117418 sizeof(struct sk_buff),
117419 0,
117420- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117421+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117422+ SLAB_NO_SANITIZE,
117423 NULL);
117424 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
117425 sizeof(struct sk_buff_fclones),
117426 0,
117427- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117428+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117429+ SLAB_NO_SANITIZE,
117430 NULL);
117431 }
117432
117433diff --git a/net/core/sock.c b/net/core/sock.c
117434index dc30dc5..8bb3ef3 100644
117435--- a/net/core/sock.c
117436+++ b/net/core/sock.c
117437@@ -440,7 +440,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117438 struct sk_buff_head *list = &sk->sk_receive_queue;
117439
117440 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
117441- atomic_inc(&sk->sk_drops);
117442+ atomic_inc_unchecked(&sk->sk_drops);
117443 trace_sock_rcvqueue_full(sk, skb);
117444 return -ENOMEM;
117445 }
117446@@ -450,7 +450,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117447 return err;
117448
117449 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
117450- atomic_inc(&sk->sk_drops);
117451+ atomic_inc_unchecked(&sk->sk_drops);
117452 return -ENOBUFS;
117453 }
117454
117455@@ -483,7 +483,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117456 skb->dev = NULL;
117457
117458 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
117459- atomic_inc(&sk->sk_drops);
117460+ atomic_inc_unchecked(&sk->sk_drops);
117461 goto discard_and_relse;
117462 }
117463 if (nested)
117464@@ -501,7 +501,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117465 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
117466 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
117467 bh_unlock_sock(sk);
117468- atomic_inc(&sk->sk_drops);
117469+ atomic_inc_unchecked(&sk->sk_drops);
117470 goto discard_and_relse;
117471 }
117472
117473@@ -907,6 +907,7 @@ set_rcvbuf:
117474 }
117475 break;
117476
117477+#ifndef GRKERNSEC_BPF_HARDEN
117478 case SO_ATTACH_BPF:
117479 ret = -EINVAL;
117480 if (optlen == sizeof(u32)) {
117481@@ -919,7 +920,7 @@ set_rcvbuf:
117482 ret = sk_attach_bpf(ufd, sk);
117483 }
117484 break;
117485-
117486+#endif
117487 case SO_DETACH_FILTER:
117488 ret = sk_detach_filter(sk);
117489 break;
117490@@ -1021,12 +1022,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117491 struct timeval tm;
117492 } v;
117493
117494- int lv = sizeof(int);
117495- int len;
117496+ unsigned int lv = sizeof(int);
117497+ unsigned int len;
117498
117499 if (get_user(len, optlen))
117500 return -EFAULT;
117501- if (len < 0)
117502+ if (len > INT_MAX)
117503 return -EINVAL;
117504
117505 memset(&v, 0, sizeof(v));
117506@@ -1164,11 +1165,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117507
117508 case SO_PEERNAME:
117509 {
117510- char address[128];
117511+ char address[_K_SS_MAXSIZE];
117512
117513 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
117514 return -ENOTCONN;
117515- if (lv < len)
117516+ if (lv < len || sizeof address < len)
117517 return -EINVAL;
117518 if (copy_to_user(optval, address, len))
117519 return -EFAULT;
117520@@ -1256,7 +1257,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117521
117522 if (len > lv)
117523 len = lv;
117524- if (copy_to_user(optval, &v, len))
117525+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
117526 return -EFAULT;
117527 lenout:
117528 if (put_user(len, optlen))
117529@@ -2359,7 +2360,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
117530 */
117531 smp_wmb();
117532 atomic_set(&sk->sk_refcnt, 1);
117533- atomic_set(&sk->sk_drops, 0);
117534+ atomic_set_unchecked(&sk->sk_drops, 0);
117535 }
117536 EXPORT_SYMBOL(sock_init_data);
117537
117538@@ -2487,6 +2488,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
117539 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117540 int level, int type)
117541 {
117542+ struct sock_extended_err ee;
117543 struct sock_exterr_skb *serr;
117544 struct sk_buff *skb;
117545 int copied, err;
117546@@ -2508,7 +2510,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117547 sock_recv_timestamp(msg, sk, skb);
117548
117549 serr = SKB_EXT_ERR(skb);
117550- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
117551+ ee = serr->ee;
117552+ put_cmsg(msg, level, type, sizeof ee, &ee);
117553
117554 msg->msg_flags |= MSG_ERRQUEUE;
117555 err = copied;
117556diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
117557index 74dddf8..7f4e77e 100644
117558--- a/net/core/sock_diag.c
117559+++ b/net/core/sock_diag.c
117560@@ -9,7 +9,7 @@
117561 #include <linux/inet_diag.h>
117562 #include <linux/sock_diag.h>
117563
117564-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
117565+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
117566 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
117567 static DEFINE_MUTEX(sock_diag_table_mutex);
117568
117569@@ -127,8 +127,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
117570 mutex_lock(&sock_diag_table_mutex);
117571 if (sock_diag_handlers[hndl->family])
117572 err = -EBUSY;
117573- else
117574+ else {
117575+ pax_open_kernel();
117576 sock_diag_handlers[hndl->family] = hndl;
117577+ pax_close_kernel();
117578+ }
117579 mutex_unlock(&sock_diag_table_mutex);
117580
117581 return err;
117582@@ -144,7 +147,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
117583
117584 mutex_lock(&sock_diag_table_mutex);
117585 BUG_ON(sock_diag_handlers[family] != hnld);
117586+ pax_open_kernel();
117587 sock_diag_handlers[family] = NULL;
117588+ pax_close_kernel();
117589 mutex_unlock(&sock_diag_table_mutex);
117590 }
117591 EXPORT_SYMBOL_GPL(sock_diag_unregister);
117592diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
117593index 95b6139..3048623 100644
117594--- a/net/core/sysctl_net_core.c
117595+++ b/net/core/sysctl_net_core.c
117596@@ -35,7 +35,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
117597 {
117598 unsigned int orig_size, size;
117599 int ret, i;
117600- struct ctl_table tmp = {
117601+ ctl_table_no_const tmp = {
117602 .data = &size,
117603 .maxlen = sizeof(size),
117604 .mode = table->mode
117605@@ -203,7 +203,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117606 void __user *buffer, size_t *lenp, loff_t *ppos)
117607 {
117608 char id[IFNAMSIZ];
117609- struct ctl_table tbl = {
117610+ ctl_table_no_const tbl = {
117611 .data = id,
117612 .maxlen = IFNAMSIZ,
117613 };
117614@@ -221,7 +221,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117615 static int proc_do_rss_key(struct ctl_table *table, int write,
117616 void __user *buffer, size_t *lenp, loff_t *ppos)
117617 {
117618- struct ctl_table fake_table;
117619+ ctl_table_no_const fake_table;
117620 char buf[NETDEV_RSS_KEY_LEN * 3];
117621
117622 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
117623@@ -285,7 +285,7 @@ static struct ctl_table net_core_table[] = {
117624 .mode = 0444,
117625 .proc_handler = proc_do_rss_key,
117626 },
117627-#ifdef CONFIG_BPF_JIT
117628+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
117629 {
117630 .procname = "bpf_jit_enable",
117631 .data = &bpf_jit_enable,
117632@@ -409,13 +409,12 @@ static struct ctl_table netns_core_table[] = {
117633
117634 static __net_init int sysctl_core_net_init(struct net *net)
117635 {
117636- struct ctl_table *tbl;
117637+ ctl_table_no_const *tbl = NULL;
117638
117639 net->core.sysctl_somaxconn = SOMAXCONN;
117640
117641- tbl = netns_core_table;
117642 if (!net_eq(net, &init_net)) {
117643- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
117644+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
117645 if (tbl == NULL)
117646 goto err_dup;
117647
117648@@ -425,17 +424,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
117649 if (net->user_ns != &init_user_ns) {
117650 tbl[0].procname = NULL;
117651 }
117652- }
117653-
117654- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117655+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117656+ } else
117657+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
117658 if (net->core.sysctl_hdr == NULL)
117659 goto err_reg;
117660
117661 return 0;
117662
117663 err_reg:
117664- if (tbl != netns_core_table)
117665- kfree(tbl);
117666+ kfree(tbl);
117667 err_dup:
117668 return -ENOMEM;
117669 }
117670@@ -450,7 +448,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
117671 kfree(tbl);
117672 }
117673
117674-static __net_initdata struct pernet_operations sysctl_core_ops = {
117675+static __net_initconst struct pernet_operations sysctl_core_ops = {
117676 .init = sysctl_core_net_init,
117677 .exit = sysctl_core_net_exit,
117678 };
117679diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
117680index 754484b..4f4b894 100644
117681--- a/net/decnet/af_decnet.c
117682+++ b/net/decnet/af_decnet.c
117683@@ -466,6 +466,7 @@ static struct proto dn_proto = {
117684 .sysctl_rmem = sysctl_decnet_rmem,
117685 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
117686 .obj_size = sizeof(struct dn_sock),
117687+ .slab_flags = SLAB_USERCOPY,
117688 };
117689
117690 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
117691diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
117692index b2c26b0..41f803e 100644
117693--- a/net/decnet/dn_dev.c
117694+++ b/net/decnet/dn_dev.c
117695@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
117696 .extra1 = &min_t3,
117697 .extra2 = &max_t3
117698 },
117699- {0}
117700+ { }
117701 },
117702 };
117703
117704diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
117705index 5325b54..a0d4d69 100644
117706--- a/net/decnet/sysctl_net_decnet.c
117707+++ b/net/decnet/sysctl_net_decnet.c
117708@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
117709
117710 if (len > *lenp) len = *lenp;
117711
117712- if (copy_to_user(buffer, addr, len))
117713+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
117714 return -EFAULT;
117715
117716 *lenp = len;
117717@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
117718
117719 if (len > *lenp) len = *lenp;
117720
117721- if (copy_to_user(buffer, devname, len))
117722+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
117723 return -EFAULT;
117724
117725 *lenp = len;
117726diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
117727index 392e29a..da953a2 100644
117728--- a/net/dsa/dsa.c
117729+++ b/net/dsa/dsa.c
117730@@ -851,7 +851,7 @@ static struct packet_type dsa_pack_type __read_mostly = {
117731 .func = dsa_switch_rcv,
117732 };
117733
117734-static struct notifier_block dsa_netdevice_nb __read_mostly = {
117735+static struct notifier_block dsa_netdevice_nb = {
117736 .notifier_call = dsa_slave_netdevice_event,
117737 };
117738
117739diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
117740index a2c7e4c..3dc9f67 100644
117741--- a/net/hsr/hsr_netlink.c
117742+++ b/net/hsr/hsr_netlink.c
117743@@ -102,7 +102,7 @@ nla_put_failure:
117744 return -EMSGSIZE;
117745 }
117746
117747-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
117748+static struct rtnl_link_ops hsr_link_ops = {
117749 .kind = "hsr",
117750 .maxtype = IFLA_HSR_MAX,
117751 .policy = hsr_policy,
117752diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
117753index 0ae5822..3fe3627 100644
117754--- a/net/ieee802154/6lowpan/core.c
117755+++ b/net/ieee802154/6lowpan/core.c
117756@@ -219,7 +219,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
117757 dev_put(real_dev);
117758 }
117759
117760-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
117761+static struct rtnl_link_ops lowpan_link_ops = {
117762 .kind = "lowpan",
117763 .priv_size = sizeof(struct lowpan_dev_info),
117764 .setup = lowpan_setup,
117765diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
117766index f46e4d1..dcb7f86 100644
117767--- a/net/ieee802154/6lowpan/reassembly.c
117768+++ b/net/ieee802154/6lowpan/reassembly.c
117769@@ -207,7 +207,7 @@ found:
117770 } else {
117771 fq->q.meat += skb->len;
117772 }
117773- add_frag_mem_limit(&fq->q, skb->truesize);
117774+ add_frag_mem_limit(fq->q.net, skb->truesize);
117775
117776 if (fq->q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &&
117777 fq->q.meat == fq->q.len) {
117778@@ -287,7 +287,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev,
117779 clone->data_len = clone->len;
117780 head->data_len -= clone->len;
117781 head->len -= clone->len;
117782- add_frag_mem_limit(&fq->q, clone->truesize);
117783+ add_frag_mem_limit(fq->q.net, clone->truesize);
117784 }
117785
117786 WARN_ON(head == NULL);
117787@@ -310,7 +310,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev,
117788 }
117789 fp = next;
117790 }
117791- sub_frag_mem_limit(&fq->q, sum_truesize);
117792+ sub_frag_mem_limit(fq->q.net, sum_truesize);
117793
117794 head->next = NULL;
117795 head->dev = dev;
117796@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
117797
117798 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117799 {
117800- struct ctl_table *table;
117801+ ctl_table_no_const *table = NULL;
117802 struct ctl_table_header *hdr;
117803 struct netns_ieee802154_lowpan *ieee802154_lowpan =
117804 net_ieee802154_lowpan(net);
117805
117806- table = lowpan_frags_ns_ctl_table;
117807 if (!net_eq(net, &init_net)) {
117808- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
117809+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
117810 GFP_KERNEL);
117811 if (table == NULL)
117812 goto err_alloc;
117813@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117814 /* Don't export sysctls to unprivileged users */
117815 if (net->user_ns != &init_user_ns)
117816 table[0].procname = NULL;
117817- }
117818-
117819- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117820+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117821+ } else
117822+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
117823 if (hdr == NULL)
117824 goto err_reg;
117825
117826@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117827 return 0;
117828
117829 err_reg:
117830- if (!net_eq(net, &init_net))
117831- kfree(table);
117832+ kfree(table);
117833 err_alloc:
117834 return -ENOMEM;
117835 }
117836diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
117837index a5aa54e..3bd5f9f 100644
117838--- a/net/ipv4/af_inet.c
117839+++ b/net/ipv4/af_inet.c
117840@@ -1391,7 +1391,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
117841 return ip_recv_error(sk, msg, len, addr_len);
117842 #if IS_ENABLED(CONFIG_IPV6)
117843 if (sk->sk_family == AF_INET6)
117844- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
117845+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
117846 #endif
117847 return -EINVAL;
117848 }
117849diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
117850index 419d23c..2084616 100644
117851--- a/net/ipv4/devinet.c
117852+++ b/net/ipv4/devinet.c
117853@@ -69,7 +69,8 @@
117854
117855 static struct ipv4_devconf ipv4_devconf = {
117856 .data = {
117857- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117858+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117859+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117860 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117861 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117862 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117863@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
117864
117865 static struct ipv4_devconf ipv4_devconf_dflt = {
117866 .data = {
117867- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117868+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117869+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117870 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117871 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117872 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117873@@ -1580,7 +1582,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
117874 idx = 0;
117875 head = &net->dev_index_head[h];
117876 rcu_read_lock();
117877- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117878+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117879 net->dev_base_seq;
117880 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117881 if (idx < s_idx)
117882@@ -1899,7 +1901,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
117883 idx = 0;
117884 head = &net->dev_index_head[h];
117885 rcu_read_lock();
117886- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117887+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117888 net->dev_base_seq;
117889 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117890 if (idx < s_idx)
117891@@ -2134,7 +2136,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
117892 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
117893 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
117894
117895-static struct devinet_sysctl_table {
117896+static const struct devinet_sysctl_table {
117897 struct ctl_table_header *sysctl_header;
117898 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
117899 } devinet_sysctl = {
117900@@ -2266,7 +2268,7 @@ static __net_init int devinet_init_net(struct net *net)
117901 int err;
117902 struct ipv4_devconf *all, *dflt;
117903 #ifdef CONFIG_SYSCTL
117904- struct ctl_table *tbl = ctl_forward_entry;
117905+ ctl_table_no_const *tbl = NULL;
117906 struct ctl_table_header *forw_hdr;
117907 #endif
117908
117909@@ -2284,7 +2286,7 @@ static __net_init int devinet_init_net(struct net *net)
117910 goto err_alloc_dflt;
117911
117912 #ifdef CONFIG_SYSCTL
117913- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
117914+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
117915 if (!tbl)
117916 goto err_alloc_ctl;
117917
117918@@ -2304,7 +2306,10 @@ static __net_init int devinet_init_net(struct net *net)
117919 goto err_reg_dflt;
117920
117921 err = -ENOMEM;
117922- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117923+ if (!net_eq(net, &init_net))
117924+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117925+ else
117926+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
117927 if (!forw_hdr)
117928 goto err_reg_ctl;
117929 net->ipv4.forw_hdr = forw_hdr;
117930@@ -2320,8 +2325,7 @@ err_reg_ctl:
117931 err_reg_dflt:
117932 __devinet_sysctl_unregister(all);
117933 err_reg_all:
117934- if (tbl != ctl_forward_entry)
117935- kfree(tbl);
117936+ kfree(tbl);
117937 err_alloc_ctl:
117938 #endif
117939 if (dflt != &ipv4_devconf_dflt)
117940diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
117941index 872494e..8e0b4d1 100644
117942--- a/net/ipv4/fib_frontend.c
117943+++ b/net/ipv4/fib_frontend.c
117944@@ -1083,12 +1083,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
117945 #ifdef CONFIG_IP_ROUTE_MULTIPATH
117946 fib_sync_up(dev);
117947 #endif
117948- atomic_inc(&net->ipv4.dev_addr_genid);
117949+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117950 rt_cache_flush(dev_net(dev));
117951 break;
117952 case NETDEV_DOWN:
117953 fib_del_ifaddr(ifa, NULL);
117954- atomic_inc(&net->ipv4.dev_addr_genid);
117955+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117956 if (!ifa->ifa_dev->ifa_list) {
117957 /* Last address was deleted from this interface.
117958 * Disable IP.
117959@@ -1126,7 +1126,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
117960 #ifdef CONFIG_IP_ROUTE_MULTIPATH
117961 fib_sync_up(dev);
117962 #endif
117963- atomic_inc(&net->ipv4.dev_addr_genid);
117964+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117965 rt_cache_flush(net);
117966 break;
117967 case NETDEV_DOWN:
117968diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
117969index 8d695b6..752d427a 100644
117970--- a/net/ipv4/fib_semantics.c
117971+++ b/net/ipv4/fib_semantics.c
117972@@ -752,7 +752,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
117973 nh->nh_saddr = inet_select_addr(nh->nh_dev,
117974 nh->nh_gw,
117975 nh->nh_parent->fib_scope);
117976- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
117977+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
117978
117979 return nh->nh_saddr;
117980 }
117981diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
117982index 09b62e1..2871350 100644
117983--- a/net/ipv4/fib_trie.c
117984+++ b/net/ipv4/fib_trie.c
117985@@ -2457,7 +2457,7 @@ static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter,
117986 key = l->key + 1;
117987 iter->pos++;
117988
117989- if (pos-- <= 0)
117990+ if (--pos <= 0)
117991 break;
117992
117993 l = NULL;
117994diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
117995index 5e346a0..d0a7c03 100644
117996--- a/net/ipv4/inet_fragment.c
117997+++ b/net/ipv4/inet_fragment.c
117998@@ -131,34 +131,22 @@ inet_evict_bucket(struct inet_frags *f, struct inet_frag_bucket *hb)
117999 unsigned int evicted = 0;
118000 HLIST_HEAD(expired);
118001
118002-evict_again:
118003 spin_lock(&hb->chain_lock);
118004
118005 hlist_for_each_entry_safe(fq, n, &hb->chain, list) {
118006 if (!inet_fragq_should_evict(fq))
118007 continue;
118008
118009- if (!del_timer(&fq->timer)) {
118010- /* q expiring right now thus increment its refcount so
118011- * it won't be freed under us and wait until the timer
118012- * has finished executing then destroy it
118013- */
118014- atomic_inc(&fq->refcnt);
118015- spin_unlock(&hb->chain_lock);
118016- del_timer_sync(&fq->timer);
118017- inet_frag_put(fq, f);
118018- goto evict_again;
118019- }
118020+ if (!del_timer(&fq->timer))
118021+ continue;
118022
118023- fq->flags |= INET_FRAG_EVICTED;
118024- hlist_del(&fq->list);
118025- hlist_add_head(&fq->list, &expired);
118026+ hlist_add_head(&fq->list_evictor, &expired);
118027 ++evicted;
118028 }
118029
118030 spin_unlock(&hb->chain_lock);
118031
118032- hlist_for_each_entry_safe(fq, n, &expired, list)
118033+ hlist_for_each_entry_safe(fq, n, &expired, list_evictor)
118034 f->frag_expire((unsigned long) fq);
118035
118036 return evicted;
118037@@ -240,19 +228,21 @@ void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f)
118038 int i;
118039
118040 nf->low_thresh = 0;
118041- local_bh_disable();
118042
118043 evict_again:
118044+ local_bh_disable();
118045 seq = read_seqbegin(&f->rnd_seqlock);
118046
118047 for (i = 0; i < INETFRAGS_HASHSZ ; i++)
118048 inet_evict_bucket(f, &f->hash[i]);
118049
118050- if (read_seqretry(&f->rnd_seqlock, seq))
118051+ local_bh_enable();
118052+ cond_resched();
118053+
118054+ if (read_seqretry(&f->rnd_seqlock, seq) ||
118055+ percpu_counter_sum(&nf->mem))
118056 goto evict_again;
118057
118058- local_bh_enable();
118059-
118060 percpu_counter_destroy(&nf->mem);
118061 }
118062 EXPORT_SYMBOL(inet_frags_exit_net);
118063@@ -284,8 +274,8 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f)
118064 struct inet_frag_bucket *hb;
118065
118066 hb = get_frag_bucket_locked(fq, f);
118067- if (!(fq->flags & INET_FRAG_EVICTED))
118068- hlist_del(&fq->list);
118069+ hlist_del(&fq->list);
118070+ fq->flags |= INET_FRAG_COMPLETE;
118071 spin_unlock(&hb->chain_lock);
118072 }
118073
118074@@ -297,7 +287,6 @@ void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f)
118075 if (!(fq->flags & INET_FRAG_COMPLETE)) {
118076 fq_unlink(fq, f);
118077 atomic_dec(&fq->refcnt);
118078- fq->flags |= INET_FRAG_COMPLETE;
118079 }
118080 }
118081 EXPORT_SYMBOL(inet_frag_kill);
118082@@ -330,11 +319,12 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f)
118083 fp = xp;
118084 }
118085 sum = sum_truesize + f->qsize;
118086- sub_frag_mem_limit(q, sum);
118087
118088 if (f->destructor)
118089 f->destructor(q);
118090 kmem_cache_free(f->frags_cachep, q);
118091+
118092+ sub_frag_mem_limit(nf, sum);
118093 }
118094 EXPORT_SYMBOL(inet_frag_destroy);
118095
118096@@ -390,7 +380,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,
118097
118098 q->net = nf;
118099 f->constructor(q, arg);
118100- add_frag_mem_limit(q, f->qsize);
118101+ add_frag_mem_limit(nf, f->qsize);
118102
118103 setup_timer(&q->timer, f->frag_expire, (unsigned long)q);
118104 spin_lock_init(&q->lock);
118105diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
118106index c6fb80b..8705495 100644
118107--- a/net/ipv4/inet_hashtables.c
118108+++ b/net/ipv4/inet_hashtables.c
118109@@ -18,6 +18,7 @@
118110 #include <linux/sched.h>
118111 #include <linux/slab.h>
118112 #include <linux/wait.h>
118113+#include <linux/security.h>
118114
118115 #include <net/inet_connection_sock.h>
118116 #include <net/inet_hashtables.h>
118117@@ -53,6 +54,8 @@ u32 sk_ehashfn(const struct sock *sk)
118118 sk->sk_daddr, sk->sk_dport);
118119 }
118120
118121+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
118122+
118123 /*
118124 * Allocate and initialize a new local port bind bucket.
118125 * The bindhash mutex for snum's hash chain must be held here.
118126@@ -564,6 +567,8 @@ ok:
118127 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
118128 spin_unlock(&head->lock);
118129
118130+ gr_update_task_in_ip_table(inet_sk(sk));
118131+
118132 if (tw) {
118133 inet_twsk_deschedule(tw);
118134 while (twrefcnt) {
118135diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
118136index 241afd7..31b95d5 100644
118137--- a/net/ipv4/inetpeer.c
118138+++ b/net/ipv4/inetpeer.c
118139@@ -461,7 +461,7 @@ relookup:
118140 if (p) {
118141 p->daddr = *daddr;
118142 atomic_set(&p->refcnt, 1);
118143- atomic_set(&p->rid, 0);
118144+ atomic_set_unchecked(&p->rid, 0);
118145 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
118146 p->rate_tokens = 0;
118147 /* 60*HZ is arbitrary, but chosen enough high so that the first
118148diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
118149index cc1da6d..593fc73 100644
118150--- a/net/ipv4/ip_fragment.c
118151+++ b/net/ipv4/ip_fragment.c
118152@@ -192,7 +192,7 @@ static void ip_expire(unsigned long arg)
118153 ipq_kill(qp);
118154 IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
118155
118156- if (!(qp->q.flags & INET_FRAG_EVICTED)) {
118157+ if (!inet_frag_evicting(&qp->q)) {
118158 struct sk_buff *head = qp->q.fragments;
118159 const struct iphdr *iph;
118160 int err;
118161@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
118162 return 0;
118163
118164 start = qp->rid;
118165- end = atomic_inc_return(&peer->rid);
118166+ end = atomic_inc_return_unchecked(&peer->rid);
118167 qp->rid = end;
118168
118169 rc = qp->q.fragments && (end - start) > max;
118170@@ -301,7 +301,7 @@ static int ip_frag_reinit(struct ipq *qp)
118171 kfree_skb(fp);
118172 fp = xp;
118173 } while (fp);
118174- sub_frag_mem_limit(&qp->q, sum_truesize);
118175+ sub_frag_mem_limit(qp->q.net, sum_truesize);
118176
118177 qp->q.flags = 0;
118178 qp->q.len = 0;
118179@@ -446,7 +446,7 @@ found:
118180 qp->q.fragments = next;
118181
118182 qp->q.meat -= free_it->len;
118183- sub_frag_mem_limit(&qp->q, free_it->truesize);
118184+ sub_frag_mem_limit(qp->q.net, free_it->truesize);
118185 kfree_skb(free_it);
118186 }
118187 }
118188@@ -470,7 +470,7 @@ found:
118189 qp->q.stamp = skb->tstamp;
118190 qp->q.meat += skb->len;
118191 qp->ecn |= ecn;
118192- add_frag_mem_limit(&qp->q, skb->truesize);
118193+ add_frag_mem_limit(qp->q.net, skb->truesize);
118194 if (offset == 0)
118195 qp->q.flags |= INET_FRAG_FIRST_IN;
118196
118197@@ -573,7 +573,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
118198 head->len -= clone->len;
118199 clone->csum = 0;
118200 clone->ip_summed = head->ip_summed;
118201- add_frag_mem_limit(&qp->q, clone->truesize);
118202+ add_frag_mem_limit(qp->q.net, clone->truesize);
118203 }
118204
118205 skb_push(head, head->data - skb_network_header(head));
118206@@ -601,7 +601,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
118207 }
118208 fp = next;
118209 }
118210- sub_frag_mem_limit(&qp->q, sum_truesize);
118211+ sub_frag_mem_limit(qp->q.net, sum_truesize);
118212
118213 head->next = NULL;
118214 head->dev = dev;
118215@@ -750,12 +750,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
118216
118217 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118218 {
118219- struct ctl_table *table;
118220+ ctl_table_no_const *table = NULL;
118221 struct ctl_table_header *hdr;
118222
118223- table = ip4_frags_ns_ctl_table;
118224 if (!net_eq(net, &init_net)) {
118225- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118226+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118227 if (!table)
118228 goto err_alloc;
118229
118230@@ -769,9 +768,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118231 /* Don't export sysctls to unprivileged users */
118232 if (net->user_ns != &init_user_ns)
118233 table[0].procname = NULL;
118234- }
118235+ hdr = register_net_sysctl(net, "net/ipv4", table);
118236+ } else
118237+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
118238
118239- hdr = register_net_sysctl(net, "net/ipv4", table);
118240 if (!hdr)
118241 goto err_reg;
118242
118243@@ -779,8 +779,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118244 return 0;
118245
118246 err_reg:
118247- if (!net_eq(net, &init_net))
118248- kfree(table);
118249+ kfree(table);
118250 err_alloc:
118251 return -ENOMEM;
118252 }
118253diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
118254index 5fd7064..d13d75f 100644
118255--- a/net/ipv4/ip_gre.c
118256+++ b/net/ipv4/ip_gre.c
118257@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
118258 module_param(log_ecn_error, bool, 0644);
118259 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118260
118261-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
118262+static struct rtnl_link_ops ipgre_link_ops;
118263 static int ipgre_tunnel_init(struct net_device *dev);
118264
118265 static int ipgre_net_id __read_mostly;
118266@@ -819,7 +819,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
118267 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
118268 };
118269
118270-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118271+static struct rtnl_link_ops ipgre_link_ops = {
118272 .kind = "gre",
118273 .maxtype = IFLA_GRE_MAX,
118274 .policy = ipgre_policy,
118275@@ -834,7 +834,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118276 .get_link_net = ip_tunnel_get_link_net,
118277 };
118278
118279-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
118280+static struct rtnl_link_ops ipgre_tap_ops = {
118281 .kind = "gretap",
118282 .maxtype = IFLA_GRE_MAX,
118283 .policy = ipgre_policy,
118284diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
118285index 2db4c87..4db9282 100644
118286--- a/net/ipv4/ip_input.c
118287+++ b/net/ipv4/ip_input.c
118288@@ -147,6 +147,10 @@
118289 #include <linux/mroute.h>
118290 #include <linux/netlink.h>
118291
118292+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118293+extern int grsec_enable_blackhole;
118294+#endif
118295+
118296 /*
118297 * Process Router Attention IP option (RFC 2113)
118298 */
118299@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sock *sk, struct sk_buff *skb)
118300 if (!raw) {
118301 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
118302 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
118303+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118304+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
118305+#endif
118306 icmp_send(skb, ICMP_DEST_UNREACH,
118307 ICMP_PROT_UNREACH, 0);
118308 }
118309diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
118310index 6ddde89..653e224 100644
118311--- a/net/ipv4/ip_sockglue.c
118312+++ b/net/ipv4/ip_sockglue.c
118313@@ -1291,7 +1291,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118314 len = min_t(unsigned int, len, opt->optlen);
118315 if (put_user(len, optlen))
118316 return -EFAULT;
118317- if (copy_to_user(optval, opt->__data, len))
118318+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
118319+ copy_to_user(optval, opt->__data, len))
118320 return -EFAULT;
118321 return 0;
118322 }
118323@@ -1425,7 +1426,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118324 if (sk->sk_type != SOCK_STREAM)
118325 return -ENOPROTOOPT;
118326
118327- msg.msg_control = (__force void *) optval;
118328+ msg.msg_control = (__force_kernel void *) optval;
118329 msg.msg_controllen = len;
118330 msg.msg_flags = flags;
118331
118332diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
118333index 0c15208..a3a76c5 100644
118334--- a/net/ipv4/ip_vti.c
118335+++ b/net/ipv4/ip_vti.c
118336@@ -45,7 +45,7 @@
118337 #include <net/net_namespace.h>
118338 #include <net/netns/generic.h>
118339
118340-static struct rtnl_link_ops vti_link_ops __read_mostly;
118341+static struct rtnl_link_ops vti_link_ops;
118342
118343 static int vti_net_id __read_mostly;
118344 static int vti_tunnel_init(struct net_device *dev);
118345@@ -525,7 +525,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
118346 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
118347 };
118348
118349-static struct rtnl_link_ops vti_link_ops __read_mostly = {
118350+static struct rtnl_link_ops vti_link_ops = {
118351 .kind = "vti",
118352 .maxtype = IFLA_VTI_MAX,
118353 .policy = vti_policy,
118354diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
118355index 8e7328c..9bd7ed3 100644
118356--- a/net/ipv4/ipconfig.c
118357+++ b/net/ipv4/ipconfig.c
118358@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
118359
118360 mm_segment_t oldfs = get_fs();
118361 set_fs(get_ds());
118362- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118363+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118364 set_fs(oldfs);
118365 return res;
118366 }
118367@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
118368
118369 mm_segment_t oldfs = get_fs();
118370 set_fs(get_ds());
118371- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118372+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118373 set_fs(oldfs);
118374 return res;
118375 }
118376@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
118377
118378 mm_segment_t oldfs = get_fs();
118379 set_fs(get_ds());
118380- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
118381+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
118382 set_fs(oldfs);
118383 return res;
118384 }
118385diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
118386index ff96396..2e928ba 100644
118387--- a/net/ipv4/ipip.c
118388+++ b/net/ipv4/ipip.c
118389@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118390 static int ipip_net_id __read_mostly;
118391
118392 static int ipip_tunnel_init(struct net_device *dev);
118393-static struct rtnl_link_ops ipip_link_ops __read_mostly;
118394+static struct rtnl_link_ops ipip_link_ops;
118395
118396 static int ipip_err(struct sk_buff *skb, u32 info)
118397 {
118398@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
118399 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
118400 };
118401
118402-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
118403+static struct rtnl_link_ops ipip_link_ops = {
118404 .kind = "ipip",
118405 .maxtype = IFLA_IPTUN_MAX,
118406 .policy = ipip_policy,
118407diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
118408index a612007..99ac4bc5 100644
118409--- a/net/ipv4/netfilter/arp_tables.c
118410+++ b/net/ipv4/netfilter/arp_tables.c
118411@@ -884,14 +884,14 @@ static int compat_table_info(const struct xt_table_info *info,
118412 #endif
118413
118414 static int get_info(struct net *net, void __user *user,
118415- const int *len, int compat)
118416+ int len, int compat)
118417 {
118418 char name[XT_TABLE_MAXNAMELEN];
118419 struct xt_table *t;
118420 int ret;
118421
118422- if (*len != sizeof(struct arpt_getinfo)) {
118423- duprintf("length %u != %Zu\n", *len,
118424+ if (len != sizeof(struct arpt_getinfo)) {
118425+ duprintf("length %u != %Zu\n", len,
118426 sizeof(struct arpt_getinfo));
118427 return -EINVAL;
118428 }
118429@@ -928,7 +928,7 @@ static int get_info(struct net *net, void __user *user,
118430 info.size = private->size;
118431 strcpy(info.name, name);
118432
118433- if (copy_to_user(user, &info, *len) != 0)
118434+ if (copy_to_user(user, &info, len) != 0)
118435 ret = -EFAULT;
118436 else
118437 ret = 0;
118438@@ -1695,7 +1695,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
118439
118440 switch (cmd) {
118441 case ARPT_SO_GET_INFO:
118442- ret = get_info(sock_net(sk), user, len, 1);
118443+ ret = get_info(sock_net(sk), user, *len, 1);
118444 break;
118445 case ARPT_SO_GET_ENTRIES:
118446 ret = compat_get_entries(sock_net(sk), user, len);
118447@@ -1740,7 +1740,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
118448
118449 switch (cmd) {
118450 case ARPT_SO_GET_INFO:
118451- ret = get_info(sock_net(sk), user, len, 0);
118452+ ret = get_info(sock_net(sk), user, *len, 0);
118453 break;
118454
118455 case ARPT_SO_GET_ENTRIES:
118456diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
118457index 2d0e265..67e5b8d 100644
118458--- a/net/ipv4/netfilter/ip_tables.c
118459+++ b/net/ipv4/netfilter/ip_tables.c
118460@@ -1072,14 +1072,14 @@ static int compat_table_info(const struct xt_table_info *info,
118461 #endif
118462
118463 static int get_info(struct net *net, void __user *user,
118464- const int *len, int compat)
118465+ int len, int compat)
118466 {
118467 char name[XT_TABLE_MAXNAMELEN];
118468 struct xt_table *t;
118469 int ret;
118470
118471- if (*len != sizeof(struct ipt_getinfo)) {
118472- duprintf("length %u != %zu\n", *len,
118473+ if (len != sizeof(struct ipt_getinfo)) {
118474+ duprintf("length %u != %zu\n", len,
118475 sizeof(struct ipt_getinfo));
118476 return -EINVAL;
118477 }
118478@@ -1116,7 +1116,7 @@ static int get_info(struct net *net, void __user *user,
118479 info.size = private->size;
118480 strcpy(info.name, name);
118481
118482- if (copy_to_user(user, &info, *len) != 0)
118483+ if (copy_to_user(user, &info, len) != 0)
118484 ret = -EFAULT;
118485 else
118486 ret = 0;
118487@@ -1978,7 +1978,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118488
118489 switch (cmd) {
118490 case IPT_SO_GET_INFO:
118491- ret = get_info(sock_net(sk), user, len, 1);
118492+ ret = get_info(sock_net(sk), user, *len, 1);
118493 break;
118494 case IPT_SO_GET_ENTRIES:
118495 ret = compat_get_entries(sock_net(sk), user, len);
118496@@ -2025,7 +2025,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118497
118498 switch (cmd) {
118499 case IPT_SO_GET_INFO:
118500- ret = get_info(sock_net(sk), user, len, 0);
118501+ ret = get_info(sock_net(sk), user, *len, 0);
118502 break;
118503
118504 case IPT_SO_GET_ENTRIES:
118505diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118506index 771ab3d..5b99b18 100644
118507--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
118508+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118509@@ -725,7 +725,7 @@ static int clusterip_net_init(struct net *net)
118510 spin_lock_init(&cn->lock);
118511
118512 #ifdef CONFIG_PROC_FS
118513- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
118514+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
118515 if (!cn->procdir) {
118516 pr_err("Unable to proc dir entry\n");
118517 return -ENOMEM;
118518diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
118519index 05ff44b..da00000 100644
118520--- a/net/ipv4/ping.c
118521+++ b/net/ipv4/ping.c
118522@@ -59,7 +59,7 @@ struct ping_table {
118523 };
118524
118525 static struct ping_table ping_table;
118526-struct pingv6_ops pingv6_ops;
118527+struct pingv6_ops *pingv6_ops;
118528 EXPORT_SYMBOL_GPL(pingv6_ops);
118529
118530 static u16 ping_port_rover;
118531@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
118532 return -ENODEV;
118533 }
118534 }
118535- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
118536+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
118537 scoped);
118538 rcu_read_unlock();
118539
118540@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118541 }
118542 #if IS_ENABLED(CONFIG_IPV6)
118543 } else if (skb->protocol == htons(ETH_P_IPV6)) {
118544- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
118545+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
118546 #endif
118547 }
118548
118549@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118550 info, (u8 *)icmph);
118551 #if IS_ENABLED(CONFIG_IPV6)
118552 } else if (family == AF_INET6) {
118553- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
118554+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
118555 info, (u8 *)icmph);
118556 #endif
118557 }
118558@@ -918,10 +918,10 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
118559 }
118560
118561 if (inet6_sk(sk)->rxopt.all)
118562- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
118563+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
118564 if (skb->protocol == htons(ETH_P_IPV6) &&
118565 inet6_sk(sk)->rxopt.all)
118566- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
118567+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
118568 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
118569 ip_cmsg_recv(msg, skb);
118570 #endif
118571@@ -1116,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
118572 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
118573 0, sock_i_ino(sp),
118574 atomic_read(&sp->sk_refcnt), sp,
118575- atomic_read(&sp->sk_drops));
118576+ atomic_read_unchecked(&sp->sk_drops));
118577 }
118578
118579 static int ping_v4_seq_show(struct seq_file *seq, void *v)
118580diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
118581index 561cd4b..a32a155 100644
118582--- a/net/ipv4/raw.c
118583+++ b/net/ipv4/raw.c
118584@@ -323,7 +323,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
118585 int raw_rcv(struct sock *sk, struct sk_buff *skb)
118586 {
118587 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
118588- atomic_inc(&sk->sk_drops);
118589+ atomic_inc_unchecked(&sk->sk_drops);
118590 kfree_skb(skb);
118591 return NET_RX_DROP;
118592 }
118593@@ -771,16 +771,20 @@ static int raw_init(struct sock *sk)
118594
118595 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
118596 {
118597+ struct icmp_filter filter;
118598+
118599 if (optlen > sizeof(struct icmp_filter))
118600 optlen = sizeof(struct icmp_filter);
118601- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
118602+ if (copy_from_user(&filter, optval, optlen))
118603 return -EFAULT;
118604+ raw_sk(sk)->filter = filter;
118605 return 0;
118606 }
118607
118608 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
118609 {
118610 int len, ret = -EFAULT;
118611+ struct icmp_filter filter;
118612
118613 if (get_user(len, optlen))
118614 goto out;
118615@@ -790,8 +794,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
118616 if (len > sizeof(struct icmp_filter))
118617 len = sizeof(struct icmp_filter);
118618 ret = -EFAULT;
118619- if (put_user(len, optlen) ||
118620- copy_to_user(optval, &raw_sk(sk)->filter, len))
118621+ filter = raw_sk(sk)->filter;
118622+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
118623 goto out;
118624 ret = 0;
118625 out: return ret;
118626@@ -1020,7 +1024,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
118627 0, 0L, 0,
118628 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
118629 0, sock_i_ino(sp),
118630- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
118631+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
118632 }
118633
118634 static int raw_seq_show(struct seq_file *seq, void *v)
118635diff --git a/net/ipv4/route.c b/net/ipv4/route.c
118636index f45f2a1..e7d47a3 100644
118637--- a/net/ipv4/route.c
118638+++ b/net/ipv4/route.c
118639@@ -227,7 +227,7 @@ static const struct seq_operations rt_cache_seq_ops = {
118640
118641 static int rt_cache_seq_open(struct inode *inode, struct file *file)
118642 {
118643- return seq_open(file, &rt_cache_seq_ops);
118644+ return seq_open_restrict(file, &rt_cache_seq_ops);
118645 }
118646
118647 static const struct file_operations rt_cache_seq_fops = {
118648@@ -318,7 +318,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
118649
118650 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
118651 {
118652- return seq_open(file, &rt_cpu_seq_ops);
118653+ return seq_open_restrict(file, &rt_cpu_seq_ops);
118654 }
118655
118656 static const struct file_operations rt_cpu_seq_fops = {
118657@@ -356,7 +356,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
118658
118659 static int rt_acct_proc_open(struct inode *inode, struct file *file)
118660 {
118661- return single_open(file, rt_acct_proc_show, NULL);
118662+ return single_open_restrict(file, rt_acct_proc_show, NULL);
118663 }
118664
118665 static const struct file_operations rt_acct_proc_fops = {
118666@@ -458,11 +458,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
118667
118668 #define IP_IDENTS_SZ 2048u
118669 struct ip_ident_bucket {
118670- atomic_t id;
118671+ atomic_unchecked_t id;
118672 u32 stamp32;
118673 };
118674
118675-static struct ip_ident_bucket *ip_idents __read_mostly;
118676+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
118677
118678 /* In order to protect privacy, we add a perturbation to identifiers
118679 * if one generator is seldom used. This makes hard for an attacker
118680@@ -478,7 +478,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
118681 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
118682 delta = prandom_u32_max(now - old);
118683
118684- return atomic_add_return(segs + delta, &bucket->id) - segs;
118685+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
118686 }
118687 EXPORT_SYMBOL(ip_idents_reserve);
118688
118689@@ -2641,34 +2641,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
118690 .maxlen = sizeof(int),
118691 .mode = 0200,
118692 .proc_handler = ipv4_sysctl_rtcache_flush,
118693+ .extra1 = &init_net,
118694 },
118695 { },
118696 };
118697
118698 static __net_init int sysctl_route_net_init(struct net *net)
118699 {
118700- struct ctl_table *tbl;
118701+ ctl_table_no_const *tbl = NULL;
118702
118703- tbl = ipv4_route_flush_table;
118704 if (!net_eq(net, &init_net)) {
118705- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118706+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118707 if (!tbl)
118708 goto err_dup;
118709
118710 /* Don't export sysctls to unprivileged users */
118711 if (net->user_ns != &init_user_ns)
118712 tbl[0].procname = NULL;
118713- }
118714- tbl[0].extra1 = net;
118715+ tbl[0].extra1 = net;
118716+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118717+ } else
118718+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
118719
118720- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118721 if (!net->ipv4.route_hdr)
118722 goto err_reg;
118723 return 0;
118724
118725 err_reg:
118726- if (tbl != ipv4_route_flush_table)
118727- kfree(tbl);
118728+ kfree(tbl);
118729 err_dup:
118730 return -ENOMEM;
118731 }
118732@@ -2691,8 +2691,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
118733
118734 static __net_init int rt_genid_init(struct net *net)
118735 {
118736- atomic_set(&net->ipv4.rt_genid, 0);
118737- atomic_set(&net->fnhe_genid, 0);
118738+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
118739+ atomic_set_unchecked(&net->fnhe_genid, 0);
118740 get_random_bytes(&net->ipv4.dev_addr_genid,
118741 sizeof(net->ipv4.dev_addr_genid));
118742 return 0;
118743@@ -2736,11 +2736,7 @@ int __init ip_rt_init(void)
118744 int rc = 0;
118745 int cpu;
118746
118747- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
118748- if (!ip_idents)
118749- panic("IP: failed to allocate ip_idents\n");
118750-
118751- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
118752+ prandom_bytes(ip_idents, sizeof(ip_idents));
118753
118754 for_each_possible_cpu(cpu) {
118755 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
118756diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
118757index c3852a7..7bdbde7 100644
118758--- a/net/ipv4/sysctl_net_ipv4.c
118759+++ b/net/ipv4/sysctl_net_ipv4.c
118760@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
118761 container_of(table->data, struct net, ipv4.ip_local_ports.range);
118762 int ret;
118763 int range[2];
118764- struct ctl_table tmp = {
118765+ ctl_table_no_const tmp = {
118766 .data = &range,
118767 .maxlen = sizeof(range),
118768 .mode = table->mode,
118769@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
118770 int ret;
118771 gid_t urange[2];
118772 kgid_t low, high;
118773- struct ctl_table tmp = {
118774+ ctl_table_no_const tmp = {
118775 .data = &urange,
118776 .maxlen = sizeof(urange),
118777 .mode = table->mode,
118778@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
118779 void __user *buffer, size_t *lenp, loff_t *ppos)
118780 {
118781 char val[TCP_CA_NAME_MAX];
118782- struct ctl_table tbl = {
118783+ ctl_table_no_const tbl = {
118784 .data = val,
118785 .maxlen = TCP_CA_NAME_MAX,
118786 };
118787@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
118788 void __user *buffer, size_t *lenp,
118789 loff_t *ppos)
118790 {
118791- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
118792+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
118793 int ret;
118794
118795 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118796@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
118797 void __user *buffer, size_t *lenp,
118798 loff_t *ppos)
118799 {
118800- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
118801+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
118802 int ret;
118803
118804 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118805@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
118806 void __user *buffer, size_t *lenp,
118807 loff_t *ppos)
118808 {
118809- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118810+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118811 struct tcp_fastopen_context *ctxt;
118812 int ret;
118813 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
118814@@ -902,13 +902,12 @@ static struct ctl_table ipv4_net_table[] = {
118815
118816 static __net_init int ipv4_sysctl_init_net(struct net *net)
118817 {
118818- struct ctl_table *table;
118819+ ctl_table_no_const *table = NULL;
118820
118821- table = ipv4_net_table;
118822 if (!net_eq(net, &init_net)) {
118823 int i;
118824
118825- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
118826+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
118827 if (!table)
118828 goto err_alloc;
118829
118830@@ -917,7 +916,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
118831 table[i].data += (void *)net - (void *)&init_net;
118832 }
118833
118834- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118835+ if (!net_eq(net, &init_net))
118836+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118837+ else
118838+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
118839 if (!net->ipv4.ipv4_hdr)
118840 goto err_reg;
118841
118842diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
118843index c9ab964..607d9f7 100644
118844--- a/net/ipv4/tcp_input.c
118845+++ b/net/ipv4/tcp_input.c
118846@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
118847 * without any lock. We want to make sure compiler wont store
118848 * intermediate values in this location.
118849 */
118850- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
118851+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
118852 sk->sk_max_pacing_rate);
118853 }
118854
118855@@ -4610,7 +4610,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
118856 * simplifies code)
118857 */
118858 static void
118859-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118860+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118861 struct sk_buff *head, struct sk_buff *tail,
118862 u32 start, u32 end)
118863 {
118864@@ -5605,6 +5605,7 @@ discard:
118865 tcp_paws_reject(&tp->rx_opt, 0))
118866 goto discard_and_undo;
118867
118868+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
118869 if (th->syn) {
118870 /* We see SYN without ACK. It is attempt of
118871 * simultaneous connect with crossed SYNs.
118872@@ -5655,6 +5656,7 @@ discard:
118873 goto discard;
118874 #endif
118875 }
118876+#endif
118877 /* "fifth, if neither of the SYN or RST bits is set then
118878 * drop the segment and return."
118879 */
118880@@ -5701,7 +5703,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
118881 goto discard;
118882
118883 if (th->syn) {
118884- if (th->fin)
118885+ if (th->fin || th->urg || th->psh)
118886 goto discard;
118887 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
118888 return 1;
118889diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
118890index fc1c658..4de4e33 100644
118891--- a/net/ipv4/tcp_ipv4.c
118892+++ b/net/ipv4/tcp_ipv4.c
118893@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
118894 int sysctl_tcp_low_latency __read_mostly;
118895 EXPORT_SYMBOL(sysctl_tcp_low_latency);
118896
118897+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118898+extern int grsec_enable_blackhole;
118899+#endif
118900+
118901 #ifdef CONFIG_TCP_MD5SIG
118902 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
118903 __be32 daddr, __be32 saddr, const struct tcphdr *th);
118904@@ -1348,7 +1352,7 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
118905 req = inet_csk_search_req(sk, th->source, iph->saddr, iph->daddr);
118906 if (req) {
118907 nsk = tcp_check_req(sk, skb, req, false);
118908- if (!nsk)
118909+ if (!nsk || nsk == sk)
118910 reqsk_put(req);
118911 return nsk;
118912 }
118913@@ -1427,6 +1431,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
118914 return 0;
118915
118916 reset:
118917+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118918+ if (!grsec_enable_blackhole)
118919+#endif
118920 tcp_v4_send_reset(rsk, skb);
118921 discard:
118922 kfree_skb(skb);
118923@@ -1591,12 +1598,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
118924 TCP_SKB_CB(skb)->sacked = 0;
118925
118926 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
118927- if (!sk)
118928+ if (!sk) {
118929+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118930+ ret = 1;
118931+#endif
118932 goto no_tcp_socket;
118933-
118934+ }
118935 process:
118936- if (sk->sk_state == TCP_TIME_WAIT)
118937+ if (sk->sk_state == TCP_TIME_WAIT) {
118938+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118939+ ret = 2;
118940+#endif
118941 goto do_time_wait;
118942+ }
118943
118944 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
118945 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
118946@@ -1652,6 +1666,10 @@ csum_error:
118947 bad_packet:
118948 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
118949 } else {
118950+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118951+ if (!grsec_enable_blackhole || (ret == 1 &&
118952+ (skb->dev->flags & IFF_LOOPBACK)))
118953+#endif
118954 tcp_v4_send_reset(NULL, skb);
118955 }
118956
118957diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
118958index 17e7339..c72ff6c 100644
118959--- a/net/ipv4/tcp_minisocks.c
118960+++ b/net/ipv4/tcp_minisocks.c
118961@@ -27,6 +27,10 @@
118962 #include <net/inet_common.h>
118963 #include <net/xfrm.h>
118964
118965+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118966+extern int grsec_enable_blackhole;
118967+#endif
118968+
118969 int sysctl_tcp_syncookies __read_mostly = 1;
118970 EXPORT_SYMBOL(sysctl_tcp_syncookies);
118971
118972@@ -778,7 +782,10 @@ embryonic_reset:
118973 * avoid becoming vulnerable to outside attack aiming at
118974 * resetting legit local connections.
118975 */
118976- req->rsk_ops->send_reset(sk, skb);
118977+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118978+ if (!grsec_enable_blackhole)
118979+#endif
118980+ req->rsk_ops->send_reset(sk, skb);
118981 } else if (fastopen) { /* received a valid RST pkt */
118982 reqsk_fastopen_remove(sk, req, true);
118983 tcp_reset(sk);
118984diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
118985index ebf5ff5..4d1ff32 100644
118986--- a/net/ipv4/tcp_probe.c
118987+++ b/net/ipv4/tcp_probe.c
118988@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
118989 if (cnt + width >= len)
118990 break;
118991
118992- if (copy_to_user(buf + cnt, tbuf, width))
118993+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
118994 return -EFAULT;
118995 cnt += width;
118996 }
118997diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
118998index 8c65dc1..55fd1ba 100644
118999--- a/net/ipv4/tcp_timer.c
119000+++ b/net/ipv4/tcp_timer.c
119001@@ -22,6 +22,10 @@
119002 #include <linux/gfp.h>
119003 #include <net/tcp.h>
119004
119005+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119006+extern int grsec_lastack_retries;
119007+#endif
119008+
119009 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
119010 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
119011 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
119012@@ -195,6 +199,13 @@ static int tcp_write_timeout(struct sock *sk)
119013 }
119014 }
119015
119016+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119017+ if ((sk->sk_state == TCP_LAST_ACK) &&
119018+ (grsec_lastack_retries > 0) &&
119019+ (grsec_lastack_retries < retry_until))
119020+ retry_until = grsec_lastack_retries;
119021+#endif
119022+
119023 if (retransmits_timed_out(sk, retry_until,
119024 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
119025 /* Has it gone just too far? */
119026diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
119027index 83aa604..dbfddf5 100644
119028--- a/net/ipv4/udp.c
119029+++ b/net/ipv4/udp.c
119030@@ -87,6 +87,7 @@
119031 #include <linux/types.h>
119032 #include <linux/fcntl.h>
119033 #include <linux/module.h>
119034+#include <linux/security.h>
119035 #include <linux/socket.h>
119036 #include <linux/sockios.h>
119037 #include <linux/igmp.h>
119038@@ -115,6 +116,10 @@
119039 #include <net/busy_poll.h>
119040 #include "udp_impl.h"
119041
119042+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119043+extern int grsec_enable_blackhole;
119044+#endif
119045+
119046 struct udp_table udp_table __read_mostly;
119047 EXPORT_SYMBOL(udp_table);
119048
119049@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
119050 return true;
119051 }
119052
119053+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
119054+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
119055+
119056 /*
119057 * This routine is called by the ICMP module when it gets some
119058 * sort of error condition. If err < 0 then the socket should
119059@@ -944,9 +952,18 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
119060 dport = usin->sin_port;
119061 if (dport == 0)
119062 return -EINVAL;
119063+
119064+ err = gr_search_udp_sendmsg(sk, usin);
119065+ if (err)
119066+ return err;
119067 } else {
119068 if (sk->sk_state != TCP_ESTABLISHED)
119069 return -EDESTADDRREQ;
119070+
119071+ err = gr_search_udp_sendmsg(sk, NULL);
119072+ if (err)
119073+ return err;
119074+
119075 daddr = inet->inet_daddr;
119076 dport = inet->inet_dport;
119077 /* Open fast path for connected socket.
119078@@ -1193,7 +1210,7 @@ static unsigned int first_packet_length(struct sock *sk)
119079 IS_UDPLITE(sk));
119080 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119081 IS_UDPLITE(sk));
119082- atomic_inc(&sk->sk_drops);
119083+ atomic_inc_unchecked(&sk->sk_drops);
119084 __skb_unlink(skb, rcvq);
119085 __skb_queue_tail(&list_kill, skb);
119086 }
119087@@ -1273,6 +1290,10 @@ try_again:
119088 if (!skb)
119089 goto out;
119090
119091+ err = gr_search_udp_recvmsg(sk, skb);
119092+ if (err)
119093+ goto out_free;
119094+
119095 ulen = skb->len - sizeof(struct udphdr);
119096 copied = len;
119097 if (copied > ulen)
119098@@ -1305,7 +1326,7 @@ try_again:
119099 if (unlikely(err)) {
119100 trace_kfree_skb(skb, udp_recvmsg);
119101 if (!peeked) {
119102- atomic_inc(&sk->sk_drops);
119103+ atomic_inc_unchecked(&sk->sk_drops);
119104 UDP_INC_STATS_USER(sock_net(sk),
119105 UDP_MIB_INERRORS, is_udplite);
119106 }
119107@@ -1599,7 +1620,7 @@ csum_error:
119108 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
119109 drop:
119110 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
119111- atomic_inc(&sk->sk_drops);
119112+ atomic_inc_unchecked(&sk->sk_drops);
119113 kfree_skb(skb);
119114 return -1;
119115 }
119116@@ -1617,7 +1638,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
119117 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
119118
119119 if (!skb1) {
119120- atomic_inc(&sk->sk_drops);
119121+ atomic_inc_unchecked(&sk->sk_drops);
119122 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
119123 IS_UDPLITE(sk));
119124 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119125@@ -1823,6 +1844,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
119126 goto csum_error;
119127
119128 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
119129+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119130+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
119131+#endif
119132 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
119133
119134 /*
119135@@ -2420,7 +2444,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
119136 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
119137 0, sock_i_ino(sp),
119138 atomic_read(&sp->sk_refcnt), sp,
119139- atomic_read(&sp->sk_drops));
119140+ atomic_read_unchecked(&sp->sk_drops));
119141 }
119142
119143 int udp4_seq_show(struct seq_file *seq, void *v)
119144diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
119145index bff6974..c63736c 100644
119146--- a/net/ipv4/xfrm4_policy.c
119147+++ b/net/ipv4/xfrm4_policy.c
119148@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
119149 fl4->flowi4_tos = iph->tos;
119150 }
119151
119152-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
119153+static int xfrm4_garbage_collect(struct dst_ops *ops)
119154 {
119155 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
119156
119157- xfrm4_policy_afinfo.garbage_collect(net);
119158+ xfrm_garbage_collect_deferred(net);
119159 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
119160 }
119161
119162@@ -268,19 +268,18 @@ static struct ctl_table xfrm4_policy_table[] = {
119163
119164 static int __net_init xfrm4_net_init(struct net *net)
119165 {
119166- struct ctl_table *table;
119167+ ctl_table_no_const *table = NULL;
119168 struct ctl_table_header *hdr;
119169
119170- table = xfrm4_policy_table;
119171 if (!net_eq(net, &init_net)) {
119172- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119173+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119174 if (!table)
119175 goto err_alloc;
119176
119177 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
119178- }
119179-
119180- hdr = register_net_sysctl(net, "net/ipv4", table);
119181+ hdr = register_net_sysctl(net, "net/ipv4", table);
119182+ } else
119183+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
119184 if (!hdr)
119185 goto err_reg;
119186
119187@@ -288,8 +287,7 @@ static int __net_init xfrm4_net_init(struct net *net)
119188 return 0;
119189
119190 err_reg:
119191- if (!net_eq(net, &init_net))
119192- kfree(table);
119193+ kfree(table);
119194 err_alloc:
119195 return -ENOMEM;
119196 }
119197diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
119198index 37b70e8..1475ab7 100644
119199--- a/net/ipv6/addrconf.c
119200+++ b/net/ipv6/addrconf.c
119201@@ -178,7 +178,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
119202 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119203 .mtu6 = IPV6_MIN_MTU,
119204 .accept_ra = 1,
119205- .accept_redirects = 1,
119206+ .accept_redirects = 0,
119207 .autoconf = 1,
119208 .force_mld_version = 0,
119209 .mldv1_unsolicited_report_interval = 10 * HZ,
119210@@ -219,7 +219,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
119211 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119212 .mtu6 = IPV6_MIN_MTU,
119213 .accept_ra = 1,
119214- .accept_redirects = 1,
119215+ .accept_redirects = 0,
119216 .autoconf = 1,
119217 .force_mld_version = 0,
119218 .mldv1_unsolicited_report_interval = 10 * HZ,
119219@@ -620,7 +620,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
119220 idx = 0;
119221 head = &net->dev_index_head[h];
119222 rcu_read_lock();
119223- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
119224+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
119225 net->dev_base_seq;
119226 hlist_for_each_entry_rcu(dev, head, index_hlist) {
119227 if (idx < s_idx)
119228@@ -2506,7 +2506,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
119229 p.iph.ihl = 5;
119230 p.iph.protocol = IPPROTO_IPV6;
119231 p.iph.ttl = 64;
119232- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
119233+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
119234
119235 if (ops->ndo_do_ioctl) {
119236 mm_segment_t oldfs = get_fs();
119237@@ -3772,16 +3772,23 @@ static const struct file_operations if6_fops = {
119238 .release = seq_release_net,
119239 };
119240
119241+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
119242+extern void unregister_ipv6_seq_ops_addr(void);
119243+
119244 static int __net_init if6_proc_net_init(struct net *net)
119245 {
119246- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
119247+ register_ipv6_seq_ops_addr(&if6_seq_ops);
119248+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
119249+ unregister_ipv6_seq_ops_addr();
119250 return -ENOMEM;
119251+ }
119252 return 0;
119253 }
119254
119255 static void __net_exit if6_proc_net_exit(struct net *net)
119256 {
119257 remove_proc_entry("if_inet6", net->proc_net);
119258+ unregister_ipv6_seq_ops_addr();
119259 }
119260
119261 static struct pernet_operations if6_proc_net_ops = {
119262@@ -4400,7 +4407,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
119263 s_ip_idx = ip_idx = cb->args[2];
119264
119265 rcu_read_lock();
119266- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119267+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119268 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
119269 idx = 0;
119270 head = &net->dev_index_head[h];
119271@@ -5057,7 +5064,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119272 rt_genid_bump_ipv6(net);
119273 break;
119274 }
119275- atomic_inc(&net->ipv6.dev_addr_genid);
119276+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
119277 }
119278
119279 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119280@@ -5077,7 +5084,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
119281 int *valp = ctl->data;
119282 int val = *valp;
119283 loff_t pos = *ppos;
119284- struct ctl_table lctl;
119285+ ctl_table_no_const lctl;
119286 int ret;
119287
119288 /*
119289@@ -5102,7 +5109,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
119290 {
119291 struct inet6_dev *idev = ctl->extra1;
119292 int min_mtu = IPV6_MIN_MTU;
119293- struct ctl_table lctl;
119294+ ctl_table_no_const lctl;
119295
119296 lctl = *ctl;
119297 lctl.extra1 = &min_mtu;
119298@@ -5177,7 +5184,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
119299 int *valp = ctl->data;
119300 int val = *valp;
119301 loff_t pos = *ppos;
119302- struct ctl_table lctl;
119303+ ctl_table_no_const lctl;
119304 int ret;
119305
119306 /*
119307@@ -5242,7 +5249,7 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,
119308 int err;
119309 struct in6_addr addr;
119310 char str[IPV6_MAX_STRLEN];
119311- struct ctl_table lctl = *ctl;
119312+ ctl_table_no_const lctl = *ctl;
119313 struct net *net = ctl->extra2;
119314 struct ipv6_stable_secret *secret = ctl->data;
119315
119316diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
119317index eef63b3..d68f5da 100644
119318--- a/net/ipv6/af_inet6.c
119319+++ b/net/ipv6/af_inet6.c
119320@@ -768,7 +768,7 @@ static int __net_init inet6_net_init(struct net *net)
119321 net->ipv6.sysctl.auto_flowlabels = 0;
119322 net->ipv6.sysctl.idgen_retries = 3;
119323 net->ipv6.sysctl.idgen_delay = 1 * HZ;
119324- atomic_set(&net->ipv6.fib6_sernum, 1);
119325+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
119326
119327 err = ipv6_init_mibs(net);
119328 if (err)
119329diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
119330index 62d908e..bac79a9 100644
119331--- a/net/ipv6/datagram.c
119332+++ b/net/ipv6/datagram.c
119333@@ -967,5 +967,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
119334 0,
119335 sock_i_ino(sp),
119336 atomic_read(&sp->sk_refcnt), sp,
119337- atomic_read(&sp->sk_drops));
119338+ atomic_read_unchecked(&sp->sk_drops));
119339 }
119340diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
119341index 2c2b5d5..cc01abd 100644
119342--- a/net/ipv6/icmp.c
119343+++ b/net/ipv6/icmp.c
119344@@ -1004,7 +1004,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
119345
119346 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
119347 {
119348- struct ctl_table *table;
119349+ ctl_table_no_const *table;
119350
119351 table = kmemdup(ipv6_icmp_table_template,
119352 sizeof(ipv6_icmp_table_template),
119353diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
119354index bde57b1..5b45dbb 100644
119355--- a/net/ipv6/ip6_fib.c
119356+++ b/net/ipv6/ip6_fib.c
119357@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
119358 int new, old;
119359
119360 do {
119361- old = atomic_read(&net->ipv6.fib6_sernum);
119362+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
119363 new = old < INT_MAX ? old + 1 : 1;
119364- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
119365+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
119366 old, new) != old);
119367 return new;
119368 }
119369diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
119370index a38d3ac..d02e37d 100644
119371--- a/net/ipv6/ip6_gre.c
119372+++ b/net/ipv6/ip6_gre.c
119373@@ -71,8 +71,8 @@ struct ip6gre_net {
119374 struct net_device *fb_tunnel_dev;
119375 };
119376
119377-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
119378-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
119379+static struct rtnl_link_ops ip6gre_link_ops;
119380+static struct rtnl_link_ops ip6gre_tap_ops;
119381 static int ip6gre_tunnel_init(struct net_device *dev);
119382 static void ip6gre_tunnel_setup(struct net_device *dev);
119383 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
119384@@ -1280,7 +1280,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
119385 }
119386
119387
119388-static struct inet6_protocol ip6gre_protocol __read_mostly = {
119389+static struct inet6_protocol ip6gre_protocol = {
119390 .handler = ip6gre_rcv,
119391 .err_handler = ip6gre_err,
119392 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
119393@@ -1639,7 +1639,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
119394 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
119395 };
119396
119397-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119398+static struct rtnl_link_ops ip6gre_link_ops = {
119399 .kind = "ip6gre",
119400 .maxtype = IFLA_GRE_MAX,
119401 .policy = ip6gre_policy,
119402@@ -1654,7 +1654,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119403 .get_link_net = ip6_tnl_get_link_net,
119404 };
119405
119406-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
119407+static struct rtnl_link_ops ip6gre_tap_ops = {
119408 .kind = "ip6gretap",
119409 .maxtype = IFLA_GRE_MAX,
119410 .policy = ip6gre_policy,
119411diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
119412index 5cafd92..d5aead4 100644
119413--- a/net/ipv6/ip6_tunnel.c
119414+++ b/net/ipv6/ip6_tunnel.c
119415@@ -80,7 +80,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119416
119417 static int ip6_tnl_dev_init(struct net_device *dev);
119418 static void ip6_tnl_dev_setup(struct net_device *dev);
119419-static struct rtnl_link_ops ip6_link_ops __read_mostly;
119420+static struct rtnl_link_ops ip6_link_ops;
119421
119422 static int ip6_tnl_net_id __read_mostly;
119423 struct ip6_tnl_net {
119424@@ -1776,7 +1776,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
119425 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
119426 };
119427
119428-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
119429+static struct rtnl_link_ops ip6_link_ops = {
119430 .kind = "ip6tnl",
119431 .maxtype = IFLA_IPTUN_MAX,
119432 .policy = ip6_tnl_policy,
119433diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
119434index 0224c03..c5ec3d9 100644
119435--- a/net/ipv6/ip6_vti.c
119436+++ b/net/ipv6/ip6_vti.c
119437@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119438
119439 static int vti6_dev_init(struct net_device *dev);
119440 static void vti6_dev_setup(struct net_device *dev);
119441-static struct rtnl_link_ops vti6_link_ops __read_mostly;
119442+static struct rtnl_link_ops vti6_link_ops;
119443
119444 static int vti6_net_id __read_mostly;
119445 struct vti6_net {
119446@@ -1019,7 +1019,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
119447 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
119448 };
119449
119450-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
119451+static struct rtnl_link_ops vti6_link_ops = {
119452 .kind = "vti6",
119453 .maxtype = IFLA_VTI_MAX,
119454 .policy = vti6_policy,
119455diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
119456index 63e6956..ebbbcf6 100644
119457--- a/net/ipv6/ipv6_sockglue.c
119458+++ b/net/ipv6/ipv6_sockglue.c
119459@@ -1015,7 +1015,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
119460 if (sk->sk_type != SOCK_STREAM)
119461 return -ENOPROTOOPT;
119462
119463- msg.msg_control = optval;
119464+ msg.msg_control = (void __force_kernel *)optval;
119465 msg.msg_controllen = len;
119466 msg.msg_flags = flags;
119467
119468diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
119469index 96f153c..82fcad9 100644
119470--- a/net/ipv6/ndisc.c
119471+++ b/net/ipv6/ndisc.c
119472@@ -1650,6 +1650,7 @@ int ndisc_rcv(struct sk_buff *skb)
119473 static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
119474 {
119475 struct net_device *dev = netdev_notifier_info_to_dev(ptr);
119476+ struct netdev_notifier_change_info *change_info;
119477 struct net *net = dev_net(dev);
119478 struct inet6_dev *idev;
119479
119480@@ -1664,6 +1665,11 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event,
119481 ndisc_send_unsol_na(dev);
119482 in6_dev_put(idev);
119483 break;
119484+ case NETDEV_CHANGE:
119485+ change_info = ptr;
119486+ if (change_info->flags_changed & IFF_NOARP)
119487+ neigh_changeaddr(&nd_tbl, dev);
119488+ break;
119489 case NETDEV_DOWN:
119490 neigh_ifdown(&nd_tbl, dev);
119491 fib6_run_gc(0, net, false);
119492diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
119493index 62f5b0d..331fdb1 100644
119494--- a/net/ipv6/netfilter/ip6_tables.c
119495+++ b/net/ipv6/netfilter/ip6_tables.c
119496@@ -1085,14 +1085,14 @@ static int compat_table_info(const struct xt_table_info *info,
119497 #endif
119498
119499 static int get_info(struct net *net, void __user *user,
119500- const int *len, int compat)
119501+ int len, int compat)
119502 {
119503 char name[XT_TABLE_MAXNAMELEN];
119504 struct xt_table *t;
119505 int ret;
119506
119507- if (*len != sizeof(struct ip6t_getinfo)) {
119508- duprintf("length %u != %zu\n", *len,
119509+ if (len != sizeof(struct ip6t_getinfo)) {
119510+ duprintf("length %u != %zu\n", len,
119511 sizeof(struct ip6t_getinfo));
119512 return -EINVAL;
119513 }
119514@@ -1129,7 +1129,7 @@ static int get_info(struct net *net, void __user *user,
119515 info.size = private->size;
119516 strcpy(info.name, name);
119517
119518- if (copy_to_user(user, &info, *len) != 0)
119519+ if (copy_to_user(user, &info, len) != 0)
119520 ret = -EFAULT;
119521 else
119522 ret = 0;
119523@@ -1991,7 +1991,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119524
119525 switch (cmd) {
119526 case IP6T_SO_GET_INFO:
119527- ret = get_info(sock_net(sk), user, len, 1);
119528+ ret = get_info(sock_net(sk), user, *len, 1);
119529 break;
119530 case IP6T_SO_GET_ENTRIES:
119531 ret = compat_get_entries(sock_net(sk), user, len);
119532@@ -2038,7 +2038,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119533
119534 switch (cmd) {
119535 case IP6T_SO_GET_INFO:
119536- ret = get_info(sock_net(sk), user, len, 0);
119537+ ret = get_info(sock_net(sk), user, *len, 0);
119538 break;
119539
119540 case IP6T_SO_GET_ENTRIES:
119541diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
119542index 6f187c8..55e564f 100644
119543--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
119544+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
119545@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
119546
119547 static int nf_ct_frag6_sysctl_register(struct net *net)
119548 {
119549- struct ctl_table *table;
119550+ ctl_table_no_const *table = NULL;
119551 struct ctl_table_header *hdr;
119552
119553- table = nf_ct_frag6_sysctl_table;
119554 if (!net_eq(net, &init_net)) {
119555- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
119556+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
119557 GFP_KERNEL);
119558 if (table == NULL)
119559 goto err_alloc;
119560@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119561 table[2].data = &net->nf_frag.frags.high_thresh;
119562 table[2].extra1 = &net->nf_frag.frags.low_thresh;
119563 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
119564- }
119565-
119566- hdr = register_net_sysctl(net, "net/netfilter", table);
119567+ hdr = register_net_sysctl(net, "net/netfilter", table);
119568+ } else
119569+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
119570 if (hdr == NULL)
119571 goto err_reg;
119572
119573@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119574 return 0;
119575
119576 err_reg:
119577- if (!net_eq(net, &init_net))
119578- kfree(table);
119579+ kfree(table);
119580 err_alloc:
119581 return -ENOMEM;
119582 }
119583@@ -348,7 +346,7 @@ found:
119584 fq->ecn |= ecn;
119585 if (payload_len > fq->q.max_size)
119586 fq->q.max_size = payload_len;
119587- add_frag_mem_limit(&fq->q, skb->truesize);
119588+ add_frag_mem_limit(fq->q.net, skb->truesize);
119589
119590 /* The first fragment.
119591 * nhoffset is obtained from the first fragment, of course.
119592@@ -430,7 +428,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
119593 clone->ip_summed = head->ip_summed;
119594
119595 NFCT_FRAG6_CB(clone)->orig = NULL;
119596- add_frag_mem_limit(&fq->q, clone->truesize);
119597+ add_frag_mem_limit(fq->q.net, clone->truesize);
119598 }
119599
119600 /* We have to remove fragment header from datagram and to relocate
119601@@ -454,7 +452,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
119602 head->csum = csum_add(head->csum, fp->csum);
119603 head->truesize += fp->truesize;
119604 }
119605- sub_frag_mem_limit(&fq->q, head->truesize);
119606+ sub_frag_mem_limit(fq->q.net, head->truesize);
119607
119608 head->ignore_df = 1;
119609 head->next = NULL;
119610diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
119611index 263a516..692f738 100644
119612--- a/net/ipv6/ping.c
119613+++ b/net/ipv6/ping.c
119614@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
119615 };
119616 #endif
119617
119618+static struct pingv6_ops real_pingv6_ops = {
119619+ .ipv6_recv_error = ipv6_recv_error,
119620+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
119621+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
119622+ .icmpv6_err_convert = icmpv6_err_convert,
119623+ .ipv6_icmp_error = ipv6_icmp_error,
119624+ .ipv6_chk_addr = ipv6_chk_addr,
119625+};
119626+
119627+static struct pingv6_ops dummy_pingv6_ops = {
119628+ .ipv6_recv_error = dummy_ipv6_recv_error,
119629+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
119630+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
119631+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
119632+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
119633+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
119634+};
119635+
119636 int __init pingv6_init(void)
119637 {
119638 #ifdef CONFIG_PROC_FS
119639@@ -247,13 +265,7 @@ int __init pingv6_init(void)
119640 if (ret)
119641 return ret;
119642 #endif
119643- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
119644- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
119645- pingv6_ops.ip6_datagram_recv_specific_ctl =
119646- ip6_datagram_recv_specific_ctl;
119647- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
119648- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
119649- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
119650+ pingv6_ops = &real_pingv6_ops;
119651 return inet6_register_protosw(&pingv6_protosw);
119652 }
119653
119654@@ -262,14 +274,9 @@ int __init pingv6_init(void)
119655 */
119656 void pingv6_exit(void)
119657 {
119658- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
119659- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
119660- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
119661- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
119662- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
119663- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
119664 #ifdef CONFIG_PROC_FS
119665 unregister_pernet_subsys(&ping_v6_net_ops);
119666 #endif
119667+ pingv6_ops = &dummy_pingv6_ops;
119668 inet6_unregister_protosw(&pingv6_protosw);
119669 }
119670diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
119671index 679253d0..70b653c 100644
119672--- a/net/ipv6/proc.c
119673+++ b/net/ipv6/proc.c
119674@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
119675 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
119676 goto proc_snmp6_fail;
119677
119678- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
119679+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
119680 if (!net->mib.proc_net_devsnmp6)
119681 goto proc_dev_snmp6_fail;
119682 return 0;
119683diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
119684index 8072bd4..1629245 100644
119685--- a/net/ipv6/raw.c
119686+++ b/net/ipv6/raw.c
119687@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
119688 {
119689 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
119690 skb_checksum_complete(skb)) {
119691- atomic_inc(&sk->sk_drops);
119692+ atomic_inc_unchecked(&sk->sk_drops);
119693 kfree_skb(skb);
119694 return NET_RX_DROP;
119695 }
119696@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119697 struct raw6_sock *rp = raw6_sk(sk);
119698
119699 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
119700- atomic_inc(&sk->sk_drops);
119701+ atomic_inc_unchecked(&sk->sk_drops);
119702 kfree_skb(skb);
119703 return NET_RX_DROP;
119704 }
119705@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119706
119707 if (inet->hdrincl) {
119708 if (skb_checksum_complete(skb)) {
119709- atomic_inc(&sk->sk_drops);
119710+ atomic_inc_unchecked(&sk->sk_drops);
119711 kfree_skb(skb);
119712 return NET_RX_DROP;
119713 }
119714@@ -608,7 +608,7 @@ out:
119715 return err;
119716 }
119717
119718-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
119719+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
119720 struct flowi6 *fl6, struct dst_entry **dstp,
119721 unsigned int flags)
119722 {
119723@@ -913,12 +913,15 @@ do_confirm:
119724 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
119725 char __user *optval, int optlen)
119726 {
119727+ struct icmp6_filter filter;
119728+
119729 switch (optname) {
119730 case ICMPV6_FILTER:
119731 if (optlen > sizeof(struct icmp6_filter))
119732 optlen = sizeof(struct icmp6_filter);
119733- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
119734+ if (copy_from_user(&filter, optval, optlen))
119735 return -EFAULT;
119736+ raw6_sk(sk)->filter = filter;
119737 return 0;
119738 default:
119739 return -ENOPROTOOPT;
119740@@ -931,6 +934,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119741 char __user *optval, int __user *optlen)
119742 {
119743 int len;
119744+ struct icmp6_filter filter;
119745
119746 switch (optname) {
119747 case ICMPV6_FILTER:
119748@@ -942,7 +946,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119749 len = sizeof(struct icmp6_filter);
119750 if (put_user(len, optlen))
119751 return -EFAULT;
119752- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
119753+ filter = raw6_sk(sk)->filter;
119754+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
119755 return -EFAULT;
119756 return 0;
119757 default:
119758diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
119759index 8ffa2c8..0db5dad 100644
119760--- a/net/ipv6/reassembly.c
119761+++ b/net/ipv6/reassembly.c
119762@@ -144,7 +144,7 @@ void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq,
119763
119764 IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS);
119765
119766- if (fq->q.flags & INET_FRAG_EVICTED)
119767+ if (inet_frag_evicting(&fq->q))
119768 goto out_rcu_unlock;
119769
119770 IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMTIMEOUT);
119771@@ -330,7 +330,7 @@ found:
119772 fq->q.stamp = skb->tstamp;
119773 fq->q.meat += skb->len;
119774 fq->ecn |= ecn;
119775- add_frag_mem_limit(&fq->q, skb->truesize);
119776+ add_frag_mem_limit(fq->q.net, skb->truesize);
119777
119778 /* The first fragment.
119779 * nhoffset is obtained from the first fragment, of course.
119780@@ -443,7 +443,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
119781 head->len -= clone->len;
119782 clone->csum = 0;
119783 clone->ip_summed = head->ip_summed;
119784- add_frag_mem_limit(&fq->q, clone->truesize);
119785+ add_frag_mem_limit(fq->q.net, clone->truesize);
119786 }
119787
119788 /* We have to remove fragment header from datagram and to relocate
119789@@ -481,7 +481,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
119790 }
119791 fp = next;
119792 }
119793- sub_frag_mem_limit(&fq->q, sum_truesize);
119794+ sub_frag_mem_limit(fq->q.net, sum_truesize);
119795
119796 head->next = NULL;
119797 head->dev = dev;
119798@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
119799
119800 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119801 {
119802- struct ctl_table *table;
119803+ ctl_table_no_const *table = NULL;
119804 struct ctl_table_header *hdr;
119805
119806- table = ip6_frags_ns_ctl_table;
119807 if (!net_eq(net, &init_net)) {
119808- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119809+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119810 if (!table)
119811 goto err_alloc;
119812
119813@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119814 /* Don't export sysctls to unprivileged users */
119815 if (net->user_ns != &init_user_ns)
119816 table[0].procname = NULL;
119817- }
119818+ hdr = register_net_sysctl(net, "net/ipv6", table);
119819+ } else
119820+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
119821
119822- hdr = register_net_sysctl(net, "net/ipv6", table);
119823 if (!hdr)
119824 goto err_reg;
119825
119826@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119827 return 0;
119828
119829 err_reg:
119830- if (!net_eq(net, &init_net))
119831- kfree(table);
119832+ kfree(table);
119833 err_alloc:
119834 return -ENOMEM;
119835 }
119836diff --git a/net/ipv6/route.c b/net/ipv6/route.c
119837index c73ae50..aa55e00 100644
119838--- a/net/ipv6/route.c
119839+++ b/net/ipv6/route.c
119840@@ -3046,7 +3046,7 @@ struct ctl_table ipv6_route_table_template[] = {
119841
119842 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
119843 {
119844- struct ctl_table *table;
119845+ ctl_table_no_const *table;
119846
119847 table = kmemdup(ipv6_route_table_template,
119848 sizeof(ipv6_route_table_template),
119849diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
119850index ac35a28..070cc8c 100644
119851--- a/net/ipv6/sit.c
119852+++ b/net/ipv6/sit.c
119853@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
119854 static void ipip6_dev_free(struct net_device *dev);
119855 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
119856 __be32 *v4dst);
119857-static struct rtnl_link_ops sit_link_ops __read_mostly;
119858+static struct rtnl_link_ops sit_link_ops;
119859
119860 static int sit_net_id __read_mostly;
119861 struct sit_net {
119862@@ -1749,7 +1749,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
119863 unregister_netdevice_queue(dev, head);
119864 }
119865
119866-static struct rtnl_link_ops sit_link_ops __read_mostly = {
119867+static struct rtnl_link_ops sit_link_ops = {
119868 .kind = "sit",
119869 .maxtype = IFLA_IPTUN_MAX,
119870 .policy = ipip6_policy,
119871diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
119872index abcc79f..3b2d2d5 100644
119873--- a/net/ipv6/sysctl_net_ipv6.c
119874+++ b/net/ipv6/sysctl_net_ipv6.c
119875@@ -92,7 +92,7 @@ static struct ctl_table ipv6_rotable[] = {
119876
119877 static int __net_init ipv6_sysctl_net_init(struct net *net)
119878 {
119879- struct ctl_table *ipv6_table;
119880+ ctl_table_no_const *ipv6_table;
119881 struct ctl_table *ipv6_route_table;
119882 struct ctl_table *ipv6_icmp_table;
119883 int err;
119884diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
119885index 3adffb3..fe3cc78 100644
119886--- a/net/ipv6/tcp_ipv6.c
119887+++ b/net/ipv6/tcp_ipv6.c
119888@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
119889 }
119890 }
119891
119892+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119893+extern int grsec_enable_blackhole;
119894+#endif
119895+
119896 static __u32 tcp_v6_init_sequence(const struct sk_buff *skb)
119897 {
119898 return secure_tcpv6_sequence_number(ipv6_hdr(skb)->daddr.s6_addr32,
119899@@ -946,7 +950,7 @@ static struct sock *tcp_v6_hnd_req(struct sock *sk, struct sk_buff *skb)
119900 &ipv6_hdr(skb)->daddr, tcp_v6_iif(skb));
119901 if (req) {
119902 nsk = tcp_check_req(sk, skb, req, false);
119903- if (!nsk)
119904+ if (!nsk || nsk == sk)
119905 reqsk_put(req);
119906 return nsk;
119907 }
119908@@ -1283,6 +1287,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
119909 return 0;
119910
119911 reset:
119912+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119913+ if (!grsec_enable_blackhole)
119914+#endif
119915 tcp_v6_send_reset(sk, skb);
119916 discard:
119917 if (opt_skb)
119918@@ -1392,12 +1399,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
119919
119920 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
119921 inet6_iif(skb));
119922- if (!sk)
119923+ if (!sk) {
119924+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119925+ ret = 1;
119926+#endif
119927 goto no_tcp_socket;
119928+ }
119929
119930 process:
119931- if (sk->sk_state == TCP_TIME_WAIT)
119932+ if (sk->sk_state == TCP_TIME_WAIT) {
119933+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119934+ ret = 2;
119935+#endif
119936 goto do_time_wait;
119937+ }
119938
119939 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
119940 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
119941@@ -1448,6 +1463,10 @@ csum_error:
119942 bad_packet:
119943 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
119944 } else {
119945+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119946+ if (!grsec_enable_blackhole || (ret == 1 &&
119947+ (skb->dev->flags & IFF_LOOPBACK)))
119948+#endif
119949 tcp_v6_send_reset(NULL, skb);
119950 }
119951
119952diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
119953index e51fc3e..8f04229 100644
119954--- a/net/ipv6/udp.c
119955+++ b/net/ipv6/udp.c
119956@@ -76,6 +76,10 @@ static u32 udp6_ehashfn(const struct net *net,
119957 udp_ipv6_hash_secret + net_hash_mix(net));
119958 }
119959
119960+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119961+extern int grsec_enable_blackhole;
119962+#endif
119963+
119964 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
119965 {
119966 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
119967@@ -445,7 +449,7 @@ try_again:
119968 if (unlikely(err)) {
119969 trace_kfree_skb(skb, udpv6_recvmsg);
119970 if (!peeked) {
119971- atomic_inc(&sk->sk_drops);
119972+ atomic_inc_unchecked(&sk->sk_drops);
119973 if (is_udp4)
119974 UDP_INC_STATS_USER(sock_net(sk),
119975 UDP_MIB_INERRORS,
119976@@ -709,7 +713,7 @@ csum_error:
119977 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
119978 drop:
119979 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
119980- atomic_inc(&sk->sk_drops);
119981+ atomic_inc_unchecked(&sk->sk_drops);
119982 kfree_skb(skb);
119983 return -1;
119984 }
119985@@ -750,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
119986 if (likely(!skb1))
119987 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
119988 if (!skb1) {
119989- atomic_inc(&sk->sk_drops);
119990+ atomic_inc_unchecked(&sk->sk_drops);
119991 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
119992 IS_UDPLITE(sk));
119993 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119994@@ -934,6 +938,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
119995 goto csum_error;
119996
119997 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
119998+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119999+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
120000+#endif
120001 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
120002
120003 kfree_skb(skb);
120004diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
120005index f337a90..ba0d2a0 100644
120006--- a/net/ipv6/xfrm6_policy.c
120007+++ b/net/ipv6/xfrm6_policy.c
120008@@ -185,7 +185,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
120009 return;
120010
120011 case IPPROTO_ICMPV6:
120012- if (!onlyproto && pskb_may_pull(skb, nh + offset + 2 - skb->data)) {
120013+ if (!onlyproto && (nh + offset + 2 < skb->data ||
120014+ pskb_may_pull(skb, nh + offset + 2 - skb->data))) {
120015 u8 *icmp;
120016
120017 nh = skb_network_header(skb);
120018@@ -199,7 +200,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
120019 #if IS_ENABLED(CONFIG_IPV6_MIP6)
120020 case IPPROTO_MH:
120021 offset += ipv6_optlen(exthdr);
120022- if (!onlyproto && pskb_may_pull(skb, nh + offset + 3 - skb->data)) {
120023+ if (!onlyproto && (nh + offset + 3 < skb->data ||
120024+ pskb_may_pull(skb, nh + offset + 3 - skb->data))) {
120025 struct ip6_mh *mh;
120026
120027 nh = skb_network_header(skb);
120028@@ -222,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
120029 }
120030 }
120031
120032-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
120033+static int xfrm6_garbage_collect(struct dst_ops *ops)
120034 {
120035 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
120036
120037- xfrm6_policy_afinfo.garbage_collect(net);
120038+ xfrm_garbage_collect_deferred(net);
120039 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
120040 }
120041
120042@@ -338,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
120043
120044 static int __net_init xfrm6_net_init(struct net *net)
120045 {
120046- struct ctl_table *table;
120047+ ctl_table_no_const *table = NULL;
120048 struct ctl_table_header *hdr;
120049
120050- table = xfrm6_policy_table;
120051 if (!net_eq(net, &init_net)) {
120052- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
120053+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
120054 if (!table)
120055 goto err_alloc;
120056
120057 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
120058- }
120059+ hdr = register_net_sysctl(net, "net/ipv6", table);
120060+ } else
120061+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
120062
120063- hdr = register_net_sysctl(net, "net/ipv6", table);
120064 if (!hdr)
120065 goto err_reg;
120066
120067@@ -358,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
120068 return 0;
120069
120070 err_reg:
120071- if (!net_eq(net, &init_net))
120072- kfree(table);
120073+ kfree(table);
120074 err_alloc:
120075 return -ENOMEM;
120076 }
120077diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
120078index c1d247e..9e5949d 100644
120079--- a/net/ipx/ipx_proc.c
120080+++ b/net/ipx/ipx_proc.c
120081@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
120082 struct proc_dir_entry *p;
120083 int rc = -ENOMEM;
120084
120085- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
120086+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
120087
120088 if (!ipx_proc_dir)
120089 goto out;
120090diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
120091index 683346d..cb0e12d 100644
120092--- a/net/irda/ircomm/ircomm_tty.c
120093+++ b/net/irda/ircomm/ircomm_tty.c
120094@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
120095 add_wait_queue(&port->open_wait, &wait);
120096
120097 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
120098- __FILE__, __LINE__, tty->driver->name, port->count);
120099+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
120100
120101 spin_lock_irqsave(&port->lock, flags);
120102- port->count--;
120103+ atomic_dec(&port->count);
120104 port->blocked_open++;
120105 spin_unlock_irqrestore(&port->lock, flags);
120106
120107@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
120108 }
120109
120110 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
120111- __FILE__, __LINE__, tty->driver->name, port->count);
120112+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
120113
120114 schedule();
120115 }
120116@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
120117
120118 spin_lock_irqsave(&port->lock, flags);
120119 if (!tty_hung_up_p(filp))
120120- port->count++;
120121+ atomic_inc(&port->count);
120122 port->blocked_open--;
120123 spin_unlock_irqrestore(&port->lock, flags);
120124
120125 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
120126- __FILE__, __LINE__, tty->driver->name, port->count);
120127+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
120128
120129 if (!retval)
120130 port->flags |= ASYNC_NORMAL_ACTIVE;
120131@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
120132
120133 /* ++ is not atomic, so this should be protected - Jean II */
120134 spin_lock_irqsave(&self->port.lock, flags);
120135- self->port.count++;
120136+ atomic_inc(&self->port.count);
120137 spin_unlock_irqrestore(&self->port.lock, flags);
120138 tty_port_tty_set(&self->port, tty);
120139
120140 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
120141- self->line, self->port.count);
120142+ self->line, atomic_read(&self->port.count));
120143
120144 /* Not really used by us, but lets do it anyway */
120145 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
120146@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
120147 tty_kref_put(port->tty);
120148 }
120149 port->tty = NULL;
120150- port->count = 0;
120151+ atomic_set(&port->count, 0);
120152 spin_unlock_irqrestore(&port->lock, flags);
120153
120154 wake_up_interruptible(&port->open_wait);
120155@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
120156 seq_putc(m, '\n');
120157
120158 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
120159- seq_printf(m, "Open count: %d\n", self->port.count);
120160+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
120161 seq_printf(m, "Max data size: %d\n", self->max_data_size);
120162 seq_printf(m, "Max header size: %d\n", self->max_header_size);
120163
120164diff --git a/net/irda/irproc.c b/net/irda/irproc.c
120165index b9ac598..f88cc56 100644
120166--- a/net/irda/irproc.c
120167+++ b/net/irda/irproc.c
120168@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
120169 {
120170 int i;
120171
120172- proc_irda = proc_mkdir("irda", init_net.proc_net);
120173+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
120174 if (proc_irda == NULL)
120175 return;
120176
120177diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
120178index 6daa52a..786aa2b 100644
120179--- a/net/iucv/af_iucv.c
120180+++ b/net/iucv/af_iucv.c
120181@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
120182 {
120183 char name[12];
120184
120185- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
120186+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
120187 while (__iucv_get_sock_by_name(name)) {
120188 sprintf(name, "%08x",
120189- atomic_inc_return(&iucv_sk_list.autobind_name));
120190+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
120191 }
120192 memcpy(iucv->src_name, name, 8);
120193 }
120194diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
120195index 2a6a1fd..6c112b0 100644
120196--- a/net/iucv/iucv.c
120197+++ b/net/iucv/iucv.c
120198@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
120199 return NOTIFY_OK;
120200 }
120201
120202-static struct notifier_block __refdata iucv_cpu_notifier = {
120203+static struct notifier_block iucv_cpu_notifier = {
120204 .notifier_call = iucv_cpu_notify,
120205 };
120206
120207diff --git a/net/key/af_key.c b/net/key/af_key.c
120208index f0d52d7..9c9af38 100644
120209--- a/net/key/af_key.c
120210+++ b/net/key/af_key.c
120211@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
120212 static u32 get_acqseq(void)
120213 {
120214 u32 res;
120215- static atomic_t acqseq;
120216+ static atomic_unchecked_t acqseq;
120217
120218 do {
120219- res = atomic_inc_return(&acqseq);
120220+ res = atomic_inc_return_unchecked(&acqseq);
120221 } while (!res);
120222 return res;
120223 }
120224diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
120225index 4b55287..bd247f7 100644
120226--- a/net/l2tp/l2tp_eth.c
120227+++ b/net/l2tp/l2tp_eth.c
120228@@ -42,12 +42,12 @@ struct l2tp_eth {
120229 struct sock *tunnel_sock;
120230 struct l2tp_session *session;
120231 struct list_head list;
120232- atomic_long_t tx_bytes;
120233- atomic_long_t tx_packets;
120234- atomic_long_t tx_dropped;
120235- atomic_long_t rx_bytes;
120236- atomic_long_t rx_packets;
120237- atomic_long_t rx_errors;
120238+ atomic_long_unchecked_t tx_bytes;
120239+ atomic_long_unchecked_t tx_packets;
120240+ atomic_long_unchecked_t tx_dropped;
120241+ atomic_long_unchecked_t rx_bytes;
120242+ atomic_long_unchecked_t rx_packets;
120243+ atomic_long_unchecked_t rx_errors;
120244 };
120245
120246 /* via l2tp_session_priv() */
120247@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
120248 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
120249
120250 if (likely(ret == NET_XMIT_SUCCESS)) {
120251- atomic_long_add(len, &priv->tx_bytes);
120252- atomic_long_inc(&priv->tx_packets);
120253+ atomic_long_add_unchecked(len, &priv->tx_bytes);
120254+ atomic_long_inc_unchecked(&priv->tx_packets);
120255 } else {
120256- atomic_long_inc(&priv->tx_dropped);
120257+ atomic_long_inc_unchecked(&priv->tx_dropped);
120258 }
120259 return NETDEV_TX_OK;
120260 }
120261@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
120262 {
120263 struct l2tp_eth *priv = netdev_priv(dev);
120264
120265- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
120266- stats->tx_packets = atomic_long_read(&priv->tx_packets);
120267- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
120268- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
120269- stats->rx_packets = atomic_long_read(&priv->rx_packets);
120270- stats->rx_errors = atomic_long_read(&priv->rx_errors);
120271+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
120272+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
120273+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
120274+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
120275+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
120276+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
120277 return stats;
120278 }
120279
120280@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
120281 nf_reset(skb);
120282
120283 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
120284- atomic_long_inc(&priv->rx_packets);
120285- atomic_long_add(data_len, &priv->rx_bytes);
120286+ atomic_long_inc_unchecked(&priv->rx_packets);
120287+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
120288 } else {
120289- atomic_long_inc(&priv->rx_errors);
120290+ atomic_long_inc_unchecked(&priv->rx_errors);
120291 }
120292 return;
120293
120294 error:
120295- atomic_long_inc(&priv->rx_errors);
120296+ atomic_long_inc_unchecked(&priv->rx_errors);
120297 kfree_skb(skb);
120298 }
120299
120300diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
120301index 7964993..2c48a3a 100644
120302--- a/net/l2tp/l2tp_ip.c
120303+++ b/net/l2tp/l2tp_ip.c
120304@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
120305 .ops = &l2tp_ip_ops,
120306 };
120307
120308-static struct net_protocol l2tp_ip_protocol __read_mostly = {
120309+static const struct net_protocol l2tp_ip_protocol = {
120310 .handler = l2tp_ip_recv,
120311 .netns_ok = 1,
120312 };
120313diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
120314index d1ded37..c0d1e49 100644
120315--- a/net/l2tp/l2tp_ip6.c
120316+++ b/net/l2tp/l2tp_ip6.c
120317@@ -755,7 +755,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
120318 .ops = &l2tp_ip6_ops,
120319 };
120320
120321-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
120322+static const struct inet6_protocol l2tp_ip6_protocol = {
120323 .handler = l2tp_ip6_recv,
120324 };
120325
120326diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
120327index 1a3c7e0..80f8b0c 100644
120328--- a/net/llc/llc_proc.c
120329+++ b/net/llc/llc_proc.c
120330@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
120331 int rc = -ENOMEM;
120332 struct proc_dir_entry *p;
120333
120334- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
120335+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
120336 if (!llc_proc_dir)
120337 goto out;
120338
120339diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
120340index f06d422..de37d95 100644
120341--- a/net/mac80211/cfg.c
120342+++ b/net/mac80211/cfg.c
120343@@ -582,7 +582,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
120344 ret = ieee80211_vif_use_channel(sdata, chandef,
120345 IEEE80211_CHANCTX_EXCLUSIVE);
120346 }
120347- } else if (local->open_count == local->monitors) {
120348+ } else if (local_read(&local->open_count) == local->monitors) {
120349 local->_oper_chandef = *chandef;
120350 ieee80211_hw_config(local, 0);
120351 }
120352@@ -3429,7 +3429,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
120353 else
120354 local->probe_req_reg--;
120355
120356- if (!local->open_count)
120357+ if (!local_read(&local->open_count))
120358 break;
120359
120360 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
120361@@ -3564,8 +3564,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
120362 if (chanctx_conf) {
120363 *chandef = sdata->vif.bss_conf.chandef;
120364 ret = 0;
120365- } else if (local->open_count > 0 &&
120366- local->open_count == local->monitors &&
120367+ } else if (local_read(&local->open_count) > 0 &&
120368+ local_read(&local->open_count) == local->monitors &&
120369 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
120370 if (local->use_chanctx)
120371 *chandef = local->monitor_chandef;
120372diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
120373index c0a9187..2a13300 100644
120374--- a/net/mac80211/ieee80211_i.h
120375+++ b/net/mac80211/ieee80211_i.h
120376@@ -30,6 +30,7 @@
120377 #include <net/ieee80211_radiotap.h>
120378 #include <net/cfg80211.h>
120379 #include <net/mac80211.h>
120380+#include <asm/local.h>
120381 #include "key.h"
120382 #include "sta_info.h"
120383 #include "debug.h"
120384@@ -1118,7 +1119,7 @@ struct ieee80211_local {
120385 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
120386 spinlock_t queue_stop_reason_lock;
120387
120388- int open_count;
120389+ local_t open_count;
120390 int monitors, cooked_mntrs;
120391 /* number of interfaces with corresponding FIF_ flags */
120392 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
120393diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
120394index 84cef60..53ec813 100644
120395--- a/net/mac80211/iface.c
120396+++ b/net/mac80211/iface.c
120397@@ -550,7 +550,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120398 break;
120399 }
120400
120401- if (local->open_count == 0) {
120402+ if (local_read(&local->open_count) == 0) {
120403 res = drv_start(local);
120404 if (res)
120405 goto err_del_bss;
120406@@ -597,7 +597,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120407 res = drv_add_interface(local, sdata);
120408 if (res)
120409 goto err_stop;
120410- } else if (local->monitors == 0 && local->open_count == 0) {
120411+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
120412 res = ieee80211_add_virtual_monitor(local);
120413 if (res)
120414 goto err_stop;
120415@@ -707,7 +707,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120416 atomic_inc(&local->iff_promiscs);
120417
120418 if (coming_up)
120419- local->open_count++;
120420+ local_inc(&local->open_count);
120421
120422 if (hw_reconf_flags)
120423 ieee80211_hw_config(local, hw_reconf_flags);
120424@@ -745,7 +745,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120425 err_del_interface:
120426 drv_remove_interface(local, sdata);
120427 err_stop:
120428- if (!local->open_count)
120429+ if (!local_read(&local->open_count))
120430 drv_stop(local);
120431 err_del_bss:
120432 sdata->bss = NULL;
120433@@ -915,7 +915,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120434 }
120435
120436 if (going_down)
120437- local->open_count--;
120438+ local_dec(&local->open_count);
120439
120440 switch (sdata->vif.type) {
120441 case NL80211_IFTYPE_AP_VLAN:
120442@@ -984,7 +984,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120443 atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
120444 }
120445
120446- if (local->open_count == 0)
120447+ if (local_read(&local->open_count) == 0)
120448 ieee80211_clear_tx_pending(local);
120449
120450 /*
120451@@ -1027,7 +1027,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120452 if (cancel_scan)
120453 flush_delayed_work(&local->scan_work);
120454
120455- if (local->open_count == 0) {
120456+ if (local_read(&local->open_count) == 0) {
120457 ieee80211_stop_device(local);
120458
120459 /* no reconfiguring after stop! */
120460@@ -1038,7 +1038,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120461 ieee80211_configure_filter(local);
120462 ieee80211_hw_config(local, hw_reconf_flags);
120463
120464- if (local->monitors == local->open_count)
120465+ if (local->monitors == local_read(&local->open_count))
120466 ieee80211_add_virtual_monitor(local);
120467 }
120468
120469diff --git a/net/mac80211/main.c b/net/mac80211/main.c
120470index e86daed..9cbf3f4 100644
120471--- a/net/mac80211/main.c
120472+++ b/net/mac80211/main.c
120473@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
120474 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
120475 IEEE80211_CONF_CHANGE_POWER);
120476
120477- if (changed && local->open_count) {
120478+ if (changed && local_read(&local->open_count)) {
120479 ret = drv_config(local, changed);
120480 /*
120481 * Goal:
120482diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
120483index ac6ad62..77dbac5 100644
120484--- a/net/mac80211/pm.c
120485+++ b/net/mac80211/pm.c
120486@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120487 struct ieee80211_sub_if_data *sdata;
120488 struct sta_info *sta;
120489
120490- if (!local->open_count)
120491+ if (!local_read(&local->open_count))
120492 goto suspend;
120493
120494 ieee80211_scan_cancel(local);
120495@@ -150,7 +150,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120496 WARN_ON(!list_empty(&local->chanctx_list));
120497
120498 /* stop hardware - this must stop RX */
120499- if (local->open_count)
120500+ if (local_read(&local->open_count))
120501 ieee80211_stop_device(local);
120502
120503 suspend:
120504diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
120505index d53355b..21f583a 100644
120506--- a/net/mac80211/rate.c
120507+++ b/net/mac80211/rate.c
120508@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
120509
120510 ASSERT_RTNL();
120511
120512- if (local->open_count)
120513+ if (local_read(&local->open_count))
120514 return -EBUSY;
120515
120516 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
120517diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
120518index 2880f2a..3085cec 100644
120519--- a/net/mac80211/sta_info.c
120520+++ b/net/mac80211/sta_info.c
120521@@ -339,7 +339,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
120522 int size = sizeof(struct txq_info) +
120523 ALIGN(hw->txq_data_size, sizeof(void *));
120524
120525- txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp);
120526+ txq_data = kcalloc(size, ARRAY_SIZE(sta->sta.txq), gfp);
120527 if (!txq_data)
120528 goto free;
120529
120530diff --git a/net/mac80211/util.c b/net/mac80211/util.c
120531index b864ebc..17326ff 100644
120532--- a/net/mac80211/util.c
120533+++ b/net/mac80211/util.c
120534@@ -1761,7 +1761,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120535 bool sched_scan_stopped = false;
120536
120537 /* nothing to do if HW shouldn't run */
120538- if (!local->open_count)
120539+ if (!local_read(&local->open_count))
120540 goto wake_up;
120541
120542 #ifdef CONFIG_PM
120543@@ -2033,7 +2033,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120544 local->in_reconfig = false;
120545 barrier();
120546
120547- if (local->monitors == local->open_count && local->monitors > 0)
120548+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
120549 ieee80211_add_virtual_monitor(local);
120550
120551 /*
120552@@ -2088,7 +2088,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120553 * If this is for hw restart things are still running.
120554 * We may want to change that later, however.
120555 */
120556- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
120557+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
120558 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
120559
120560 if (!local->suspended)
120561@@ -2112,7 +2112,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120562 flush_delayed_work(&local->scan_work);
120563 }
120564
120565- if (local->open_count && !reconfig_due_to_wowlan)
120566+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
120567 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
120568
120569 list_for_each_entry(sdata, &local->interfaces, list) {
120570diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
120571index 1f93a59..96faa29 100644
120572--- a/net/mpls/af_mpls.c
120573+++ b/net/mpls/af_mpls.c
120574@@ -456,7 +456,7 @@ static int mpls_dev_sysctl_register(struct net_device *dev,
120575 struct mpls_dev *mdev)
120576 {
120577 char path[sizeof("net/mpls/conf/") + IFNAMSIZ];
120578- struct ctl_table *table;
120579+ ctl_table_no_const *table;
120580 int i;
120581
120582 table = kmemdup(&mpls_dev_table, sizeof(mpls_dev_table), GFP_KERNEL);
120583@@ -1025,7 +1025,7 @@ static int mpls_platform_labels(struct ctl_table *table, int write,
120584 struct net *net = table->data;
120585 int platform_labels = net->mpls.platform_labels;
120586 int ret;
120587- struct ctl_table tmp = {
120588+ ctl_table_no_const tmp = {
120589 .procname = table->procname,
120590 .data = &platform_labels,
120591 .maxlen = sizeof(int),
120592@@ -1055,7 +1055,7 @@ static const struct ctl_table mpls_table[] = {
120593
120594 static int mpls_net_init(struct net *net)
120595 {
120596- struct ctl_table *table;
120597+ ctl_table_no_const *table;
120598
120599 net->mpls.platform_labels = 0;
120600 net->mpls.platform_label = NULL;
120601diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
120602index a0f3e6a3..b026fe2 100644
120603--- a/net/netfilter/Kconfig
120604+++ b/net/netfilter/Kconfig
120605@@ -1112,6 +1112,16 @@ config NETFILTER_XT_MATCH_ESP
120606
120607 To compile it as a module, choose M here. If unsure, say N.
120608
120609+config NETFILTER_XT_MATCH_GRADM
120610+ tristate '"gradm" match support'
120611+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
120612+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
120613+ ---help---
120614+ The gradm match allows to match on grsecurity RBAC being enabled.
120615+ It is useful when iptables rules are applied early on bootup to
120616+ prevent connections to the machine (except from a trusted host)
120617+ while the RBAC system is disabled.
120618+
120619 config NETFILTER_XT_MATCH_HASHLIMIT
120620 tristate '"hashlimit" match support'
120621 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
120622diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
120623index a87d8b8..d43183c 100644
120624--- a/net/netfilter/Makefile
120625+++ b/net/netfilter/Makefile
120626@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
120627 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
120628 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
120629 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
120630+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
120631 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
120632 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
120633 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
120634diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
120635index d259da3..6a32b2c 100644
120636--- a/net/netfilter/ipset/ip_set_core.c
120637+++ b/net/netfilter/ipset/ip_set_core.c
120638@@ -1952,7 +1952,7 @@ done:
120639 return ret;
120640 }
120641
120642-static struct nf_sockopt_ops so_set __read_mostly = {
120643+static struct nf_sockopt_ops so_set = {
120644 .pf = PF_INET,
120645 .get_optmin = SO_IP_SET,
120646 .get_optmax = SO_IP_SET + 1,
120647diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
120648index b0f7b62..0541842 100644
120649--- a/net/netfilter/ipvs/ip_vs_conn.c
120650+++ b/net/netfilter/ipvs/ip_vs_conn.c
120651@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
120652 /* Increase the refcnt counter of the dest */
120653 ip_vs_dest_hold(dest);
120654
120655- conn_flags = atomic_read(&dest->conn_flags);
120656+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
120657 if (cp->protocol != IPPROTO_UDP)
120658 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
120659 flags = cp->flags;
120660@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
120661
120662 cp->control = NULL;
120663 atomic_set(&cp->n_control, 0);
120664- atomic_set(&cp->in_pkts, 0);
120665+ atomic_set_unchecked(&cp->in_pkts, 0);
120666
120667 cp->packet_xmit = NULL;
120668 cp->app = NULL;
120669@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
120670
120671 /* Don't drop the entry if its number of incoming packets is not
120672 located in [0, 8] */
120673- i = atomic_read(&cp->in_pkts);
120674+ i = atomic_read_unchecked(&cp->in_pkts);
120675 if (i > 8 || i < 0) return 0;
120676
120677 if (!todrop_rate[i]) return 0;
120678diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
120679index 5d2b806..9005b29 100644
120680--- a/net/netfilter/ipvs/ip_vs_core.c
120681+++ b/net/netfilter/ipvs/ip_vs_core.c
120682@@ -574,7 +574,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
120683 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
120684 /* do not touch skb anymore */
120685
120686- atomic_inc(&cp->in_pkts);
120687+ atomic_inc_unchecked(&cp->in_pkts);
120688 ip_vs_conn_put(cp);
120689 return ret;
120690 }
120691@@ -1750,7 +1750,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
120692 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
120693 pkts = sysctl_sync_threshold(ipvs);
120694 else
120695- pkts = atomic_add_return(1, &cp->in_pkts);
120696+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120697
120698 if (ipvs->sync_state & IP_VS_STATE_MASTER)
120699 ip_vs_sync_conn(net, cp, pkts);
120700diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
120701index 285eae3..226f4a7 100644
120702--- a/net/netfilter/ipvs/ip_vs_ctl.c
120703+++ b/net/netfilter/ipvs/ip_vs_ctl.c
120704@@ -814,7 +814,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
120705 */
120706 ip_vs_rs_hash(ipvs, dest);
120707 }
120708- atomic_set(&dest->conn_flags, conn_flags);
120709+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
120710
120711 /* bind the service */
120712 old_svc = rcu_dereference_protected(dest->svc, 1);
120713@@ -1679,7 +1679,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
120714 * align with netns init in ip_vs_control_net_init()
120715 */
120716
120717-static struct ctl_table vs_vars[] = {
120718+static ctl_table_no_const vs_vars[] __read_only = {
120719 {
120720 .procname = "amemthresh",
120721 .maxlen = sizeof(int),
120722@@ -2020,7 +2020,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120723 " %-7s %-6d %-10d %-10d\n",
120724 &dest->addr.in6,
120725 ntohs(dest->port),
120726- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120727+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120728 atomic_read(&dest->weight),
120729 atomic_read(&dest->activeconns),
120730 atomic_read(&dest->inactconns));
120731@@ -2031,7 +2031,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120732 "%-7s %-6d %-10d %-10d\n",
120733 ntohl(dest->addr.ip),
120734 ntohs(dest->port),
120735- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120736+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120737 atomic_read(&dest->weight),
120738 atomic_read(&dest->activeconns),
120739 atomic_read(&dest->inactconns));
120740@@ -2528,7 +2528,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
120741
120742 entry.addr = dest->addr.ip;
120743 entry.port = dest->port;
120744- entry.conn_flags = atomic_read(&dest->conn_flags);
120745+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
120746 entry.weight = atomic_read(&dest->weight);
120747 entry.u_threshold = dest->u_threshold;
120748 entry.l_threshold = dest->l_threshold;
120749@@ -3101,7 +3101,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
120750 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
120751 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
120752 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
120753- (atomic_read(&dest->conn_flags) &
120754+ (atomic_read_unchecked(&dest->conn_flags) &
120755 IP_VS_CONN_F_FWD_MASK)) ||
120756 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
120757 atomic_read(&dest->weight)) ||
120758@@ -3739,7 +3739,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
120759 {
120760 int idx;
120761 struct netns_ipvs *ipvs = net_ipvs(net);
120762- struct ctl_table *tbl;
120763+ ctl_table_no_const *tbl;
120764
120765 atomic_set(&ipvs->dropentry, 0);
120766 spin_lock_init(&ipvs->dropentry_lock);
120767diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
120768index 127f140..553d652 100644
120769--- a/net/netfilter/ipvs/ip_vs_lblc.c
120770+++ b/net/netfilter/ipvs/ip_vs_lblc.c
120771@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
120772 * IPVS LBLC sysctl table
120773 */
120774 #ifdef CONFIG_SYSCTL
120775-static struct ctl_table vs_vars_table[] = {
120776+static ctl_table_no_const vs_vars_table[] __read_only = {
120777 {
120778 .procname = "lblc_expiration",
120779 .data = NULL,
120780diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
120781index 2229d2d..b32b785 100644
120782--- a/net/netfilter/ipvs/ip_vs_lblcr.c
120783+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
120784@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
120785 * IPVS LBLCR sysctl table
120786 */
120787
120788-static struct ctl_table vs_vars_table[] = {
120789+static ctl_table_no_const vs_vars_table[] __read_only = {
120790 {
120791 .procname = "lblcr_expiration",
120792 .data = NULL,
120793diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
120794index 19b9cce..e4f3112 100644
120795--- a/net/netfilter/ipvs/ip_vs_sync.c
120796+++ b/net/netfilter/ipvs/ip_vs_sync.c
120797@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
120798 cp = cp->control;
120799 if (cp) {
120800 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120801- pkts = atomic_add_return(1, &cp->in_pkts);
120802+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120803 else
120804 pkts = sysctl_sync_threshold(ipvs);
120805 ip_vs_sync_conn(net, cp->control, pkts);
120806@@ -771,7 +771,7 @@ control:
120807 if (!cp)
120808 return;
120809 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120810- pkts = atomic_add_return(1, &cp->in_pkts);
120811+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120812 else
120813 pkts = sysctl_sync_threshold(ipvs);
120814 goto sloop;
120815@@ -919,7 +919,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
120816
120817 if (opt)
120818 memcpy(&cp->in_seq, opt, sizeof(*opt));
120819- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120820+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120821 cp->state = state;
120822 cp->old_state = cp->state;
120823 /*
120824diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
120825index 19986ec..416dbc5 100644
120826--- a/net/netfilter/ipvs/ip_vs_xmit.c
120827+++ b/net/netfilter/ipvs/ip_vs_xmit.c
120828@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
120829 else
120830 rc = NF_ACCEPT;
120831 /* do not touch skb anymore */
120832- atomic_inc(&cp->in_pkts);
120833+ atomic_inc_unchecked(&cp->in_pkts);
120834 goto out;
120835 }
120836
120837@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
120838 else
120839 rc = NF_ACCEPT;
120840 /* do not touch skb anymore */
120841- atomic_inc(&cp->in_pkts);
120842+ atomic_inc_unchecked(&cp->in_pkts);
120843 goto out;
120844 }
120845
120846diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
120847index 45da11a..ef3e5dc 100644
120848--- a/net/netfilter/nf_conntrack_acct.c
120849+++ b/net/netfilter/nf_conntrack_acct.c
120850@@ -64,7 +64,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
120851 #ifdef CONFIG_SYSCTL
120852 static int nf_conntrack_acct_init_sysctl(struct net *net)
120853 {
120854- struct ctl_table *table;
120855+ ctl_table_no_const *table;
120856
120857 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
120858 GFP_KERNEL);
120859diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
120860index 13fad86..18c984c 100644
120861--- a/net/netfilter/nf_conntrack_core.c
120862+++ b/net/netfilter/nf_conntrack_core.c
120863@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
120864 #define DYING_NULLS_VAL ((1<<30)+1)
120865 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
120866
120867+#ifdef CONFIG_GRKERNSEC_HIDESYM
120868+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
120869+#endif
120870+
120871 int nf_conntrack_init_net(struct net *net)
120872 {
120873 int ret = -ENOMEM;
120874@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
120875 if (!net->ct.stat)
120876 goto err_pcpu_lists;
120877
120878+#ifdef CONFIG_GRKERNSEC_HIDESYM
120879+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
120880+#else
120881 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
120882+#endif
120883 if (!net->ct.slabname)
120884 goto err_slabname;
120885
120886diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
120887index 4e78c57..ec8fb74 100644
120888--- a/net/netfilter/nf_conntrack_ecache.c
120889+++ b/net/netfilter/nf_conntrack_ecache.c
120890@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
120891 #ifdef CONFIG_SYSCTL
120892 static int nf_conntrack_event_init_sysctl(struct net *net)
120893 {
120894- struct ctl_table *table;
120895+ ctl_table_no_const *table;
120896
120897 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
120898 GFP_KERNEL);
120899diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
120900index bd9d315..989947e 100644
120901--- a/net/netfilter/nf_conntrack_helper.c
120902+++ b/net/netfilter/nf_conntrack_helper.c
120903@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
120904
120905 static int nf_conntrack_helper_init_sysctl(struct net *net)
120906 {
120907- struct ctl_table *table;
120908+ ctl_table_no_const *table;
120909
120910 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
120911 GFP_KERNEL);
120912diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
120913index b65d586..beec902 100644
120914--- a/net/netfilter/nf_conntrack_proto.c
120915+++ b/net/netfilter/nf_conntrack_proto.c
120916@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
120917
120918 static void
120919 nf_ct_unregister_sysctl(struct ctl_table_header **header,
120920- struct ctl_table **table,
120921+ ctl_table_no_const **table,
120922 unsigned int users)
120923 {
120924 if (users > 0)
120925diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
120926index fc823fa..8311af3 100644
120927--- a/net/netfilter/nf_conntrack_standalone.c
120928+++ b/net/netfilter/nf_conntrack_standalone.c
120929@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
120930
120931 static int nf_conntrack_standalone_init_sysctl(struct net *net)
120932 {
120933- struct ctl_table *table;
120934+ ctl_table_no_const *table;
120935
120936 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
120937 GFP_KERNEL);
120938diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
120939index 7a394df..bd91a8a 100644
120940--- a/net/netfilter/nf_conntrack_timestamp.c
120941+++ b/net/netfilter/nf_conntrack_timestamp.c
120942@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
120943 #ifdef CONFIG_SYSCTL
120944 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
120945 {
120946- struct ctl_table *table;
120947+ ctl_table_no_const *table;
120948
120949 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
120950 GFP_KERNEL);
120951diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
120952index 675d12c..b36e825 100644
120953--- a/net/netfilter/nf_log.c
120954+++ b/net/netfilter/nf_log.c
120955@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
120956
120957 #ifdef CONFIG_SYSCTL
120958 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
120959-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
120960+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
120961
120962 static int nf_log_proc_dostring(struct ctl_table *table, int write,
120963 void __user *buffer, size_t *lenp, loff_t *ppos)
120964@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
120965 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
120966 mutex_unlock(&nf_log_mutex);
120967 } else {
120968+ ctl_table_no_const nf_log_table = *table;
120969+
120970 mutex_lock(&nf_log_mutex);
120971 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
120972 if (!logger)
120973- table->data = "NONE";
120974+ nf_log_table.data = "NONE";
120975 else
120976- table->data = logger->name;
120977- r = proc_dostring(table, write, buffer, lenp, ppos);
120978+ nf_log_table.data = logger->name;
120979+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
120980 mutex_unlock(&nf_log_mutex);
120981 }
120982
120983diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
120984index c68c1e5..8b5d670 100644
120985--- a/net/netfilter/nf_sockopt.c
120986+++ b/net/netfilter/nf_sockopt.c
120987@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
120988 }
120989 }
120990
120991- list_add(&reg->list, &nf_sockopts);
120992+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
120993 out:
120994 mutex_unlock(&nf_sockopt_mutex);
120995 return ret;
120996@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
120997 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
120998 {
120999 mutex_lock(&nf_sockopt_mutex);
121000- list_del(&reg->list);
121001+ pax_list_del((struct list_head *)&reg->list);
121002 mutex_unlock(&nf_sockopt_mutex);
121003 }
121004 EXPORT_SYMBOL(nf_unregister_sockopt);
121005diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
121006index 4ef1fae..f72f08b 100644
121007--- a/net/netfilter/nfnetlink_log.c
121008+++ b/net/netfilter/nfnetlink_log.c
121009@@ -84,7 +84,7 @@ static int nfnl_log_net_id __read_mostly;
121010 struct nfnl_log_net {
121011 spinlock_t instances_lock;
121012 struct hlist_head instance_table[INSTANCE_BUCKETS];
121013- atomic_t global_seq;
121014+ atomic_unchecked_t global_seq;
121015 };
121016
121017 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
121018@@ -572,7 +572,7 @@ __build_packet_message(struct nfnl_log_net *log,
121019 /* global sequence number */
121020 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
121021 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
121022- htonl(atomic_inc_return(&log->global_seq))))
121023+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
121024 goto nla_put_failure;
121025
121026 if (data_len) {
121027diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
121028index 7f29cfc..917ef5f 100644
121029--- a/net/netfilter/nft_compat.c
121030+++ b/net/netfilter/nft_compat.c
121031@@ -321,14 +321,7 @@ static void nft_match_eval(const struct nft_expr *expr,
121032 return;
121033 }
121034
121035- switch (ret ? 1 : 0) {
121036- case 1:
121037- regs->verdict.code = NFT_CONTINUE;
121038- break;
121039- case 0:
121040- regs->verdict.code = NFT_BREAK;
121041- break;
121042- }
121043+ regs->verdict.code = ret ? NFT_CONTINUE : NFT_BREAK;
121044 }
121045
121046 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
121047diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
121048new file mode 100644
121049index 0000000..c566332
121050--- /dev/null
121051+++ b/net/netfilter/xt_gradm.c
121052@@ -0,0 +1,51 @@
121053+/*
121054+ * gradm match for netfilter
121055